diff --git a/.drone.yml b/.drone.yml
index 48ec0828c7..0244ddfe31 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -38,6 +38,19 @@ steps:
   when:
     status: [success]
 
+- name: notify_to_discord_releases
+  image: bitholla/devops-tools:drone_partymaker-0.1.5
+  channel: deployment
+  settings:
+    target: discord
+    release_name: hollaex-cli
+  environment:
+    WEBHOOK_URL:
+      from_secret: discord_webhook_url
+  when:
+    status: [ success, failure ]
+    branch: master
+
 trigger:
   branch:
   - master
diff --git a/server/api/controllers/admin.js b/server/api/controllers/admin.js
index cd2fd818b6..23583d68e3 100644
--- a/server/api/controllers/admin.js
+++ b/server/api/controllers/admin.js
@@ -7,6 +7,7 @@ const { all } = require('bluebird');
 const { USER_NOT_FOUND } = require('../../messages');
 const { sendEmail } = require('../../mail');
 const { MAILTYPE } = require('../../mail/strings');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const getAdminKit = (req, res) => {
 	loggerAdmin.verbose(req.uuid, 'controllers/admin/getAdminKit', req.auth.sub);
@@ -21,7 +22,7 @@ const getAdminKit = (req, res) => {
 		return res.json(data);
 	} catch (err) {
 		loggerAdmin.error(req.uuid, 'controllers/admin/getAdminKit', err.message);
-		return res.status(400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -36,7 +37,7 @@ const putNetworkCredentials = (req, res) => {
 		})
 		.catch((err) => {
 			loggerAdmin.error(req.uuid, 'controllers/admin/putNetworkCredentials', err.message);
-			return res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -69,7 +70,7 @@ const createInitialAdmin = (req, res) => {
 		})
 		.catch((err) => {
 			loggerAdmin.error(req.uuid, 'controllers/admin/createInitialAdmin', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -90,7 +91,7 @@ const putAdminKit = (req, res) => {
 		})
 		.catch((err) => {
 			loggerAdmin.error(req.uuid, 'controllers/admin/putAdminKit', err);
-			return res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -122,7 +123,7 @@ const getUsersAdmin = (req, res) => {
 		})
 		.catch((err) => {
 			loggerAdmin.error(req.uuid, 'controllers/admin/getUsers', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -146,7 +147,7 @@ const putUserRole = (req, res) => {
 				'controllers/admin/putUserRole',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -170,7 +171,44 @@ const putUserNote = (req, res) => {
 				'controllers/admin/userNote',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
+		});
+};
+
+const putUserDiscount = (req, res) => {
+	loggerAdmin.verbose(
+		req.uuid,
+		'controllers/admin/putUserDiscount auth',
+		req.auth
+	);
+
+	const user_id = req.swagger.params.user_id.value;
+	const { discount } = req.swagger.params.data.value;
+
+	loggerAdmin.info(
+		req.uuid,
+		'controllers/admin/putUserDiscount',
+		'user_id',
+		user_id,
+		'discount rate',
+		discount
+	);
+
+	toolsLib.user.updateUserDiscount(user_id, discount)
+		.then((data) => {
+			loggerAdmin.info(
+				req.uuid,
+				'controllers/admin/putUserDiscount successful'
+			);
+			return res.json(data);
+		})
+		.catch((err) => {
+			loggerAdmin.error(
+				req.uuid,
+				'controllers/admin/putUserDiscount err',
+				err.message
+			);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -192,7 +230,7 @@ const getAdminUserBalance = (req, res) => {
 				'controllers/admin/getAdminUserBalance',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -225,7 +263,7 @@ const activateUser = (req, res) => {
 				'controllers/admin/activateUser',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -241,7 +279,12 @@ const getAdminBalance = (req, res) => {
 			return res.json(balance);
 		})
 		.catch((err) => {
-			return res.status(err.status || 400).json({ message: err.message });
+			loggerAdmin.error(
+				req.uuid,
+				'controllers/admin/getAdminBalance',
+				err.message
+			);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -266,7 +309,7 @@ const upgradeUser = (req, res) => {
 				'controllers/admin/upgradeUser',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -295,7 +338,7 @@ const verifyEmailUser = (req, res) => {
 				'controllers/admin/verifyEmailUser',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -309,7 +352,7 @@ const flagUser = (req, res) => {
 		})
 		.catch((err) => {
 			loggerAdmin.error(req.uuid, 'controllers/admin/flagUser', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -346,7 +389,7 @@ const getAdminUserLogins = (req, res) => {
 				'controllers/admin/getAdminUserLogins/catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -384,7 +427,7 @@ const getUserAudits = (req, res) => {
 				'controllers/admin/getUserAudits',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -418,7 +461,7 @@ const getCoins = (req, res) => {
 			'controllers/coin/getCoins',
 			err.message
 		);
-		return res.status(400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -452,7 +495,7 @@ const getPairs = (req, res) => {
 			'controllers/coin/getPairs',
 			err.message
 		);
-		return res.status(400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -475,7 +518,7 @@ const transferFund = (req, res) => {
 				'controllers/admin/transferFund',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -496,7 +539,7 @@ const completeExchangeSetup = (req, res) => {
 				'controllers/admin/completeExchangeSetup catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -520,7 +563,7 @@ const uploadImage = (req, res) => {
 				'controllers/admin/uploadImage catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -548,7 +591,7 @@ const getOperators = (req, res) => {
 				'controllers/admin/getOperators catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -572,7 +615,7 @@ const inviteNewOperator = (req, res) => {
 				'controllers/admin/inviteNewOperator err',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -595,7 +638,7 @@ const getExchangeGeneratedFees = (req, res) => {
 				'controllers/admin/getExchangeGeneratedFees catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -616,7 +659,7 @@ const settleFees = (req, res) => {
 				'controllers/admin/settleFees catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -632,7 +675,8 @@ const mintAsset = (req, res) => {
 		currency,
 		amount,
 		description,
-		transaction_id
+		transaction_id,
+		status
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -644,7 +688,9 @@ const mintAsset = (req, res) => {
 		'amount',
 		amount,
 		'transaction_id',
-		transaction_id
+		transaction_id,
+		'status',
+		status
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
@@ -652,13 +698,83 @@ const mintAsset = (req, res) => {
 			if (!user) {
 				throw new Error(USER_NOT_FOUND);
 			}
-			return toolsLib.wallet.mintAssetByNetworkId(user.network_id, currency, amount, description, transaction_id);
+			return toolsLib.wallet.mintAssetByNetworkId(
+				user.network_id,
+				currency,
+				amount,
+				{
+					description,
+					transactionId: transaction_id,
+					status
+				}
+			);
 		})
-		.then(() => {
-			return res.json({ message: 'Success' });
+		.then((data) => {
+			loggerAdmin.info(
+				req.uuid,
+				'controllers/admin/mintAsset successful',
+			);
+			return res.status(201).json(data);
 		})
 		.catch((err) => {
-			return res.status(err.status || 400).json({ message: err.message });
+			loggerAdmin.error(
+				req.uuid,
+				'controllers/admin/mintAsset err',
+				err
+			);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
+		});
+};
+
+const putMint = (req, res) => {
+	loggerAdmin.verbose(
+		req.uuid,
+		'controllers/admin/putMint auth',
+		req.auth
+	);
+
+	const {
+		transaction_id,
+		updated_transaction_id,
+		status,
+		rejected,
+		dismissed
+	} = req.swagger.params.data.value;
+
+	loggerAdmin.info(
+		req.uuid,
+		'controllers/admin/putMint transaction_id',
+		transaction_id,
+		'status',
+		status,
+		'rejected',
+		rejected,
+		'dismissed',
+		dismissed,
+		'updated_transaction_id',
+		updated_transaction_id
+	);
+
+	toolsLib.wallet.updatePendingMint(transaction_id, {
+		status,
+		dismissed,
+		rejected,
+		updatedTransactionId: updated_transaction_id
+	})
+		.then((data) => {
+			loggerAdmin.info(
+				req.uuid,
+				'controllers/admin/putMint successful',
+			);
+			return res.json(data);
+		})
+		.catch((err) => {
+			loggerAdmin.error(
+				req.uuid,
+				'controllers/admin/putMint err',
+				err
+			);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -674,7 +790,8 @@ const burnAsset = (req, res) => {
 		currency,
 		amount,
 		description,
-		transaction_id
+		transaction_id,
+		status
 	} = req.swagger.params.data.value;
 
 	loggerAdmin.info(
@@ -686,7 +803,9 @@ const burnAsset = (req, res) => {
 		'amount',
 		amount,
 		'transaction_id',
-		transaction_id
+		transaction_id,
+		'status',
+		status
 	);
 
 	toolsLib.user.getUserByKitId(user_id)
@@ -694,13 +813,83 @@ const burnAsset = (req, res) => {
 			if (!user) {
 				throw new Error(USER_NOT_FOUND);
 			}
-			return toolsLib.wallet.burnAssetByNetworkId(user.network_id, currency, amount, description, transaction_id);
+			return toolsLib.wallet.burnAssetByNetworkId(
+				user.network_id,
+				currency,
+				amount,
+				{
+					description,
+					transactionId: transaction_id,
+					status
+				}
+			);
 		})
-		.then(() => {
-			return res.json({ message: 'Success' });
+		.then((data) => {
+			loggerAdmin.info(
+				req.uuid,
+				'controllers/admin/burnAsset successful',
+			);
+			return res.status(201).json(data);
+		})
+		.catch((err) => {
+			loggerAdmin.error(
+				req.uuid,
+				'controllers/admin/burnAsset err',
+				err
+			);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
+		});
+};
+
+const putBurn = (req, res) => {
+	loggerAdmin.verbose(
+		req.uuid,
+		'controllers/admin/putBurn auth',
+		req.auth
+	);
+
+	const {
+		transaction_id,
+		updated_transaction_id,
+		status,
+		rejected,
+		dismissed
+	} = req.swagger.params.data.value;
+
+	loggerAdmin.info(
+		req.uuid,
+		'controllers/admin/putBurn transaction_id',
+		transaction_id,
+		'status',
+		status,
+		'rejected',
+		rejected,
+		'dismissed',
+		dismissed,
+		'updated_transaction_id',
+		updated_transaction_id
+	);
+
+	toolsLib.wallet.updatePendingBurn(transaction_id, {
+		status,
+		dismissed,
+		rejected,
+		updatedTransactionId: updated_transaction_id
+	})
+		.then((data) => {
+			loggerAdmin.info(
+				req.uuid,
+				'controllers/admin/putBurn successful',
+			);
+			return res.json(data);
 		})
 		.catch((err) => {
-			return res.status(err.status || 400).json({ message: err.message });
+			loggerAdmin.error(
+				req.uuid,
+				'controllers/admin/putBurn err',
+				err
+			);
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -730,5 +919,8 @@ module.exports = {
 	mintAsset,
 	burnAsset,
 	verifyEmailUser,
-	settleFees
+	settleFees,
+	putMint,
+	putBurn,
+	putUserDiscount
 };
diff --git a/server/api/controllers/deposit.js b/server/api/controllers/deposit.js
index 4c9b553faa..dd237f69ff 100644
--- a/server/api/controllers/deposit.js
+++ b/server/api/controllers/deposit.js
@@ -2,6 +2,7 @@
 
 const { loggerDeposits } = require('../../config/logger');
 const toolsLib = require('hollaex-tools-lib');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const getAdminDeposits = (req, res) => {
 	loggerDeposits.verbose(
@@ -10,9 +11,43 @@ const getAdminDeposits = (req, res) => {
 		req.auth
 	);
 
-	const { user_id, currency, limit, page, order_by, order, start_date, end_date, status, dismissed, rejected, processing, waiting, format } = req.swagger.params;
+	const {
+		user_id,
+		currency,
+		limit,
+		page,
+		order_by,
+		order,
+		start_date,
+		end_date,
+		status,
+		dismissed,
+		rejected,
+		processing,
+		waiting,
+		transaction_id,
+		address,
+		format
+	} = req.swagger.params;
 
-	toolsLib.wallet.getUserDepositsByKitId(user_id.value, currency.value, status.value, dismissed.value, rejected.value, processing.value, waiting.value, limit.value, page.value, order_by.value, order.value, start_date.value, end_date.value, format.value)
+	toolsLib.wallet.getUserDepositsByKitId(
+		user_id.value,
+		currency.value,
+		status.value,
+		dismissed.value,
+		rejected.value,
+		processing.value,
+		waiting.value,
+		limit.value,
+		page.value,
+		order_by.value,
+		order.value,
+		start_date.value,
+		end_date.value,
+		transaction_id.value,
+		address.value,
+		format.value
+	)
 		.then((data) => {
 			if (format.value) {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users-deposits.csv`);
@@ -28,7 +63,7 @@ const getAdminDeposits = (req, res) => {
 				'controllers/deposit/getAdminDeposits',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -39,10 +74,42 @@ const getUserDeposits = (req, res) => {
 		req.auth.sub
 	);
 	const user_id = req.auth.sub.id;
-	const currency = req.swagger.params.currency.value || '';
-	const { limit, page, order_by, order, start_date, end_date, format } = req.swagger.params;
+	const {
+		currency,
+		limit,
+		page,
+		order_by,
+		order,
+		start_date,
+		end_date,
+		status,
+		dismissed,
+		rejected,
+		processing,
+		waiting,
+		transaction_id,
+		address,
+		format
+	} = req.swagger.params;
 
-	toolsLib.wallet.getUserDepositsByKitId(user_id, currency, limit.value, page.value, order_by.value, order.value, start_date.value, end_date.value, format.value)
+	toolsLib.wallet.getUserDepositsByKitId(
+		user_id,
+		currency.value,
+		status.value,
+		dismissed.value,
+		rejected.value,
+		processing.value,
+		waiting.value,
+		limit.value,
+		page.value,
+		order_by.value,
+		order.value,
+		start_date.value,
+		end_date.value,
+		transaction_id.value,
+		address.value,
+		format.value
+	)
 		.then((data) => {
 			if (format.value) {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-deposits.csv`);
@@ -54,7 +121,7 @@ const getUserDeposits = (req, res) => {
 		})
 		.catch((err) => {
 			loggerDeposits.error('controllers/deposit/getUserDeposits', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/notification.js b/server/api/controllers/notification.js
index 28c8ee340a..cea7a1335f 100644
--- a/server/api/controllers/notification.js
+++ b/server/api/controllers/notification.js
@@ -7,6 +7,7 @@ const { MAILTYPE } = require('../../mail/strings');
 const { publisher } = require('../../db/pubsub');
 const { INIT_CHANNEL, WS_PUBSUB_DEPOSIT_CHANNEL, EVENTS_CHANNEL } = require('../../constants');
 const moment = require('moment');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const applyKitChanges = (req, res) => {
 	const ip = req.headers ? req.headers['x-real-ip'] : undefined;
@@ -22,7 +23,7 @@ const applyKitChanges = (req, res) => {
 		})
 		.catch((err) => {
 			loggerNotification.verbose('controller/notification/applyKitChanges', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -32,7 +33,7 @@ const handleCurrencyDeposit = (req, res) => {
 	loggerNotification.verbose('controller/notification/handleCurrencyDeposit ip domain', ip, domain);
 
 	const currency = req.swagger.params.currency.value;
-	const { user_id, amount, txid, address, is_confirmed } = req.swagger.params.data.value;
+	const { user_id, amount, txid, address, is_confirmed, rejected, created_at } = req.swagger.params.data.value;
 
 	toolsLib.security.verifyNetworkHmacToken(req)
 		.then(() => {
@@ -42,37 +43,55 @@ const handleCurrencyDeposit = (req, res) => {
 			return toolsLib.user.getUserByNetworkId(user_id);
 		})
 		.then((user) => {
-			const depositData = {
-				amount,
-				currency,
-				status: is_confirmed ? 'COMPLETED' : 'PENDING',
-				address,
-				transaction_id: txid
-			};
-
-			publisher.publish(WS_PUBSUB_DEPOSIT_CHANNEL, JSON.stringify({
-				topic: 'deposit',
-				action: 'insert',
-				user_id: user.network_id,
-				data: depositData,
-				time: moment().unix()
-			}));
-
-			publisher.publish(EVENTS_CHANNEL, JSON.stringify({
-				type: 'deposit',
-				data: {
-					...depositData,
-					user_id: user.id
+			if (rejected) {
+				sendEmail(
+					MAILTYPE.DEPOSIT_CANCEL,
+					user.email,
+					{
+						type: 'deposit',
+						amount,
+						currency,
+						transaction_id: txid,
+						date: created_at
+					},
+					user.settings,
+					domain
+				);
+			} else {
+				const depositData = {
+					amount,
+					currency,
+					status: is_confirmed ? 'COMPLETED' : 'PENDING',
+					address,
+					transaction_id: txid
+				};
+
+				if (is_confirmed) {
+					publisher.publish(WS_PUBSUB_DEPOSIT_CHANNEL, JSON.stringify({
+						topic: 'deposit',
+						action: 'insert',
+						user_id: user.network_id,
+						data: depositData,
+						time: moment().unix()
+					}));
 				}
-			}));
-
-			sendEmail(
-				MAILTYPE.DEPOSIT,
-				user.email,
-				depositData,
-				user.settings,
-				domain
-			);
+
+				publisher.publish(EVENTS_CHANNEL, JSON.stringify({
+					type: 'deposit',
+					data: {
+						...depositData,
+						user_id: user.id
+					}
+				}));
+
+				sendEmail(
+					MAILTYPE.DEPOSIT,
+					user.email,
+					depositData,
+					user.settings,
+					domain
+				);
+			}
 			return res.json({ message: 'Success' });
 		})
 		.catch((err) => {
@@ -81,7 +100,7 @@ const handleCurrencyDeposit = (req, res) => {
 				'controller/notification/handleCurrencyDeposit',
 				err.message
 			);
-			return res.status(400).json({ message: `Fail - ${err.message}` });
+			return res.status(err.statusCode || 400).json({ message: `Fail - ${errorMessageConverter(err)}` });
 		});
 };
 
@@ -91,7 +110,7 @@ const handleCurrencyWithdrawal = (req, res) => {
 	loggerNotification.verbose('controller/notification/handleCurrencyWithdrawal ip domain', ip, domain);
 
 	const currency = req.swagger.params.currency.value;
-	const { user_id, amount, txid, address, is_confirmed, fee, rejected } = req.swagger.params.data.value;
+	const { user_id, amount, txid, address, is_confirmed, fee, rejected, created_at } = req.swagger.params.data.value;
 
 	toolsLib.security.verifyNetworkHmacToken(req)
 		.then(() => {
@@ -102,16 +121,16 @@ const handleCurrencyWithdrawal = (req, res) => {
 		})
 		.then((user) => {
 			if (rejected) {
-				const data = {
-					amount,
-					currency,
-					address
-				};
-
 				sendEmail(
-					MAILTYPE.INVALID_ADDRESS,
+					MAILTYPE.DEPOSIT_CANCEL,
 					user.email,
-					data,
+					{
+						type: 'withdrawal',
+						amount,
+						currency,
+						transaction_id: txid,
+						date: created_at
+					},
 					user.settings,
 					domain
 				);
@@ -150,7 +169,7 @@ const handleCurrencyWithdrawal = (req, res) => {
 				'controller/notification/handleCurrencyWithdrawal',
 				err.message
 			);
-			return res.status(400).json({ message: `Fail - ${err.message}` });
+			return res.status(err.statusCode || 400).json({ message: `Fail - ${errorMessageConverter(err)}` });
 		});
 };
 
diff --git a/server/api/controllers/order.js b/server/api/controllers/order.js
index 9490555455..15c33da6ed 100644
--- a/server/api/controllers/order.js
+++ b/server/api/controllers/order.js
@@ -3,6 +3,7 @@
 const { loggerOrders } = require('../../config/logger');
 const toolsLib = require('hollaex-tools-lib');
 const { isPlainObject, isNumber } = require('lodash');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const createOrder = (req, res) => {
 	loggerOrders.verbose(
@@ -43,7 +44,7 @@ const createOrder = (req, res) => {
 				'controllers/order/createOrder error',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -63,7 +64,7 @@ const getUserOrder = (req, res) => {
 		})
 		.catch((err) => {
 			loggerOrders.error(req.uuid, 'controllers/order/getUserOrder error', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -83,7 +84,7 @@ const cancelUserOrder = (req, res) => {
 		})
 		.catch((err) => {
 			loggerOrders.error(req.uuid, 'controllers/order/cancelUserOrder error', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -110,7 +111,7 @@ const getAllUserOrders = (req, res) => {
 		})
 		.catch((err) => {
 			loggerOrders.error(req.uuid, 'controllers/order/getAllUserOrders error', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -125,7 +126,7 @@ const cancelAllUserOrders = (req, res) => {
 		})
 		.catch((err) => {
 			loggerOrders.error(req.uuid, 'controllers/order/cancelAllUserOrders error', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -170,7 +171,7 @@ const getAdminOrders = (req, res) => {
 		})
 		.catch((err) => {
 			loggerOrders.debug(req.uuid, 'controllers/order/getAdminOrders', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -190,7 +191,7 @@ const adminCancelOrder = (req, res) => {
 				'controllers/order/adminCancelOrder',
 				err.message
 			);
-			return res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/otp.js b/server/api/controllers/otp.js
index 131969f4c6..013d45e701 100644
--- a/server/api/controllers/otp.js
+++ b/server/api/controllers/otp.js
@@ -3,6 +3,7 @@
 const { INVALID_OTP_CODE } = require('../../messages');
 const { loggerOtp } = require('../../config/logger');
 const toolsLib = require('hollaex-tools-lib');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const requestOtp = (req, res) => {
 	loggerOtp.verbose(req.uuid, 'controllers/otp/requestOtp', req.auth);
@@ -17,11 +18,11 @@ const requestOtp = (req, res) => {
 		})
 		.then((secret) => {
 			loggerOtp.verbose(req.uuid, 'controllers/otp/requestOtp', secret);
-			res.json({ secret });
+			return res.json({ secret });
 		})
 		.catch((err) => {
 			loggerOtp.error(req.uuid, 'controllers/otp/requestOtp', err.message);
-			res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -52,11 +53,11 @@ const activateOtp = (req, res) => {
 				'controllers/otp/activateOtp',
 				user.dataValues
 			);
-			res.json({ message: 'OTP enabled' });
+			return res.json({ message: 'OTP enabled' });
 		})
 		.catch((err) => {
 			loggerOtp.error(req.uuid, 'controllers/otp/activateOtp', err.message);
-			res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -81,7 +82,7 @@ const deactivateOtp = (req, res) => {
 			return toolsLib.security.updateUserOtpEnabled(id, false);
 		})
 		.then(() => {
-			res.json({ message: 'OTP disabled' });
+			return res.json({ message: 'OTP disabled' });
 		})
 		.catch((err) => {
 			loggerOtp.error(
@@ -89,7 +90,7 @@ const deactivateOtp = (req, res) => {
 				'controllers/otp/deactivateOtp',
 				err.message
 			);
-			res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -111,7 +112,7 @@ const deactivateOtpAdmin = (req, res) => {
 				'controllers/otp/deactivateOtpAdmin',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/public.js b/server/api/controllers/public.js
index e631283f39..1d7cb843cc 100644
--- a/server/api/controllers/public.js
+++ b/server/api/controllers/public.js
@@ -4,6 +4,7 @@ const packageJson = require('../../package.json');
 const { API_HOST } = require('../../constants');
 const { loggerPublic } = require('../../config/logger');
 const toolsLib = require('hollaex-tools-lib');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const getHealth = (req, res) => {
 	try {
@@ -16,7 +17,7 @@ const getHealth = (req, res) => {
 		});
 	} catch (err) {
 		loggerPublic.verbose('controller/public/getHealth', err.message);
-		return res.status(err.status || 400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -28,7 +29,7 @@ const getConstants = (req, res) => {
 		});
 	} catch (err) {
 		loggerPublic.verbose('controller/public/getConstants', err.message);
-		return res.status(err.status || 400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -37,7 +38,7 @@ const getKitConfigurations = (req, res) => {
 		return res.json(toolsLib.getKitConfig());
 	} catch (err) {
 		loggerPublic.verbose('controller/public/getKitConfigurations', err.message);
-		return res.status(err.status || 400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -49,7 +50,7 @@ const sendSupportEmail = (req, res) => {
 		})
 		.catch((err) => {
 			loggerPublic.verbose('controller/public/sendSupportEmail', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -66,7 +67,7 @@ const getTopOrderbook = (req, res) => {
 				'controller/public/getTopOrderbook',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -81,7 +82,7 @@ const getTopOrderbooks = (req, res) => {
 				'controller/public/getTopOrderbooks',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -107,7 +108,7 @@ const getTrades = (req, res) => {
 				'controller/public/getTrades',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -142,7 +143,7 @@ const getTradesHistory = (req, res) => {
 				'controller/public/getTrades',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -159,7 +160,7 @@ const getTicker = (req, res) => {
 				'controller/public/getTicker',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -174,7 +175,7 @@ const getAllTicker = (req, res) => {
 				'controller/public/getAllTicker',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -200,7 +201,7 @@ const getChart = (req, res) => {
 				'controller/public/getChart',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -217,7 +218,7 @@ const getCharts = (req, res) => {
 				'controller/public/getCharts',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -232,7 +233,7 @@ const getConfig = (req, res) => {
 				'controller/public/getConfig',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -258,7 +259,7 @@ const getHistory = (req, res) => {
 				'controller/public/getHistory',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -284,7 +285,7 @@ const getSymbols = (req, res) => {
 				'controller/public/getSymbols',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -303,7 +304,7 @@ const getAssetsPrices = (req, res) => {
 				'controller/public/getAssetsPrices',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/tier.js b/server/api/controllers/tier.js
index 6486985786..f770232176 100644
--- a/server/api/controllers/tier.js
+++ b/server/api/controllers/tier.js
@@ -2,13 +2,14 @@
 
 const toolsLib = require('hollaex-tools-lib');
 const { loggerTier } = require('../../config/logger');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const getTiers = (req, res) => {
 	try {
 		return res.json(toolsLib.getKitTiers());
 	} catch (err) {
 		loggerTier.error(req.uuid, 'controllers/tier/getTiers err', err.message);
-		return res.status(err.status || 400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -26,7 +27,7 @@ const postTier = (req, res) => {
 		})
 		.catch((err) => {
 			loggerTier.error(req.uuid, 'controllers/tier/postTier err', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -51,7 +52,7 @@ const putTier = (req, res) => {
 		})
 		.catch((err) => {
 			loggerTier.error(req.uuid, 'controllers/tier/postTier err', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -85,7 +86,7 @@ const updatePairFees = (req, res) => {
 				'controllers/tier/updatePairFees err',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -118,7 +119,7 @@ const updateTiersLimits = (req, res) => {
 				'controllers/tier/updatePairLimits err',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/trade.js b/server/api/controllers/trade.js
index 435d2a3438..1faad76857 100644
--- a/server/api/controllers/trade.js
+++ b/server/api/controllers/trade.js
@@ -2,6 +2,7 @@
 
 const { loggerTrades } = require('../../config/logger');
 const toolsLib = require('hollaex-tools-lib');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const getUserTrades = (req, res) => {
 	loggerTrades.verbose(
@@ -31,7 +32,7 @@ const getUserTrades = (req, res) => {
 		})
 		.catch((err) => {
 			loggerTrades.error(req.uuid, 'controllers/trade/getUserTrades', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -60,7 +61,7 @@ const getAdminTrades = (req, res) => {
 		})
 		.catch((err) => {
 			loggerTrades.error(req.uuid, 'controllers/trade/getAdminTrades', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/user.js b/server/api/controllers/user.js
index f3ebd7ed90..923576900f 100644
--- a/server/api/controllers/user.js
+++ b/server/api/controllers/user.js
@@ -5,6 +5,7 @@ const toolsLib = require('hollaex-tools-lib');
 const { sendEmail } = require('../../mail');
 const { MAILTYPE } = require('../../mail/strings');
 const { loggerUser } = require('../../config/logger');
+const { errorMessageConverter } = require('../../utils/conversion');
 const {
 	USER_VERIFIED,
 	PROVIDE_VALID_EMAIL_CODE,
@@ -127,7 +128,7 @@ const signUpUser = (req, res) => {
 				{}
 			);
 
-			if (isString(referral)) {
+			if (referral) {
 				toolsLib.user.checkAffiliation(referral, user.id);
 			}
 
@@ -135,12 +136,7 @@ const signUpUser = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/signUpUser', err.message);
-			let status = err.status || 400;
-			let message = err.message;
-			if (err.name === 'SequelizeValidationError') {
-				message = err.errs[0].message;
-			}
-			return res.status(status).json({ message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -187,10 +183,13 @@ const getVerifyUser = (req, res) => {
 	promiseQuery
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/getVerifyUser', err.message);
-			if (err.message === USER_NOT_FOUND) {
-				return res.json({ message: VERIFICATION_EMAIL_MESSAGE });
+			let errorMessage = errorMessageConverter(err);
+
+			if (errorMessage === USER_NOT_FOUND) {
+				errorMessage = VERIFICATION_EMAIL_MESSAGE;
 			}
-			return res.status(err.status || 400).json({ message: err.message });
+
+			return res.status(err.statusCode || 400).json({ message: errorMessage });
 		});
 };
 
@@ -237,7 +236,7 @@ const verifyUser = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/verifyUser', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -327,7 +326,7 @@ const loginPost = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/loginPost catch', err.message);
-			return res.status(403).json({ message: err.message });
+			return res.status(err.statusCode || 403).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -347,11 +346,13 @@ const requestResetPassword = (req, res) => {
 			return res.json({ message: `Password request sent to: ${email}` });
 		})
 		.catch((err) => {
-			if (err.message === USER_NOT_FOUND) {
-				return res.json({ message: `Password request sent to: ${email}` });
+			let errorMessage = errorMessageConverter(err);
+
+			if (errorMessage === USER_NOT_FOUND) {
+				errorMessage = `Password request sent to: ${email}`;
 			}
 			loggerUser.error(req.uuid, 'controllers/user/requestResetPassword', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessage });
 		});
 };
 
@@ -364,7 +365,7 @@ const resetPassword = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/resetPassword', err.message);
-			return res.status(err.status || 400).json({ message: 'Invalid code' });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -381,7 +382,7 @@ const getUser = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/getUser', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -399,7 +400,7 @@ const updateSettings = (req, res) => {
 		.then((user) => res.json(user))
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/updateSettings', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -417,7 +418,7 @@ const changePassword = (req, res) => {
 		.then(() => res.json({ message: 'Success' }))
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/changePassword', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -431,7 +432,7 @@ const setUsername = (req, res) => {
 		.then(() => res.json({ message: 'Username successfully changed' }))
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/setUsername', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -462,7 +463,7 @@ const getUserLogins = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/getUserLogins', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -477,7 +478,7 @@ const affiliationCount = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/affiliationCount', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -491,7 +492,7 @@ const getUserBalance = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error(req.uuid, 'controllers/user/getUserBalance', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -513,7 +514,7 @@ const deactivateUser = (req, res) => {
 				'controllers/user/deactivateUser',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -525,18 +526,29 @@ const createCryptoAddress = (req, res) => {
 	);
 
 	const { id } = req.auth.sub;
-	const crypto = req.swagger.params.crypto.value;
+	const { crypto, network } = req.swagger.params;
 
-	if (!crypto || !toolsLib.subscribedToCoin(crypto)) {
+	loggerUser.info(
+		req.uuid,
+		'controllers/user/createCryptoAddress',
+		'crypto',
+		crypto.value,
+		'network',
+		network.value
+	);
+
+	if (!crypto.value || !toolsLib.subscribedToCoin(crypto.value)) {
 		loggerUser.error(
 			req.uuid,
 			'controllers/user/createCryptoAddress',
-			`Invalid crypto: "${crypto}"`
+			`Invalid crypto: "${crypto.value}"`
 		);
-		return res.status(404).json({ message: `Invalid crypto: "${crypto}"` });
+		return res.status(404).json({ message: `Invalid crypto: "${crypto.value}"` });
 	}
 
-	toolsLib.user.createUserCryptoAddressByKitId(id, crypto)
+	toolsLib.user.createUserCryptoAddressByKitId(id, crypto.value, {
+		network: network.value
+	})
 		.then((data) => {
 			return res.status(201).json(data);
 		})
@@ -546,7 +558,7 @@ const createCryptoAddress = (req, res) => {
 				'controllers/user/createCryptoAddress',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -565,7 +577,7 @@ const getHmacToken = (req, res) => {
 				'controllers/user/getHmacToken err',
 				err.message
 			);
-			res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -590,7 +602,7 @@ const createHmacToken = (req, res) => {
 				'controllers/user/createHmacToken',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -614,7 +626,7 @@ const deleteHmacToken = (req, res) => {
 				'controllers/user/deleteHmacToken',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -632,7 +644,7 @@ const getUserStats = (req, res) => {
 		})
 		.catch((err) => {
 			loggerUser.error('controllers/user/getUserStats', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -657,7 +669,7 @@ const userCheckTransaction = (req, res) => {
 				'controllers/user/userCheckTransaction catch',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/controllers/withdrawal.js b/server/api/controllers/withdrawal.js
index 821fa30490..cd0980cf3c 100644
--- a/server/api/controllers/withdrawal.js
+++ b/server/api/controllers/withdrawal.js
@@ -4,6 +4,7 @@ const { loggerWithdrawals } = require('../../config/logger');
 const toolsLib = require('hollaex-tools-lib');
 const { all } = require('bluebird');
 const { USER_NOT_FOUND } = require('../../messages');
+const { errorMessageConverter } = require('../../utils/conversion');
 
 const getWithdrawalFee = (req, res) => {
 	const currency = req.swagger.params.currency.value;
@@ -25,7 +26,7 @@ const getWithdrawalFee = (req, res) => {
 			'controller/withdrawal/getWithdrawalFee err',
 			err.message
 		);
-		return res.status(400).json({ message: err.message });
+		return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 	}
 };
 
@@ -41,12 +42,31 @@ const requestWithdrawal = (req, res) => {
 		address,
 		otp_code,
 		amount,
-		currency
+		currency,
+		network
 	} = req.swagger.params.data.value;
 	const domain = req.headers['x-real-origin'];
 	const ip = req.headers['x-real-ip'];
 
-	toolsLib.wallet.sendRequestWithdrawalEmail(id, address, amount, currency, otp_code, ip, domain)
+	loggerWithdrawals.verbose(
+		req.uuid,
+		'controller/withdrawal/requestWithdrawal auth',
+		'address',
+		address,
+		'amount',
+		amount,
+		'currency',
+		currency,
+		'network',
+		network
+	);
+
+	toolsLib.wallet.sendRequestWithdrawalEmail(id, address, amount, currency, {
+		network,
+		otp_code,
+		ip,
+		domain
+	})
 		.then(() => {
 			return res.json({ message: 'Success' });
 		})
@@ -56,7 +76,7 @@ const requestWithdrawal = (req, res) => {
 				'controller/withdrawal/requestWithdrawal',
 				err.message
 			);
-			return res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -86,7 +106,16 @@ const performWithdrawal = (req, res) => {
 			if (user.verification_level < 1) {
 				throw new Error('User must upgrade verification level to perform a withdrawal');
 			}
-			return all([ toolsLib.wallet.performWithdrawal(withdrawal.user_id, withdrawal.address, withdrawal.currency, withdrawal.amount, withdrawal.fee), withdrawal ]);
+			return all([
+				toolsLib.wallet.performWithdrawal(
+					withdrawal.user_id,
+					withdrawal.address,
+					withdrawal.currency,
+					withdrawal.amount,
+					{ network: withdrawal.network }
+				),
+				withdrawal
+			]);
 		})
 		.then(([ { transaction_id }, { fee } ]) => {
 			return res.json({
@@ -101,7 +130,7 @@ const performWithdrawal = (req, res) => {
 				'controller/withdrawals/performWithdrawal',
 				err.message
 			);
-			return res.status(400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -112,9 +141,43 @@ const getAdminWithdrawals = (req, res) => {
 		req.auth
 	);
 
-	const { user_id, currency, limit, page, order_by, order, start_date, end_date, status, dismissed, rejected, processing, waiting, format } = req.swagger.params;
+	const {
+		user_id,
+		currency,
+		limit,
+		page,
+		order_by,
+		order,
+		start_date,
+		end_date,
+		status,
+		dismissed,
+		rejected,
+		processing,
+		waiting,
+		format,
+		transaction_id,
+		address
+	} = req.swagger.params;
 
-	toolsLib.wallet.getUserWithdrawalsByKitId(user_id.value, currency.value, status.value, dismissed.value, rejected.value, processing.value, waiting.value, limit.value, page.value, order_by.value, order.value, start_date.value, end_date.value, format.value)
+	toolsLib.wallet.getUserWithdrawalsByKitId(
+		user_id.value,
+		currency.value,
+		status.value,
+		dismissed.value,
+		rejected.value,
+		processing.value,
+		waiting.value,
+		limit.value,
+		page.value,
+		order_by.value,
+		order.value,
+		start_date.value,
+		end_date.value,
+		transaction_id.value,
+		address.value,
+		format.value
+	)
 		.then((data) => {
 			if (format.value) {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-users-deposits.csv`);
@@ -130,7 +193,7 @@ const getAdminWithdrawals = (req, res) => {
 				'controllers/withdrawal/getWithdrawals',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -141,10 +204,42 @@ const getUserWithdrawals = (req, res) => {
 		req.auth.sub
 	);
 	const user_id = req.auth.sub.id;
-	const currency = req.swagger.params.currency.value || '';
-	const { limit, page, order_by, order, start_date, end_date, format } = req.swagger.params;
+	const {
+		limit,
+		currency,
+		page,
+		order_by,
+		order,
+		start_date,
+		end_date,
+		format,
+		transaction_id,
+		address,
+		status,
+		dismissed,
+		rejected,
+		processing,
+		waiting
+	} = req.swagger.params;
 
-	toolsLib.wallet.getUserWithdrawalsByKitId(user_id, currency, limit.value, page.value, order_by.value, order.value, start_date.value, end_date.value, format.value)
+	toolsLib.wallet.getUserWithdrawalsByKitId(
+		user_id,
+		currency.value,
+		status.value,
+		dismissed.value,
+		rejected.value,
+		processing.value,
+		waiting.value,
+		limit.value,
+		page.value,
+		order_by.value,
+		order.value,
+		start_date.value,
+		end_date.value,
+		transaction_id.value,
+		address.value,
+		format.value
+	)
 		.then((data) => {
 			if (format.value) {
 				res.setHeader('Content-disposition', `attachment; filename=${toolsLib.getKitConfig().api_name}-withdrawals.csv`);
@@ -156,7 +251,7 @@ const getUserWithdrawals = (req, res) => {
 		})
 		.catch((err) => {
 			loggerWithdrawals.error('controllers/withdrawal/getUserWithdrawals', err.message);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
@@ -180,7 +275,7 @@ const cancelWithdrawal = (req, res) => {
 				'controllers/withdrawal/cancelWithdrawal',
 				err.message
 			);
-			return res.status(err.status || 400).json({ message: err.message });
+			return res.status(err.statusCode || 400).json({ message: errorMessageConverter(err) });
 		});
 };
 
diff --git a/server/api/swagger/swagger.yaml b/server/api/swagger/swagger.yaml
index 239a78fa26..8e8644e74c 100644
--- a/server/api/swagger/swagger.yaml
+++ b/server/api/swagger/swagger.yaml
@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  version: "2.0.14"
+  version: "2.1.0"
   title: HollaEx Kit
 host: api.hollaex.com
 basePath: /v2
@@ -1443,6 +1443,13 @@ paths:
           type: string
           minLength: 3
           maxLength: 15
+        - name: network
+          in: query
+          required: false
+          type: string
+          description: Blockchain network
+          minLength: 2
+          maxLength: 10
       responses:
         201:
           description: Success
@@ -1675,6 +1682,41 @@ paths:
           required: false
           enum: ['csv']
           type: string
+        - in: query
+          name: transaction_id
+          description: unique transaction id
+          required: false
+          type: string
+        - in: query
+          name: address
+          description: Address of the withdrawal
+          required: false
+          type: string
+        - in: query
+          name: status
+          required: false
+          type: boolean
+          description: Status of the withdrawals. False = "Pending"; True = "Completed"
+        - in: query
+          name: dismissed
+          required: false
+          type: boolean
+          description: Cancel status of the withdrawals.
+        - in: query
+          name: rejected
+          required: false
+          type: boolean
+          description: Rejected status of the withdrawals.
+        - in: query
+          name: processing
+          required: false
+          type: boolean
+          description: Processing status of the deposit.
+        - in: query
+          name: waiting
+          required: false
+          type: boolean
+          description: Waiting status of the deposit.
       responses:
         200:
           description: Success
@@ -1748,6 +1790,41 @@ paths:
           required: false
           enum: ['csv']
           type: string
+        - in: query
+          name: transaction_id
+          description: unique transaction id
+          required: false
+          type: string
+        - in: query
+          name: address
+          description: Address of the withdrawal
+          required: false
+          type: string
+        - in: query
+          name: status
+          required: false
+          type: boolean
+          description: Status of the withdrawals. False = "Pending"; True = "Completed"
+        - in: query
+          name: dismissed
+          required: false
+          type: boolean
+          description: Cancel status of the withdrawals.
+        - in: query
+          name: rejected
+          required: false
+          type: boolean
+          description: Rejected status of the withdrawals.
+        - in: query
+          name: processing
+          required: false
+          type: boolean
+          description: Processing status of the deposit.
+        - in: query
+          name: waiting
+          required: false
+          type: boolean
+          description: Waiting status of the deposit.
       responses:
         200:
           description: Success
@@ -2325,7 +2402,7 @@ paths:
     x-swagger-router-controller: admin
     put:
       operationId: putUserRole
-      description: "Update a user's role"
+      description: Update a user's role
       tags:
         - Admin
       parameters:
@@ -2351,6 +2428,50 @@ paths:
         - Bearer: []
       x-security-scopes:
         - admin
+  /admin/user/discount:
+    x-swagger-router-controller: admin
+    put:
+      operationId: putUserDiscount
+      description: Update a user's discount rate
+      tags:
+        - Admin
+      parameters:
+        - name: user_id
+          in: query
+          required: true
+          type: number
+        - name: data
+          in: body
+          required: true
+          schema:
+            type: object
+            required:
+              - discount
+            properties:
+              discount:
+                type: number
+                format: double
+                minimum: 0
+                maximum: 100
+      responses:
+        200:
+          description: Success
+          schema:
+            type: object
+            required:
+              - discount
+            properties:
+              discount:
+                type: number
+                format: double
+        default:
+          description: Error
+          schema:
+            $ref: "#/definitions/MessageResponse"
+      security:
+        - Bearer: []
+      x-security-scopes:
+        - admin
   /admin/user/note:
     x-swagger-router-controller: admin
     put:
@@ -3205,10 +3326,10 @@ paths:
           schema:
             $ref: "#/definitions/MintBurnRequest"
       responses:
-        200:
+        201:
           description: Success
           schema:
-            $ref: "#/definitions/MessageResponse"
+            $ref: "#/definitions/TransactionResponse"
         default:
           description: Error
           schema:
@@ -3217,6 +3338,30 @@ paths:
         - Bearer: []
       x-security-scopes:
         - admin
+    put:
+      operationId: putMint
+      description: Update pending mint
+      tags:
+        - Admin
+      parameters:
+        - in: body
+          name: data
+          required: true
+          schema:
+            $ref: "#/definitions/MintBurnUpdate"
+      responses:
+        200:
+          description: Success
+          schema:
+            $ref: "#/definitions/TransactionResponse"
+        default:
+          description: "Error"
+          schema:
+            $ref: "#/definitions/MessageResponse"
+      security:
+        - Bearer: []
+      x-security-scopes:
+        - admin
   /admin/burn:
     x-swagger-router-controller: admin
     post:
@@ -3231,10 +3376,10 @@ paths:
           schema:
             $ref: "#/definitions/MintBurnRequest"
       responses:
-        200:
+        201:
           description: Success
           schema:
-            $ref: "#/definitions/MessageResponse"
+            $ref: "#/definitions/TransactionResponse"
         default:
           description: Error
           schema:
@@ -3243,6 +3388,30 @@ paths:
         - Bearer: []
       x-security-scopes:
         - admin
+    put:
+      operationId: putBurn
+      description: Update pending burn
+      tags:
+        - Admin
+      parameters:
+        - in: body
+          name: data
+          required: true
+          schema:
+            $ref: "#/definitions/MintBurnUpdate"
+      responses:
+        200:
+          description: Success
+          schema:
+            $ref: "#/definitions/TransactionResponse"
+        default:
+          description: "Error"
+          schema:
+            $ref: "#/definitions/MessageResponse"
+      security:
+        - Bearer: []
+      x-security-scopes:
+        - admin
 definitions:
   ObjectResponse:
     type: object
@@ -3395,8 +3564,10 @@ definitions:
             type: boolean
       bank_account:
         $ref: "#/definitions/BankArray"
-      crypto_wallet:
-        type: object
+      wallet:
+        type: array
+        items:
+          type: object
       verification_level:
         type: number
       settings:
@@ -3547,6 +3718,11 @@ definitions:
         description: OTP code when otp is enabled
         minLength: 6
         maxLength: 6
+      network:
+        type: string
+        description: Blockchain network
+        minLength: 2
+        maxLength: 10
   OtpRequest:
     type: object
     required:
@@ -3748,6 +3924,31 @@ definitions:
             type: boolean
           native_currency:
             type: string
+          injected_html:
+            type: object
+            required:
+              - head
+              - body
+            properties:
+              head:
+                type: string
+              body:
+                type: string
+          injected_values:
+            type: array
+            items:
+              type: object
+              required:
+                - tag
+                - target
+                - attributes
+              properties:
+                tag:
+                  type: string
+                target:
+                  type: string
+                attributes:
+                  type: object
       secrets:
         type: object
         properties:
@@ -3985,6 +4186,8 @@ definitions:
         type: string
       crypto:
         type: string
+      network:
+        type: string
   TokensResponse:
     type: object
     properties:
@@ -4059,7 +4262,6 @@ definitions:
     required:
       - txid
       - amount
-      - address
       - is_confirmed
       - user_id
     properties:
@@ -4073,15 +4275,18 @@ definitions:
         type: boolean
       user_id:
         type: number
+      rejected:
+        type: boolean
+      created_at:
+        type: string
+        format: date-time
   ExternalWithdrawalRequest:
     type: object
     required:
       - txid
       - amount
-      - address
       - is_confirmed
       - user_id
-      - fee
     properties:
       amount:
         type: number
@@ -4095,6 +4300,11 @@ definitions:
         type: boolean
       user_id:
         type: number
+      rejected:
+        type: boolean
+      created_at:
+        type: string
+        format: date-time
   OrderbooksResponse:
     type: object
     description: Top 10 orderbooks, where key is the symbol(currency) and the values is an object with the top 10 bids and ask.
@@ -4275,4 +4485,21 @@ definitions:
         type: number
         format: double
       transaction_id:
-        type: string
\ No newline at end of file
+        type: string
+      status:
+        type: boolean
+  MintBurnUpdate:
+    type: object
+    required:
+      - transaction_id
+    properties:
+      transaction_id:
+        type: string
+      updated_transaction_id:
+        type: string
+      status:
+        type: boolean
+      rejected:
+        type: boolean
+      dismissed:
+        type: boolean
\ No newline at end of file
diff --git a/server/constants.js b/server/constants.js
index 9bdbd24bea..3c8e3cec43 100644
--- a/server/constants.js
+++ b/server/constants.js
@@ -23,7 +23,9 @@ let configuration = {
 		captcha: {},
 		defaults: {},
 		features: {},
-		meta: {}
+		meta: {},
+		injected_values: [],
+		injected_html: {}
 	}
 };
 
@@ -86,6 +88,7 @@ const resetAllConfig = () => {
 	configuration = {
 		coins: {},
 		pairs: {},
+		tiers: {},
 		kit: {
 			info: {},
 			color: {},
@@ -96,7 +99,9 @@ const resetAllConfig = () => {
 			captcha: {},
 			defaults: {},
 			features: {},
-			meta: {}
+			meta: {},
+			injected_values: [],
+			injected_html: {}
 		}
 	};
 };
@@ -150,7 +155,9 @@ exports.KIT_CONFIG_KEYS = [
 	'meta',
 	'features',
 	'setup_completed',
-	'email_verification_required'
+	'email_verification_required',
+	'injected_values',
+	'injected_html'
 ];
 
 exports.KIT_SECRETS_KEYS = [
@@ -283,8 +290,8 @@ exports.DEFAULT_FEES = {
 		taker: 0.3
 	},
 	lite: {
-		maker: 0.1,
-		taker: 0.2
+		maker: 0.05,
+		taker: 0.1
 	},
 	member: {
 		maker: 0,
diff --git a/server/db/migrations/20201014015535-create-tiers.js b/server/db/migrations/20201014015535-create-tiers.js
index 2669c81271..b6938959ec 100644
--- a/server/db/migrations/20201014015535-create-tiers.js
+++ b/server/db/migrations/20201014015535-create-tiers.js
@@ -7,6 +7,7 @@ module.exports = {
 			{
 				id: {
 					allowNull: false,
+					autoIncrement: true,
 					primaryKey: true,
 					type: Sequelize.INTEGER
 				},
diff --git a/server/db/migrations/20210331025558-change-script-plugins.js b/server/db/migrations/20210331025558-change-script-plugins.js
new file mode 100644
index 0000000000..95333511b2
--- /dev/null
+++ b/server/db/migrations/20210331025558-change-script-plugins.js
@@ -0,0 +1,17 @@
+'use strict';
+
+const TABLE = 'Plugins';
+const COLUMN = 'script';
+
+module.exports = {
+	up: (queryInterface, Sequelize) =>
+		queryInterface.changeColumn(TABLE, COLUMN, {
+			type: Sequelize.TEXT,
+			allowNull: true
+		}),
+	down: (queryInterface, Sequelize) =>
+		queryInterface.changeColumn(TABLE, COLUMN, {
+			type: Sequelize.TEXT,
+			allowNull: false
+		})
+};
\ No newline at end of file
diff --git a/server/db/migrations/20210416020745-add-user-discount.js b/server/db/migrations/20210416020745-add-user-discount.js
new file mode 100644
index 0000000000..4feeef4019
--- /dev/null
+++ b/server/db/migrations/20210416020745-add-user-discount.js
@@ -0,0 +1,14 @@
+'use strict';
+const TABLE = 'Users';
+const COLUMN = 'discount';
+
+module.exports = {
+	up: (queryInterface, Sequelize) =>
+		queryInterface
+			.addColumn(TABLE, COLUMN, {
+				type: Sequelize.DOUBLE,
+				defaultValue: 0
+			}),
+	down: (queryInterface, Sequelize) =>
+		queryInterface.removeColumn(TABLE, COLUMN)
+};
\ No newline at end of file
diff --git a/server/db/models/plugin.js b/server/db/models/plugin.js
index 4f4877e934..8279b1b3c0 100644
--- a/server/db/models/plugin.js
+++ b/server/db/models/plugin.js
@@ -53,7 +53,7 @@ module.exports = (sequelize, DataTypes) => {
 		},
 		script: {
 			type: DataTypes.TEXT,
-			allowNull: false
+			allowNull: true
 		},
 		admin_view: {
 			type: DataTypes.TEXT
diff --git a/server/db/models/user.js b/server/db/models/user.js
index 2d74dd749b..3d696c8629 100644
--- a/server/db/models/user.js
+++ b/server/db/models/user.js
@@ -160,6 +160,10 @@ module.exports = function(sequelize, DataTypes) {
 			},
 			network_id: {
 				type: DataTypes.INTEGER
+			},
+			discount: {
+				type: DataTypes.DOUBLE,
+				defaultValue: 0
 			}
 		},
 		{
diff --git a/server/db/seeders/20190825120350-add-status.js b/server/db/seeders/20190825120350-add-status.js
index a3f0f29a53..3e365a12dd 100644
--- a/server/db/seeders/20190825120350-add-status.js
+++ b/server/db/seeders/20190825120350-add-status.js
@@ -84,6 +84,8 @@ module.exports = {
 						logo_image: LOGO_IMAGE || 'https://dash.testnet.bitholla.com/assets/img/hex-pattern-icon-black-01.svg',
 						valid_languages: VALID_LANGUAGES || 'en,fa,ko,ar,fr',
 						new_user_is_activated: (NEW_USER_IS_ACTIVATED && NEW_USER_IS_ACTIVATED === 'true') || false,
+						injected_values: [],
+						injected_html: {},
 						captcha: {
 							site_key: CAPTCHA_SITE_KEY
 						},
diff --git a/server/init.js b/server/init.js
index 2eb7fcdaa2..06aa1d0255 100644
--- a/server/init.js
+++ b/server/init.js
@@ -59,7 +59,9 @@ const checkStatus = () => {
 			captcha: {},
 			defaults: {},
 			features: {},
-			meta: {}
+			meta: {},
+			injected_values: [],
+			injected_html: {}
 		}
 	};
 
diff --git a/server/mail/index.js b/server/mail/index.js
index f0749d27ba..060697a0cb 100644
--- a/server/mail/index.js
+++ b/server/mail/index.js
@@ -50,6 +50,7 @@ const sendEmail = (
 		case MAILTYPE.INVALID_ADDRESS:
 		case MAILTYPE.USER_DEACTIVATED:
 		case MAILTYPE.INVITED_OPERATOR:
+		case MAILTYPE.DISCOUNT_UPDATE:
 		case MAILTYPE.WITHDRAWAL_REQUEST:
 		case MAILTYPE.DEPOSIT:
 		case MAILTYPE.WITHDRAWAL: {
diff --git a/server/mail/strings/ar.js b/server/mail/strings/ar.js
new file mode 100644
index 0000000000..e362503733
--- /dev/null
+++ b/server/mail/strings/ar.js
@@ -0,0 +1,326 @@
+'use strict';
+
+const { GET_KIT_CONFIG } = require('../../constants');
+const API_NAME = () => GET_KIT_CONFIG().api_name;
+
+const COMMON = {
+	GREETING: (name) => `${name} العزيز`,
+	CLOSING: {
+		1: 'تحية',
+		2: () => `فريق ${API_NAME()}`
+	},
+	IP_ADDRESS: (ip) => `عنوان IP: ${ip}`,
+	IP_REQUEST_FROM: (ip) => `تم بدء الطلب من: ${ip}`,
+	TXID: (txid) => `معرّف المعاملة:${txid} `,
+	FEE: (fee) => `الرسوم:  ${fee}`,
+	AMOUNT: (amount) => `المبلغ:  ${amount} `,
+	ADDRESS: (address) => `العنوان: ${address}`,
+	TIME: (time) => `الوقت:  ${time} `,
+	COUNTRY: (country) => `البلد:  ${country}`,
+	DEVICE: (device) => `الجهاز:  ${device} `,
+	MESSAGE: (message) => `الرسالة:  ${message}`,
+	ERROR_REQUEST:
+		'إذا تم تقديم هذا الطلب عن طريق الخطأ ، فمن الآمن تجاهله ؛ لن يتم إجراء أي تغييرات في حسابك.',
+	EXPLORER:
+		'يمكنك العثور على حالة معاملتك على البلوك تشين من خلال مستكشفات البلوكات هذه:',
+	DEPOSIT: 'ايداع',
+	WITHDRAWAL: 'سحب'
+};
+
+const FOOTER = {
+	FOLLOW_US: 'تابعنا على',
+	NEED_HELP: 'تحتاج مساعدة؟ فقط قم بالرد على هذا البريد الإلكتروني',
+	PRIVACY_POLICY: 'سياسة الخصوصية',
+	TERMS: 'الشروط و الأحكام',
+	INVITE_YOUR_FRIENDS: 'أدعو أصدقائك',
+	POWERED_BY: 'مشغل بواسطة'
+};
+
+const SIGNUP = {
+	TITLE: 'سجّل',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: () => `تحتاج إلى تأكيد حساب البريد الإلكتروني الخاص بك عن طريق النقر على الزر أدناه.
+		إذا كانت لديك أي أسئلة ، فلا تتردد في الاتصال بنا ببساطة عن طريق الرد على هذا البريد الإلكتروني.`,
+		2: 'الرجاء الضغط على الزر أدناه لمتابعة التسجيل الخاص بك.',
+		3: 'أيِّد'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const WELCOME = {
+	TITLE: 'أهلا بك',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: () => `شكرًا لك على الاشتراك في  ${API_NAME()} .`,
+		2: (account, deposit) => `
+		لكي تقوم بالتداول ، يجب عليك أولاً إيداع عملة مشفرة أو تمويل الأموال في حسابك. 
+		من فضلك ، انتقل إلى ${account}  وقم بزيارة صفحة ${Deposit}.`,
+		3: 'الحساب',
+		4: 'ايداع',
+		5: 'إذا كانت لديك أي أسئلة أو استفسارات ، فيرجى الاتصال بنا ببساطة عن طريق الرد على هذا البريد الإلكتروني.'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const LOGIN = {
+	TITLE: 'تسجيل الدخول',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: 'لقد سجلنا تسجيل دخولٍ إلى حسابك مع التفاصيل التالية',
+		2: (time) => COMMON.TIME(time),
+		3: (country) => COMMON.COUNTRY(country),
+		4: (device) => COMMON.DEVICE(device),
+		5: (ip) => COMMON.IP_ADDRESS(ip),
+		6: 'إذا لم يكن هذا أنت ، فيرجى تغيير كلمة المرور الخاصة بك وإعداد المصادقة ذات العاملين والاتصال بنا على الفور.'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const RESETPASSWORD = {
+	TITLE: 'طلب إعادة تعيين كلمة المرور',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: 'لقد قدمت طلباً لإعادة تعيين كلمة المرور لحسابك.',
+		2: 'لتحديث كلمة المرور الخاصة بك ، انقر على الرابط أدناه.',
+		3: 'إعادة تعيين كلمة المرور الخاصة بي',
+		4: COMMON.ERROR_REQUEST,
+		5: (ip) => COMMON.IP_REQUEST_FROM(ip)
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const DEPOSIT = {
+	TITLE: (currency) => `${currency.toUpperCase()} ${COMMON.DEPOSIT}`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		PENDING: (amount, confirmation = 1, currency) =>
+			`لديك إيداع جديد بمبلغ  {amount}$ ${currency.toUpperCase()}  في قيد الانتظار في محفظتك ${API_NAME()} .يرجى الانتظار حتى يتم تأكيد المعاملة وستتوفر أموالك في محفظتك. تتطلب معاملتك  ${confirmation} تأكيداً (تأكيداتٍ) على البلوك تشين.`,
+		COMPLETED: (amount, confirmation, currency) =>
+			`Yايداعك لـ
+       ${currency.toUpperCase()} ${amount} ${currency.toUpperCase()} قد تم تأكيده و تكميله و موجود في ${
+				currency.toUpperCase()
+			. محفظتك }`,
+		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
+		2: (status) => `الحالة:  ${status}`,
+		3: (address) => COMMON.ADDRESS(address),
+		4: (txid) => COMMON.TXID(txid),
+		5: COMMON.EXPLORER
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const ACCOUNTVERIFY = {
+	TITLE: 'تم التحقق من الحساب',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: 'تهانينا. تم التحقق من حسابك بنجاح.',
+		2: 'تداول الآن'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const ACCOUNTUPGRADE = {
+	TITLE: 'تم ترقية الحساب',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (level) =>
+			`تهانينا. تمت ترقية مستوى حسابك إلى مستوى  ${level}. ستستفيد من رسوم أقل وحدود سحب أعلى وميزات مميزة أخرى.`,
+		2: 'تداول الآن'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const DEPOSITCANCEL = {
+	TITLE: (currency, type) =>
+		`${currency.toUpperCase()} ${
+			COMMON[type.toUpperCase()]
+		} مرفوض`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		DEPOSIT: (currency, date, amount) =>
+			`We were not able to find or process your ${currency.toUpperCase()} deposit made on ${date} for ${amount}. Thus, the transaction is rejected by our system.`,
+		WITHDRAWAL: (currency, date, amount) =>
+			`لم نتمكن من العثور على الايداعك أو معالجة إيداعك ${currency.toUpperCase()} الذي تم إجراؤه في  ${date} بمبلغ  ${amount}. وبالتالي ، يتم رفض المعاملة من قبل نظامنا.`,
+		1: 'لم نتمكن من العثور على السحب الذي طلبته ${currency.toUpperCase()} أو معالجته في  ${date} بمبلغ  ${amount}.  وبالتالي تم رفض المعاملة من قبل نظامنا وإعادة مبلغ السحب المعلق إلى محفظتك ${API_NAME()}.',
+		2: (txid) => COMMON.TXID(txid),
+		3: (amount) => COMMON.AMOUNT(amount),
+		4: 'الحالة: مرفوضة'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const WITHDRAWAL = {
+	TITLE: (currency) =>
+		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		PENDING: (amount, currency, address = '') =>
+			`لقد قدمت طلب سحب بمبلغ ${amount} ${currency.toUpperCase()}  إلى عنوان ${address}. حالة السحب الخاصة بك في قيد الإنتظار وستتم معالجتها قريبًا.`,
+		COMPLETED: (amount, currency, address = '') =>
+			`تمت معالجة طلب سحبك بمبلغ ${amount} ${currency.toUpperCase()}  و نقله إلى عنوان ${address}.`,
+		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
+		2: (fee) => COMMON.FEE(fee),
+		3: (status) => `${status}:الحالة`,
+		4: (address) => COMMON.ADDRESS(address),
+		5: (txid) => COMMON.TXID(txid),
+		6: COMMON.EXPLORER
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const WITHDRAWALREQUEST = {
+	TITLE: (currency) =>
+		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL} طلب`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (currency, amount, address) =>
+			`لقد قدّمت طلب سحب ${currency.toUpperCase()} بمبلغ ${amount} الى ${address} `,
+		2: (amount) => COMMON.AMOUNT(amount),
+		3: (fee) => COMMON.FEE(fee),
+		4: (address) => `Address: ${address}`,
+		5: 'لتأكيد هذا السحب ، انقر على الزر أدناه.',
+		6: 'أيٍّد',
+		7: COMMON.ERROR_REQUEST,
+		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const INVALIDADDRESS = {
+	TITLE: 'عنوان السحب غير صالح',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (currency, amount) => `كان قد يُرسل مبلغ السحب {currency}  $الذي سحبته بمبلغ ${amount} إلى عنوان غير صالح وتم رفضه.`,
+		2: (address) => `العنوان: ${address}`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const ALERT = {
+	TITLE: (title) => `تنبيه: ${title}`,
+	BODY: {
+		1: (type) => `تنبيه: ${type}`
+	}
+};
+
+const USERVERIFICATIONREJECT = {
+	TITLE: (type) =>
+		type === 'هوية'
+			? 'تم رفض التحقق من الهوية'
+			: 'تم رفض طلب البنك الجديد',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (type) =>
+			type === 'هوية'
+				? 'تم معالجة عملية التحقق من هويتك الحديثة و تم رفضها للأسف. لمزيد من الإجراءات ، اقرأ الرسالة من خبيرنا أدناه:'
+				: 'تم معالجة تسجيلك المصرفي الجديد و تم رفضه للأسف. لمزيد من الإجراءات ، اقرأ الرسالة من خبيرنا أدناه:',
+		2: (message) => COMMON.MESSAGE(message)
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const USERDEACTIVATED = {
+	TITLE: (type) => `الحساب $ {type}`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		ACTIVATED: (email) => `تم تنشيط حسابك ${email}  . أنت الآن قادر على استخدام حسابك.`,
+		DEACTIVATED: (email) => `تم تعطيل حسابك ${email} . لن تتمكن من استخدام حسابك حتى يتم تنشيطه بواسطة مسؤول البورصة.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const CONTACTFORM = {
+	TITLE: 'نموذج الاتصال',
+	BODY: {
+		1: 'بيانات نموذج الاتصال',
+		2: (email) =>
+			`أرسل العميل بالبريد الإلكتروني   ${email} نموذج الاتصال.`,
+		3: (data) => `${JSON.stringify(data, null, 2)}`
+	}
+};
+
+const USERVERIFICATION = {
+	TITLE: 'التحقق من المستخدم',
+	BODY: {
+		1: 'مطلوب التحقق من المستخدم',
+		2: (email) =>
+			`قام المستخدم "${email}" بتحميل وثائقه للتحقق منها. الرجاء التحقق من وثائقه.`
+	}
+};
+
+const SUSPICIOUSDEPOSIT = {
+	TITLE: 'الوديعة مشكوك فيها',
+	BODY: {
+		1: 'الوديعة مشكوك فيها',
+		2: (email, currency) =>
+			`تلقى العميل بالبريد الإلكتروني ${email}  إيداع  ${currency.toUpperCase()}   مشكوكاً.`,
+		3: (txid) => COMMON.TXID(txid),
+		4: 'بيانات المعاملات:',
+		5: (data) => `${JSON.stringify(data)}`
+	}
+};
+
+const SMS = {
+	verificationCode: (code) =>
+		`رمز التحقق الخاص بك هو ${code} `
+	,
+	deposit: (currency, amount) =>
+		`تم التحقق من إيداعك ${currency.toUpperCase()} بمبلغ  ${amount} وإيداعه في محفظتك`
+	,
+	withdrawal: (currency, amount) =>
+		`تم التحقق من سحب ${currency.toUpperCase()}  الخاص بك بمبلغ ${amount}`
+};
+
+const INVITEDOPERATOR = {
+	TITLE: 'دعوة العامل',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		CREATED: {
+			1: (role, invitingEmail) => `لقد تمت دعوتك كعامل (operator) إلى ${API_NAME()} مع دور ${role}  بواسطة المستخدم ${invitingEmail}.`,
+			2: 'يتم توفير كلمة المرور المؤقتة الخاصة بك أدناه. تأكد من تغيير كلمة المرور الخاصة بك بعد تسجيل الدخول لأسباب أمنية.',
+			3: (email) => `${email} :البريد الإلكتروني `,
+			4: (password) => `${password}: كلمة المرور`,
+			5: 'Login'
+		},
+		EXISTING: {
+			1: (role, invitingEmail) => `تمت ترقية حسابك على  ${API_NAME()} إلى دور ${role} بواسطة المستخدم ${invitingEmail}.`,
+			2: 'تسجيل الدخول'
+		}
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+module.exports = {
+	FOOTER,
+	COMMON,
+	SIGNUP,
+	WELCOME,
+	LOGIN,
+	RESETPASSWORD,
+	DEPOSIT,
+	ACCOUNTVERIFY,
+	ACCOUNTUPGRADE,
+	USERVERIFICATIONREJECT,
+	DEPOSITCANCEL,
+	WITHDRAWAL,
+	WITHDRAWALREQUEST,
+	USERVERIFICATION,
+	SUSPICIOUSDEPOSIT,
+	INVALIDADDRESS,
+	CONTACTFORM,
+	USERDEACTIVATED,
+	ALERT,
+	SMS,
+	INVITEDOPERATOR,
+	DISCOUNTUPDATE
+};
diff --git a/server/mail/strings/de.js b/server/mail/strings/de.js
index f2dd2e7e3b..4c6aa150a2 100644
--- a/server/mail/strings/de.js
+++ b/server/mail/strings/de.js
@@ -156,10 +156,10 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
-			`Sie haben eine Auszahlungsanforderung für ${amount} ${currency.toUpperCase()} an die Adresse ${address} gemacht. Ihr Auszahlungsstatus ist ausstehend und wird in Kürze bearbeitet.`,
-		COMPLETED: (amount, address, currency) =>
-			`Ihr Auszahlungsantrag für ${amount} ${currency.toUpperCase()}  wurde bearbeitet und an die Adresse ${address} gesendet.`,
+		PENDING: (amount, currency) =>
+			`Sie haben eine Auszahlungsanforderung für ${amount} ${currency.toUpperCase()} gemacht. Ihr Auszahlungsstatus ist ausstehend und wird in Kürze bearbeitet.`,
+		COMPLETED: (amount, currency) =>
+			`Ihr Auszahlungsantrag für ${amount} ${currency.toUpperCase()} wurde bearbeitet.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
 		3: (status) => `Status: ${status}`,
@@ -180,10 +180,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `Adresse: ${address}`,
-		5: 'Um diese Auszahlung zu bestätigen, klicken Sie bitte auf die Taste unten.',
-		6: 'Bestätigen',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'Um diese Auszahlung zu bestätigen, klicken Sie bitte auf die Taste unten.',
+		7: 'Bestätigen',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -273,6 +274,15 @@ const SMS = {
 		`Ihre ${currency.toUpperCase()} Abhebung für den Betrag von ${amount} wurde bestätigt.`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -293,5 +303,6 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/en.js b/server/mail/strings/en.js
index cce05608d2..3ecde09746 100644
--- a/server/mail/strings/en.js
+++ b/server/mail/strings/en.js
@@ -156,10 +156,10 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
-			`You made a withdrawal request for ${amount} ${currency.toUpperCase()} to the address ${address}. Your withdrawal status is pending and will be processed shortly.`,
-		COMPLETED: (amount, address, currency) =>
-			`Your withdrawal request for ${amount} ${currency.toUpperCase()} is processed and transferred to the address ${address}.`,
+		PENDING: (amount, currency) =>
+			`You made a withdrawal request for ${amount} ${currency.toUpperCase()}. Your withdrawal status is pending and will be processed shortly.`,
+		COMPLETED: (amount, currency) =>
+			`Your withdrawal request for ${amount} ${currency.toUpperCase()} is processed.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
 		3: (status) => `Status: ${status}`,
@@ -180,10 +180,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `Address: ${address}`,
-		5: 'In order to confirm this withdrawal, please click the button below.',
-		6: 'Confirm',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'In order to confirm this withdrawal, please click the button below.',
+		7: 'Confirm',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -292,6 +293,15 @@ const INVITEDOPERATOR = {
 	CLOSING: COMMON.CLOSING
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -313,5 +323,6 @@ module.exports = {
 	USERDEACTIVATED,
 	ALERT,
 	SMS,
-	INVITEDOPERATOR
+	INVITEDOPERATOR,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/es.js b/server/mail/strings/es.js
index 7b38d97de6..cede759ae0 100644
--- a/server/mail/strings/es.js
+++ b/server/mail/strings/es.js
@@ -156,10 +156,10 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
-			`Usted hizo una solicitud de retiro de ${amount} ${currency.toUpperCase()} a la dirección  ${address}. El estado de su retirada está pendiente y se procesará en breve.`,
-		COMPLETED: (amount, address, currency) =>
-			`Su solicitud de retirada de ${amount} ${currency.toUpperCase()} se está procesando y transfiriendo a la dirección ${address}.`,
+		PENDING: (amount, currency) =>
+			`Usted hizo una solicitud de retiro de ${amount} ${currency.toUpperCase()}. El estado de su retirada está pendiente y se procesará en breve.`,
+		COMPLETED: (amount, currency) =>
+			`Su solicitud de retirada de ${amount} ${currency.toUpperCase()} se está procesando.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
 		3: (status) => `Estado: ${status}`,
@@ -180,10 +180,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `Dirección: ${address}`,
-		5: 'Para confirmar esta retirada, por favor haga clic en el botón de abajo.',
-		6: 'Confirmar',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'Para confirmar esta retirada, por favor haga clic en el botón de abajo.',
+		7: 'Confirmar',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -273,6 +274,15 @@ const SMS = {
 		`Su retiro de ${currency.toUpperCase()} de la cantidad de ${amount} fue confirmado`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -293,5 +303,6 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/fa.js b/server/mail/strings/fa.js
index dc896d3a2c..229af66b7a 100644
--- a/server/mail/strings/fa.js
+++ b/server/mail/strings/fa.js
@@ -159,9 +159,9 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
+		PENDING: (amount, currency, address = '') =>
 			`شما درخواست برداشت به مبلغ ${amount} ${currency.toUpperCase()} و به آدرس ${address}ثبت کرده اید. درخواست برداشت شما درحال انتظار بوده و به زودی مورد پردازش قرار خواهد گرفت.`,
-		COMPLETED: (amount, address, currency) =>
+		COMPLETED: (amount, currency, address = '') =>
 			`درخواست برداشت شما به مبلغ ${amount} ${currency.toUpperCase()} درحال انجام و ارسال به آدرس ${address}می باشد.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
@@ -183,10 +183,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `آدرس: ${address}`,
-		5: 'برای تایید برداشت خود ،دکمه زیر فشار دهید.',
-		6: 'تایید',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'برای تایید برداشت خود ،دکمه زیر فشار دهید.',
+		7: 'تایید',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -268,6 +269,15 @@ const INVITEDOPERATOR = {
 	CLOSING: COMMON.CLOSING
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -286,5 +296,6 @@ module.exports = {
 	SUSPICIOUSDEPOSIT,
 	CONTACTFORM,
 	SMS,
-	INVITEDOPERATOR
+	INVITEDOPERATOR,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/fr.js b/server/mail/strings/fr.js
index 61542978d7..274f6c66dd 100644
--- a/server/mail/strings/fr.js
+++ b/server/mail/strings/fr.js
@@ -156,10 +156,10 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
-			`Vous avez fait une demande de retrait de ${amount} ${currency.toUpperCase()} à l\'adresse ${address}. Le statut de votre retrait est en attente et sera traité sous peu.`,
-		COMPLETED: (amount, address, currency) =>
-			`Votre demande de retrait de ${amount} ${currency.toUpperCase()} est traité et transféré à l'adresse ${address}.`,
+		PENDING: (amount, currency) =>
+			`Vous avez fait une demande de retrait de ${amount} ${currency.toUpperCase()}. Le statut de votre retrait est en attente et sera traité sous peu.`,
+		COMPLETED: (amount, currency) =>
+			`Votre demande de retrait de ${amount} ${currency.toUpperCase()} est traité.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
 		3: (status) => `Status: ${status}`,
@@ -180,10 +180,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `Addresse: ${address}`,
-		5: 'Pour confirmer le retrait, veuillez cliquer dur le bouton ci-dessous.',
-		6: 'Confirmer',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'Pour confirmer le retrait, veuillez cliquer dur le bouton ci-dessous.',
+		7: 'Confirmer',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -274,6 +275,15 @@ const SMS = {
 		`Votre retrait de ${currency.toUpperCase()} d'un montant de ${amount} est confirmé`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -294,6 +304,7 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
 
diff --git a/server/mail/strings/id.js b/server/mail/strings/id.js
index bea4515360..983747093c 100644
--- a/server/mail/strings/id.js
+++ b/server/mail/strings/id.js
@@ -156,9 +156,9 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
+		PENDING: (amount, currency, address = '') =>
 			`Anda telah membuat permintaan penarikan untuk ${amount} ${currency.toUpperCase()} ke alamat ${address}. Penarikan Anda sedang dalam proses dan akan segera diproses.`,
-		COMPLETED: (amount, address, currency) =>
+		COMPLETED: (amount, currency, address = '') =>
 			`Permintaan penarikan Anda untuk ${amount} ${currency.toUpperCase()} telah diproses dan ditransfer ke alamat ${address}.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
@@ -180,10 +180,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `Alamat: ${address}`,
-		5: 'Untuk konfirmasi penarikan ini, silakan klik tombol di bawah.',
-		6: 'Konfirmasi',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'Untuk konfirmasi penarikan ini, silakan klik tombol di bawah.',
+		7: 'Konfirmasi',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -273,6 +274,15 @@ const SMS = {
 		`Penarikan ${currency.toUpperCase()} Anda dengan jumlah ${amount} telah dikonfirmasi`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -293,5 +303,6 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/index.js b/server/mail/strings/index.js
index 25985d47b6..5ab5a7c2f7 100644
--- a/server/mail/strings/index.js
+++ b/server/mail/strings/index.js
@@ -20,7 +20,8 @@ const MAILTYPE = {
 	USER_DEACTIVATED: 'userDeactivated',
 	INVALID_ADDRESS: 'invalidAddress',
 	INVITED_OPERATOR: 'invitedOperator',
-	ALERT: 'alert'
+	ALERT: 'alert',
+	DISCOUNT_UPDATE: 'discountUpdate'
 };
 
 const languageFile = (lang) => {
diff --git a/server/mail/strings/ja.js b/server/mail/strings/ja.js
index f7c8d93b5e..1c88abaf5d 100644
--- a/server/mail/strings/ja.js
+++ b/server/mail/strings/ja.js
@@ -152,9 +152,9 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
+		PENDING: (amount, currency, address = '') =>
 			`お客様のアドレス${address}に${amount} ${currency.toUpperCase()}出金がリクエストされました。現在の取引状態は保留中ですが、まもなく完了する予定です。`,
-		COMPLETED: (amount, address, currency) =>
+		COMPLETED: (amount, currency, address = '') =>
 			`お客様の${amount} ${currency.toUpperCase()}出金が完了し、アドレス${address}に振り込みされました。`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
@@ -176,10 +176,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `アドレス：${address}`,
-		5: '出金を承認するためには、下のボタンをクリックしてください。',
-		6: '出金承認',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: '出金を承認するためには、下のボタンをクリックしてください。',
+		7: '出金承認',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -269,6 +270,15 @@ const SMS = {
 		`お客様の${amount} ${currency.toUpperCase()}出金が完了しました。`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -289,5 +299,6 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/ko.js b/server/mail/strings/ko.js
index 6df67e0e0a..16a8352053 100644
--- a/server/mail/strings/ko.js
+++ b/server/mail/strings/ko.js
@@ -153,10 +153,10 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
-			`회원님의 ${amount} ${currency.toUpperCase()} 출금이 해당 주소 ${address}로 요청되었습니다. 출금 대기 중이며, 곧 완료될 예정입니다.`,
-		COMPLETED: (amount, address, currency) =>
-			`회원님의 ${amount} ${currency.toUpperCase()}를 해당 주소 ${address}로  출금이 완료되어 회원님의 계좌로 이체되었습니다.`,
+		PENDING: (amount, currency) =>
+			`회원님의 ${amount} ${currency.toUpperCase()} 출금이 요청되었습니다. 출금 대기 중이며, 곧 완료될 예정입니다.`,
+		COMPLETED: (amount, currency) =>
+			`회원님의 ${amount} ${currency.toUpperCase()}를 출금이 완료되어 회원님의 계좌로 이체되었습니다.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
 		3: (status) => `입금 상태: ${status}`,
@@ -177,10 +177,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `주소: ${address}`,
-		5: '출금 요청을 완료하시려면 아래버튼을 클릭해주시기 바랍니다.',
-		6: '완료',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: '출금 요청을 완료하시려면 아래버튼을 클릭해주시기 바랍니다.',
+		7: '완료',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -287,6 +288,15 @@ const INVITEDOPERATOR = {
 	CLOSING: COMMON.CLOSING
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -308,5 +318,6 @@ module.exports = {
 	USERDEACTIVATED,
 	ALERT,
 	SMS,
-	INVITEDOPERATOR
+	INVITEDOPERATOR,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/pt.js b/server/mail/strings/pt.js
new file mode 100644
index 0000000000..9eda5de7c8
--- /dev/null
+++ b/server/mail/strings/pt.js
@@ -0,0 +1,318 @@
+'use strict';
+
+const { GET_KIT_CONFIG } = require('../../constants');
+const API_NAME = () => GET_KIT_CONFIG().api_name;
+
+const COMMON = {
+	GREETING: (name) => `Dear ${name}`,
+	CLOSING: {
+		1: 'Regards',
+		2: () => `${API_NAME()} team`
+	},
+	IP_ADDRESS: (ip) => `IP Address: ${ip}`,
+	IP_REQUEST_FROM: (ip) => `Request initiated from: ${ip}`,
+	TXID: (txid) => `Transaction ID: ${txid}`,
+	FEE: (fee) => `Fee: ${fee}`,
+	AMOUNT: (amount) => `Amount: ${amount}`,
+	ADDRESS: (address) => `Address: ${address}`,
+	TIME: (time) => `Time: ${time}`,
+	COUNTRY: (country) => `Country: ${country}`,
+	DEVICE: (device) => `Device: ${device}`,
+	MESSAGE: (message) => `Message: ${message}`,
+	ERROR_REQUEST:
+		'If this request was made in error, it is safe to ignore it; no changes will be made to your account.',
+	EXPLORER:
+		'You can find the status of your transaction on blockchain through these Block Explorers:',
+	DEPOSIT: 'Deposit',
+	WITHDRAWAL: 'Withdrawal'
+};
+
+const FOOTER = {
+	FOLLOW_US: 'Follow us on',
+	NEED_HELP: 'Need help? Just reply to this email',
+	PRIVACY_POLICY: 'Privacy policy',
+	TERMS: 'Terms and conditions',
+	INVITE_YOUR_FRIENDS: 'Invite your friends',
+	POWERED_BY: 'Powered by'
+};
+
+const SIGNUP = {
+	TITLE: 'Sign Up',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: () => `You need to confirm your email account by clicking the button below.
+		If you have any questions feel free to contact us simply by replying to this email.`,
+		2: 'Please click on the button below to proceed with your registration.',
+		3: 'Confirm'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const WELCOME = {
+	TITLE: 'Welcome',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: () => `Thank you for signing up to ${API_NAME()}.`,
+		2: (account, deposit) => `
+		To begin trading, you must first deposit cryptocurrency or fund money to your account.
+		Please go to your ${account} and visit the ${deposit} page.`,
+		3: 'account',
+		4: 'deposit',
+		5: 'If you have any questions or concerns, please contact us simply by replying to this email.'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const LOGIN = {
+	TITLE: 'Login',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: 'We have recorded a login to your account with the following details',
+		2: (time) => COMMON.TIME(time),
+		3: (country) => COMMON.COUNTRY(country),
+		4: (device) => COMMON.DEVICE(device),
+		5: (ip) => COMMON.IP_ADDRESS(ip),
+		6: 'If this was not you, please change your password, set up two-factor authentication, and contact us immediately.'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const RESETPASSWORD = {
+	TITLE: 'Reset Password Request',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: 'You have made a request to reset the password for your account.',
+		2: 'To update your password, click on the link below.',
+		3: 'Reset My Password',
+		4: COMMON.ERROR_REQUEST,
+		5: (ip) => COMMON.IP_REQUEST_FROM(ip)
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const DEPOSIT = {
+	TITLE: (currency) => `${currency.toUpperCase()} ${COMMON.DEPOSIT}`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		PENDING: (amount, confirmation = 1, currency) =>
+			`You have a new deposit for ${amount} ${currency.toUpperCase()} pending in your ${API_NAME()} wallet. Please wait until the transaction is confirmed and your funds will be available in your wallet. Your transaction require ${confirmation} confirmation(s) on blockchain.`,
+		COMPLETED: (amount, confirmation, currency) =>
+			`Your ${
+				currency.toUpperCase()
+			} deposit for ${amount} ${currency.toUpperCase()} is confirmed and completed and it is available in your ${
+				currency.toUpperCase()
+			} wallet.`,
+		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
+		2: (status) => `Status: ${status}`,
+		3: (address) => COMMON.ADDRESS(address),
+		4: (txid) => COMMON.TXID(txid),
+		5: COMMON.EXPLORER
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const ACCOUNTVERIFY = {
+	TITLE: 'Account Verified',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: 'Congratulations. Your account is verified successfully.',
+		2: 'Trade Now'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const ACCOUNTUPGRADE = {
+	TITLE: 'Account Upgraded',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (tier) =>
+			`Congratulations. Your account access level is upgraded to ${tier} tier. You will benefit from lower fees, higher withdrawal limits and other premium features.`,
+		2: 'Trade Now'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const DEPOSITCANCEL = {
+	TITLE: (currency, type) =>
+		`${currency.toUpperCase()} ${
+			COMMON[type.toUpperCase()]
+		} rejected`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		DEPOSIT: (currency, date, amount) =>
+			`We were not able to find or process your ${currency.toUpperCase()} deposit made on ${date} for ${amount}. Thus, the transaction is rejected by our system.`,
+		WITHDRAWAL: (currency, date, amount) =>
+			`We were not able to find or process your ${currency.toUpperCase()} withdrawal made on ${date} for ${amount}. Thus the transaction is rejected by our system and your pending withdrawal amount is credited back to your ${API_NAME()} wallet.`,
+		1: 'If you have any further inquiries, you can reply to this email',
+		2: (txid) => COMMON.TXID(txid),
+		3: (amount) => COMMON.AMOUNT(amount),
+		4: 'Status: Rejected'
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const WITHDRAWAL = {
+	TITLE: (currency) =>
+		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		PENDING: (amount, currency) =>
+			`You made a withdrawal request for ${amount} ${currency.toUpperCase()}. Your withdrawal status is pending and will be processed shortly.`,
+		COMPLETED: (amount, currency) =>
+			`Your withdrawal request for ${amount} ${currency.toUpperCase()} is processed.`,
+		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
+		2: (fee) => COMMON.FEE(fee),
+		3: (status) => `Status: ${status}`,
+		4: (address) => COMMON.ADDRESS(address),
+		5: (txid) => COMMON.TXID(txid),
+		6: COMMON.EXPLORER
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const WITHDRAWALREQUEST = {
+	TITLE: (currency) =>
+		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL} Request`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (currency, amount, address) =>
+			`You have made a ${currency.toUpperCase()} withdrawal request of ${amount} to ${address}`,
+		2: (amount) => COMMON.AMOUNT(amount),
+		3: (fee) => COMMON.FEE(fee),
+		4: (address) => `Address: ${address}`,
+		5: (network) => `Network: ${network}`,
+		6: 'In order to confirm this withdrawal, please click the button below.',
+		7: 'Confirm',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const INVALIDADDRESS = {
+	TITLE: 'Invalid Withdrawal Address',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (currency, amount) => `Your ${currency} withdrawal for ${amount} was being sent to an invalid address and is rejected.`,
+		2: (address) => `Address: ${address}`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const ALERT = {
+	TITLE: (title) => `ALERT: ${title}`,
+	BODY: {
+		1: (type) => `Alert: ${type}`
+	}
+};
+
+const USERVERIFICATIONREJECT = {
+	TITLE: (type) =>
+		type === 'id'
+			? 'ID Verification Rejected'
+			: 'New Bank Application Rejected',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (type) =>
+			type === 'id'
+				? 'Your recent ID verification is processed and is unfortunately rejected. For further actions read the message from our expert below:'
+				: 'Your new bank registration is processed and is unfortunately rejected. For further actions read the message from our expert below:',
+		2: (message) => COMMON.MESSAGE(message)
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const USERDEACTIVATED = {
+	TITLE: (type) => `Account ${type}`,
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		ACTIVATED: (email) => `Your account ${email} has been activated. You are now able to use your account.`,
+		DEACTIVATED: (email) => `Your account ${email} has been deactivated. You will not be able to use your account until it is activated by the exchange admin.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+const CONTACTFORM = {
+	TITLE: 'Contact Form',
+	BODY: {
+		1: 'Contact Form Data',
+		2: (email) =>
+			`The client with email ${email} has submitted the contact form.`,
+		3: (data) => `${JSON.stringify(data, null, 2)}`
+	}
+};
+
+const USERVERIFICATION = {
+	TITLE: 'User Verification',
+	BODY: {
+		1: 'User Verification Required',
+		2: (email) =>
+			`User "${email}" uploaded his documents for verification. Please verify his documents.`
+	}
+};
+
+const SUSPICIOUSDEPOSIT = {
+	TITLE: 'Suspicious Deposit',
+	BODY: {
+		1: 'Suspicious Deposit',
+		2: (email, currency) =>
+			`The client with email ${email} has received a ${currency.toUpperCase()} deposit that is suspicious.`,
+		3: (txid) => COMMON.TXID(txid),
+		4: 'Transaction data:',
+		5: (data) => `${JSON.stringify(data)}`
+	}
+};
+
+const SMS = {
+	verificationCode: (code) =>
+		`Your verification code is ${code}`
+	,
+	deposit: (currency, amount) =>
+		`Your ${currency.toUpperCase()} deposit for amount ${amount} is confirmed and deposited to your wallet`
+	,
+	withdrawal: (currency, amount) =>
+		`Your ${currency.toUpperCase()} withdrawal for amount ${amount} is confirmed`
+};
+
+const INVITEDOPERATOR = {
+	TITLE: 'Operator Invite',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		CREATED: {
+			1: (role, invitingEmail) => `You've been invited as an operator to ${API_NAME()} with the role of ${role} by user ${invitingEmail}.`,
+			2: 'Your temporary password is provided below. Make sure to change your password after logging in for security purposes.',
+			3: (email) => `Email: ${email}`,
+			4: (password) => `Password: ${password}`,
+			5: 'Login'
+		},
+		EXISTING: {
+			1: (role, invitingEmail) => `Your ${API_NAME()} account has been upgraded to the role of ${role} by user ${invitingEmail}.`,
+			2: 'Login'
+		}
+	},
+	CLOSING: COMMON.CLOSING
+};
+
+module.exports = {
+	FOOTER,
+	COMMON,
+	SIGNUP,
+	WELCOME,
+	LOGIN,
+	RESETPASSWORD,
+	DEPOSIT,
+	ACCOUNTVERIFY,
+	ACCOUNTUPGRADE,
+	USERVERIFICATIONREJECT,
+	DEPOSITCANCEL,
+	WITHDRAWAL,
+	WITHDRAWALREQUEST,
+	USERVERIFICATION,
+	SUSPICIOUSDEPOSIT,
+	INVALIDADDRESS,
+	CONTACTFORM,
+	USERDEACTIVATED,
+	ALERT,
+	SMS,
+	INVITEDOPERATOR
+};
diff --git a/server/mail/strings/vi.js b/server/mail/strings/vi.js
index 44a4fb69e3..21e635209d 100644
--- a/server/mail/strings/vi.js
+++ b/server/mail/strings/vi.js
@@ -156,9 +156,9 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
+		PENDING: (amount, currency, address = '') =>
 			`Quý khách vừa thực hiện yêu cầu rút ${amount} ${currency.toUpperCase()} tới địa chỉ ${address}. Yêu cầu rút tiền của quý khách đang ở trạng thái chờ xử lý và sẽ sớm được thực hiện.`,
-		COMPLETED: (amount, address, currency) =>
+		COMPLETED: (amount, currency, address = '') =>
 			`Yêu cầu rút ${amount} ${currency.toUpperCase()} của quý khách đã được thực hiện và số tiền tương ứng đã được chuyển thành công tới địa chỉ ${address}.`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
@@ -180,10 +180,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `Địa chỉ: ${address}`,
-		5: 'Để xác nhận yêu cầu rút tiền này, vui lòng nhấn vào nút bên dưới.',
-		6: 'Xác nhận',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: 'Để xác nhận yêu cầu rút tiền này, vui lòng nhấn vào nút bên dưới.',
+		7: 'Xác nhận',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -273,6 +274,15 @@ const SMS = {
 		`Giao dịch rút ${currency.toUpperCase()} với số lượng ${amount} của quý khách đã được xác nhận`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -293,5 +303,6 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/strings/zh.js b/server/mail/strings/zh.js
index 821e5b4f44..e060d0cf85 100644
--- a/server/mail/strings/zh.js
+++ b/server/mail/strings/zh.js
@@ -155,9 +155,9 @@ const WITHDRAWAL = {
 		`${currency.toUpperCase()} ${COMMON.WITHDRAWAL}`,
 	GREETING: (name) => COMMON.GREETING(name),
 	BODY: {
-		PENDING: (amount, address, currency) =>
+		PENDING: (amount, currency, address = '') =>
 			`你向该地址${address}申请了${amount} ${currency.toUpperCase()}的提款请求，该提款地址正在等待处理并会很快得到处理。`,
-		COMPLETED: (amount, address, currency) =>
+		COMPLETED: (amount, currency, address = '') =>
 			`你的${amount} ${currency.toUpperCase()}已向该地址${address}提款完毕。`,
 		1: (amount, currency) => `${COMMON.AMOUNT(amount)} ${currency.toUpperCase()}`,
 		2: (fee) => COMMON.FEE(fee),
@@ -179,10 +179,11 @@ const WITHDRAWALREQUEST = {
 		2: (amount) => COMMON.AMOUNT(amount),
 		3: (fee) => COMMON.FEE(fee),
 		4: (address) => `地址: ${address}`,
-		5: '为完成此次提款申请，请点击下方按钮。',
-		6: '确认',
-		7: COMMON.ERROR_REQUEST,
-		8: (ip) => COMMON.IP_REQUEST_FROM(ip)
+		5: (network) => `Network: ${network}`,
+		6: '为完成此次提款申请，请点击下方按钮。',
+		7: '确认',
+		8: COMMON.ERROR_REQUEST,
+		9: (ip) => COMMON.IP_REQUEST_FROM(ip)
 	},
 	CLOSING: COMMON.CLOSING
 };
@@ -270,6 +271,15 @@ const SMS = {
 		`Your ${currency.toUpperCase()} withdrawal for amount ${amount} is confirmed`
 };
 
+const DISCOUNTUPDATE = {
+	TITLE: 'Discount Rate Change',
+	GREETING: (name) => COMMON.GREETING(name),
+	BODY: {
+		1: (rate) => `Your discount rate has been changed to ${rate}%. This rate will be applied to your order fees.`
+	},
+	CLOSING: COMMON.CLOSING
+};
+
 module.exports = {
 	FOOTER,
 	COMMON,
@@ -290,5 +300,6 @@ module.exports = {
 	CONTACTFORM,
 	USERDEACTIVATED,
 	ALERT,
-	SMS
+	SMS,
+	DISCOUNTUPDATE
 };
diff --git a/server/mail/templates/deposit.js b/server/mail/templates/deposit.js
index b5d976cb17..a463330d0e 100644
--- a/server/mail/templates/deposit.js
+++ b/server/mail/templates/deposit.js
@@ -41,8 +41,8 @@ const html = (email, data, language, domain) => {
 				)}
 				<br />
 				${DEPOSIT.BODY[2](data.status)}
-				${data.transaction_id ? '<br />' : ''}
-				${data.transaction_id ? DEPOSIT.BODY[3](data.address) : ''}
+				${data.transaction_id && data.address ? '<br />' : ''}
+				${data.transaction_id && data.address ? DEPOSIT.BODY[3](data.address) : ''}
 				${data.transaction_id ? '<br />' : ''}
 				${data.transaction_id ? DEPOSIT.BODY[4](data.transaction_id) : ''}
 			</p>
@@ -75,7 +75,7 @@ const text = (email, data, language, domain) => {
 			)}
 			${DEPOSIT.BODY[1](data.amount, data.currency.toUpperCase())}
 			${DEPOSIT.BODY[2](data.status)}
-			${data.transaction_id ? DEPOSIT.BODY[3](data.address) : ''}
+			${data.transaction_id && data.address ? DEPOSIT.BODY[3](data.address) : ''}
 			${data.transaction_id ? DEPOSIT.BODY[4](data.transaction_id) : ''}
 		`;
 	} else {
diff --git a/server/mail/templates/discountUpdate.js b/server/mail/templates/discountUpdate.js
new file mode 100644
index 0000000000..30e80fa75d
--- /dev/null
+++ b/server/mail/templates/discountUpdate.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const fetchMessage = (email, data, language, domain) => {
+	return {
+		html: html(email, data, language, domain),
+		text: text(email, data, language, domain)
+	};
+};
+
+const html = (email, data, language, domain) => {
+	const { DISCOUNTUPDATE } = require('../strings').languageFile(language);
+	return `
+        <div>
+          <p>
+            ${DISCOUNTUPDATE.GREETING(email)}
+          </p>
+          <p>
+            ${DISCOUNTUPDATE.BODY[1](data.rate)}
+          </p>
+          <p>
+            ${DISCOUNTUPDATE.CLOSING[1]}<br />
+            ${DISCOUNTUPDATE.CLOSING[2]()}
+          </p>
+        </div>
+      `;
+};
+
+const text = (email, data, language, domain) => {
+	const { DISCOUNTUPDATE } = require('../strings').languageFile(language);
+	return `
+		${DISCOUNTUPDATE.GREETING(email)}
+		${DISCOUNTUPDATE.BODY[1](data.rate)}
+		${DISCOUNTUPDATE.CLOSING[1]} ${DISCOUNTUPDATE.CLOSING[2]()}
+	`;
+};
+
+module.exports = fetchMessage;
diff --git a/server/mail/templates/helpers/styles.js b/server/mail/templates/helpers/styles.js
index 3cf6ebebd7..23da94dd00 100644
--- a/server/mail/templates/helpers/styles.js
+++ b/server/mail/templates/helpers/styles.js
@@ -1,7 +1,7 @@
 module.exports = {
 	body:
 		'background-color: #ffffff; padding: 1rem 0; font-family: arial; color: #000 !important',
-	logo: 'text-align: center; margin-bottom: 1.5rem;',
+	logo: 'text-align: center; margin-bottom: 1.5rem; background-color: #333; padding-bottom: 1rem; padding-top: 1rem;',
 	wrapper: 'align-items:center; max-width: 45rem; margin: 0 auto;',
 	header:
 		'padding-top: 3rem; padding-bottom: 1rem; background-color: #ffffff; text-align: center',
diff --git a/server/mail/templates/withdrawal.js b/server/mail/templates/withdrawal.js
index 09faf217d9..e3cc1c5872 100644
--- a/server/mail/templates/withdrawal.js
+++ b/server/mail/templates/withdrawal.js
@@ -28,18 +28,17 @@ const html = (email, data, language, domain) => {
 			<p>
 				${WITHDRAWAL.BODY[data.status](
 					data.amount,
-					data.address,
 					data.currency.toUpperCase()
 				)}
 			</p>
 			<p>
 				${WITHDRAWAL.BODY[1](data.amount, data.currency)}
-				<br />
-				${WITHDRAWAL.BODY[2](data.fee)}
+				${data.fee ? '<br />' : ''}
+				${data.fee ? WITHDRAWAL.BODY[2](data.fee) : ''}
 				<br />
 				${WITHDRAWAL.BODY[3](data.status)}
-				${data.transaction_id ? '<br />' : ''}
-				${data.transaction_id ? WITHDRAWAL.BODY[4](data.address) : ''}
+				${data.transaction_id && data.address ? '<br />' : ''}
+				${data.transaction_id && data.address ? WITHDRAWAL.BODY[4](data.address) : ''}
 				${data.transaction_id ? '<br />' : ''}
 				${data.transaction_id ? WITHDRAWAL.BODY[5](data.transaction_id) : ''}
 			</p>
@@ -64,13 +63,12 @@ const text = (email, data, language, domain) => {
 		result += `
 			${WITHDRAWAL.BODY[data.status](
 				data.amount,
-				data.address,
 				data.currency.toUpperCase()
 			)}
 			${WITHDRAWAL.BODY[1](data.amount, data.currency)}
-			${WITHDRAWAL.BODY[2](data.fee)}
+			${data.fee ? WITHDRAWAL.BODY[2](data.fee) : ''}
 			${WITHDRAWAL.BODY[3](data.status)}
-			${data.transaction_id ? WITHDRAWAL.BODY[4](data.address) : ''}
+			${data.transaction_id && data.address ? WITHDRAWAL.BODY[4](data.address) : ''}
 			${data.transaction_id ? WITHDRAWAL.BODY[5](data.transaction_id) : ''}
 		`;
 	} else {
diff --git a/server/mail/templates/withdrawalRequest.js b/server/mail/templates/withdrawalRequest.js
index 20c093dd73..1d231c6168 100644
--- a/server/mail/templates/withdrawalRequest.js
+++ b/server/mail/templates/withdrawalRequest.js
@@ -18,20 +18,21 @@ const html = (email, data, language, domain) => {
 				${WITHDRAWALREQUEST.GREETING(email)}
 			</p>
 			<p>
-				${WITHDRAWALREQUEST.BODY[1](data.currency, data.amount, data.address)}<br />
+				${WITHDRAWALREQUEST.BODY[1](data.currency, data.amount, data.address)}<br /><br />
 				${WITHDRAWALREQUEST.BODY[2](data.amount)}<br />
 				${WITHDRAWALREQUEST.BODY[3](data.fee)}<br />
-				${WITHDRAWALREQUEST.BODY[4](data.address)}<br /> <br />
-				${WITHDRAWALREQUEST.BODY[5]}<br />
+				${WITHDRAWALREQUEST.BODY[4](data.address)}<br />
+				${data.network ? `${WITHDRAWALREQUEST.BODY[5](data.network)}<br /><br />` : '<br />'}
+				${WITHDRAWALREQUEST.BODY[6]}<br />
 			</p>
 			<p>
-			${Button(link, WITHDRAWALREQUEST.BODY[6])}
+			${Button(link, WITHDRAWALREQUEST.BODY[7])}
 			</p>
 			<p>
-				${WITHDRAWALREQUEST.BODY[7]}
+				${WITHDRAWALREQUEST.BODY[8]}
 			</p>
 			<p>
-				${WITHDRAWALREQUEST.BODY[8](data.ip)}
+				${WITHDRAWALREQUEST.BODY[9](data.ip)}
 			</p>
 			<p>
 				${WITHDRAWALREQUEST.CLOSING[1]}<br />
@@ -50,8 +51,9 @@ const text = (email, data, language, domain) => {
 		${WITHDRAWALREQUEST.BODY[2](data.amount)}
 		${WITHDRAWALREQUEST.BODY[3](data.fee)}
 		${WITHDRAWALREQUEST.BODY[4](data.address)}
-		${WITHDRAWALREQUEST.BODY[5]}
-		${Button(link, WITHDRAWALREQUEST.BODY[6])}
+		${data.network ? `${WITHDRAWALREQUEST.BODY[5](data.network)}` : ''}
+		${WITHDRAWALREQUEST.BODY[6]}
+		${Button(link, WITHDRAWALREQUEST.BODY[7])}
 		${WITHDRAWALREQUEST.CLOSING[1]} ${WITHDRAWALREQUEST.CLOSING[2]()}
 	`;
 };
diff --git a/server/messages.js b/server/messages.js
index d37aa0425a..b6573f851e 100644
--- a/server/messages.js
+++ b/server/messages.js
@@ -180,3 +180,5 @@ exports.PROVIDE_TABLE_NAME = 'Please provide a table name';
 exports.INVALID_PLUGIN = (plugin) => `Invalid plugin: ${plugin}`;
 exports.PLUGIN_ALREADY_ENABELD = (plugin) => `Plugin ${plugin} already enabled`;
 exports.PLUGIN_ALREADY_DISABLED = (plugin) => `Plugin ${plugin} already disabled`;
+exports.INVALID_NETWORK = (network, validNetworks) => `Invalid network: ${network}${validNetworks ? `. Valid networks: ${validNetworks}` : ''}`;
+exports.NETWORK_REQUIRED = (coin, validNetworks) => `Must specify network for coin: ${coin}${validNetworks ? `. Valid networks: ${validNetworks}` : ''}`;
diff --git a/server/package.json b/server/package.json
index 2bca5ec4f6..9706f4180a 100644
--- a/server/package.json
+++ b/server/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "2.0.14",
+	"version": "2.1.0",
 	"private": false,
 	"description": "HollaEx Kit",
 	"keywords": [
@@ -28,8 +28,8 @@
 		"flat": "5.0.0",
 		"geoip-lite": "1.4.1",
 		"helmet": "3.12.0",
-		"hollaex-node-lib": "github:bitholla/hollaex-node-lib#2.0",
-		"hollaex-tools-lib": "github:bitholla/hollaex-tools-lib#master",
+		"hollaex-node-lib": "github:bitholla/hollaex-node-lib#2.1.0",
+		"hollaex-tools-lib": "github:bitholla/hollaex-tools-lib#2.1.0",
 		"http": "0.0.0",
 		"install": "0.10.4",
 		"json2csv": "4.5.4",
diff --git a/server/plugins.js b/server/plugins.js
index eea5d19fab..df6d2d5ad0 100644
--- a/server/plugins.js
+++ b/server/plugins.js
@@ -26,6 +26,7 @@ const path = require('path');
 const latestVersion = require('latest-version');
 const { resolve } = bluebird;
 const npm = require('npm-programmatic');
+const { Op } = require('sequelize');
 
 const getInstalledLibrary = async (name, version) => {
 	const jsonFilePath = path.resolve(__dirname, './node_modules', name, 'package.json');
@@ -211,14 +212,19 @@ checkStatus()
 							throw new Error('Plugin not found');
 						}
 
-						return plugin.destroy();
+						return bluebird.all([
+							plugin,
+							plugin.destroy()
+						]);
 					})
-					.then(() => {
+					.then(([ { enabled, script } ]) => {
 						loggerPlugin.info(req.uuid, 'DELETE /plugins deleted plugin', name);
 
 						res.json({ message: 'Success' });
 
-						process.exit();
+						if (enabled && script) {
+							process.exit();
+						}
 					})
 					.catch((err) => {
 						loggerPlugin.error(req.uuid, 'DELETE /plugins err', err.message);
@@ -247,7 +253,7 @@ checkStatus()
 							errorMessage: 'must be minimum length of 5',
 							options: { min: 5 }
 						},
-						optional: false
+						optional: true
 					},
 					version: {
 						in: ['body'],
@@ -400,17 +406,20 @@ checkStatus()
 							throw new Error('Version is already installed');
 						}
 
-						const minifiedScript = UglifyJS.minify(script);
-
-						if (minifiedScript.error) {
-							throw new Error('Error while minifying script');
-						}
-
 						const updatedPlugin = {
-							script: minifiedScript.code,
 							version
 						};
 
+						if (script) {
+							const minifiedScript = UglifyJS.minify(script);
+
+							if (minifiedScript.error) {
+								throw new Error('Error while minifying script');
+							}
+
+							updatedPlugin.script = minifiedScript.code;
+						}
+
 						if (description) {
 							updatedPlugin.description = description;
 						}
@@ -464,13 +473,21 @@ checkStatus()
 							};
 						}
 
-						return plugin.update(updatedPlugin);
+						return bluebird.all([
+							plugin,
+							plugin.update(updatedPlugin)
+						]);
 					})
-					.then(async (plugin) => {
+					.then(([ { enabled, script }, plugin ]) => {
 						loggerPlugin.info(req.uuid, 'PUT /plugins updated', name);
 
 						plugin = plugin.dataValues;
 
+						let restartProcess = false;
+						if (enabled && script) {
+							restartProcess = true;
+						}
+
 						plugin.enabled_admin_view = !!plugin.admin_view;
 
 						res.json(lodash.omit(plugin, [
@@ -482,7 +499,7 @@ checkStatus()
 							'postscript'
 						]));
 
-						if (plugin.enabled) {
+						if (restartProcess) {
 							process.exit();
 						}
 					})
@@ -513,7 +530,7 @@ checkStatus()
 							errorMessage: 'must be minimum length of 5',
 							options: { min: 5 }
 						},
-						optional: false
+						optional: true
 					},
 					version: {
 						in: ['body'],
@@ -670,20 +687,23 @@ checkStatus()
 							throw new Error('Plugin is already installed');
 						}
 
-						const minifiedScript = UglifyJS.minify(script);
-
-						if (minifiedScript.error) {
-							throw new Error('Error while minifying script');
-						}
-
 						const newPlugin = {
 							name,
-							script: minifiedScript.code,
 							version,
 							author,
 							enabled
 						};
 
+						if (script) {
+							const minifiedScript = UglifyJS.minify(script);
+
+							if (minifiedScript.error) {
+								throw new Error('Error while minifying script');
+							}
+
+							newPlugin.script =  minifiedScript.code;
+						}
+
 						if (description) {
 							newPlugin.description = description;
 						}
@@ -735,6 +755,11 @@ checkStatus()
 
 						plugin = plugin.dataValues;
 
+						let restartProcess = false;
+						if (plugin.enabled && plugin.script) {
+							restartProcess = true;
+						}
+
 						plugin.enabled_admin_view = !!plugin.admin_view;
 
 						res.json(lodash.omit(plugin, [
@@ -746,7 +771,7 @@ checkStatus()
 							'postscript'
 						]));
 
-						if (plugin.enabled) {
+						if (restartProcess) {
 							process.exit();
 						}
 					})
@@ -809,14 +834,14 @@ checkStatus()
 							...updatedMeta
 						};
 
-						return plugin.update({ meta: newMeta }, { fields: ['meta']});
+						return plugin.update({ meta: newMeta }, { fields: ['meta'] });
 					})
 					.then((plugin) => {
 						loggerPlugin.info(req.uuid, 'PUT /plugins/meta updated', name);
 
 						res.json({ message: 'Success' });
 
-						if (plugin.enabled) {
+						if (plugin.enabled && plugin.script) {
 							process.exit();
 						}
 					})
@@ -956,12 +981,14 @@ checkStatus()
 
 						return plugin.update({ enabled: false }, { fields: ['enabled']});
 					})
-					.then(() => {
+					.then((plugin) => {
 						loggerPlugin.info(req.uuid, 'GET /plugins/disable disabled plugin', name);
 
 						res.json({ message: 'Success' });
 
-						process.exit();
+						if (plugin.script) {
+							process.exit();
+						}
 					})
 					.catch((err) => {
 						loggerPlugin.error(req.uuid, 'GET /plugins/disable err', err.message);
@@ -1011,12 +1038,14 @@ checkStatus()
 
 						return plugin.update({ enabled: true }, { fields: ['enabled']});
 					})
-					.then(() => {
+					.then((plugin) => {
 						loggerPlugin.info(req.uuid, 'GET /plugins/enable enabled plugin', name);
 
 						res.json({ message: 'Success' });
 
-						process.exit();
+						if (plugin.script) {
+							process.exit();
+						}
 					})
 					.catch((err) => {
 						loggerPlugin.error(req.uuid, 'GET /plugins/enable err', err.message);
@@ -1025,7 +1054,12 @@ checkStatus()
 			});
 
 			toolsLib.database.findAll('plugin', {
-				where: { enabled: true },
+				where: {
+					enabled: true,
+					script: {
+						[Op.not]: null
+					}
+				},
 				raw: true
 			})
 				.then(async (plugins) => {
diff --git a/server/tools/dbs/checkConfig.js b/server/tools/dbs/checkConfig.js
index 32e0d679e6..3d9f907f5a 100644
--- a/server/tools/dbs/checkConfig.js
+++ b/server/tools/dbs/checkConfig.js
@@ -37,6 +37,8 @@ Status.findOne()
 			setup_completed: isBoolean(existingKitConfigurations.setup_completed) ? existingKitConfigurations.setup_completed : false,
 			native_currency: existingKitConfigurations.native_currency || process.env.NATIVE_CURRENCY || 'usdt',
 			logo_image: existingKitConfigurations.logo_image || existingKitConfigurations.logo_path || process.env.LOGO_IMAGE || 'https://dash.testnet.bitholla.com/assets/img/hex-pattern-icon-black-01.svg',
+			injected_values: existingKitConfigurations.injected_values || [],
+			injected_html: existingKitConfigurations.injected_html || {},
 			valid_languages: existingKitConfigurations.valid_languages || process.env.VALID_LANGUAGES || 'en,fa,ko,ar,fr',
 			new_user_is_activated: existingKitConfigurations.new_user_is_activated || (process.env.NEW_USER_IS_ACTIVATED && process.env.NEW_USER_IS_ACTIVATED === 'true') || false,
 			captcha: {
diff --git a/server/tools/dbs/setConfig.js b/server/tools/dbs/setConfig.js
index 06aee02ca1..7085da96bc 100644
--- a/server/tools/dbs/setConfig.js
+++ b/server/tools/dbs/setConfig.js
@@ -53,6 +53,8 @@ const kit = {
 	setup_completed: false,
 	native_currency: NATIVE_CURRENCY || 'usdt',
 	logo_image: LOGO_IMAGE || 'https://dash.testnet.bitholla.com/assets/img/hex-pattern-icon-black-01.svg',
+	injected_values: [],
+	injected_html: {},
 	valid_languages: VALID_LANGUAGES || 'en,fa,ko,ar,fr',
 	new_user_is_activated: (NEW_USER_IS_ACTIVATED && NEW_USER_IS_ACTIVATED === 'true') || false,
 	captcha: {
diff --git a/server/utils/conversion.js b/server/utils/conversion.js
index e39ff4bc3e..1abad81486 100644
--- a/server/utils/conversion.js
+++ b/server/utils/conversion.js
@@ -4,6 +4,19 @@ const toBool = (value) => {
 	return value === 'true' ? true : value === 'false' ? false : value;
 };
 
+const errorMessageConverter = (error) => {
+	let message = error.message;
+
+	if (error.name === 'SequelizeValidationError') {
+		message = error.errors[0].message;
+	} else if (error.statusCode) {
+		message = error.error.message;
+	}
+
+	return message;
+};
+
 module.exports = {
-	toBool
+	toBool,
+	errorMessageConverter
 };
\ No newline at end of file
diff --git a/settings/configmap b/settings/configmap
index 8c8d50fd53..c4d32483b7 100644
--- a/settings/configmap
+++ b/settings/configmap
@@ -112,36 +112,46 @@ ENVIRONMENT_KUBERNETES_EXTERNAL_REDIS_ACCESS_PORT=40001
 
 ENVIRONMENT_KUBERNETES_RESTART_NOTIFICATION_WEBHOOK_URL=
 
-ENVIRONMENT_USER_HOLLAEX_CORE_IMAGE_REGISTRY=bitholla/my-hollaex-core
+ENVIRONMENT_USER_HOLLAEX_CORE_IMAGE_REGISTRY=bitholla/my-hollaex-server
 ENVIRONMENT_USER_HOLLAEX_CORE_IMAGE_VERSION=$ENVIRONMENT_DOCKER_IMAGE_VERSION
 
 ENVIRONMENT_USER_HOLLAEX_WEB_IMAGE_REGISTRY=bitholla/my-hollaex-web
 ENVIRONMENT_USER_HOLLAEX_WEB_IMAGE_VERSION=latest
 
-ENVIRONMENT_KUBERNETES_API_CPU_LIMITS=100m
-ENVIRONMENT_KUBERNETES_API_MEMORY_LIMITS=512Mi
-ENVIRONMENT_KUBERNETES_API_CPU_REQUESTS=50m
-ENVIRONMENT_KUBERNETES_API_MEMORY_REQUESTS=512Mi
+ENVIRONMENT_API_CPU_LIMITS=0.1
+ENVIRONMENT_API_MEMORY_LIMITS=512Mi
+ENVIRONMENT_API_CPU_REQUESTS=0.05
+ENVIRONMENT_API_MEMORY_REQUESTS=512Mi
 
-ENVIRONMENT_KUBERNETES_STREAM_CPU_LIMITS=100m
-ENVIRONMENT_KUBERNETES_STREAM_MEMORY_LIMITS=256Mi
-ENVIRONMENT_KUBERNETES_STREAM_CPU_REQUESTS=50m
-ENVIRONMENT_KUBERNETES_STREAM_MEMORY_REQUESTS=256Mi
+ENVIRONMENT_STREAM_CPU_LIMITS=0.1
+ENVIRONMENT_STREAM_MEMORY_LIMITS=256Mi
+ENVIRONMENT_STREAM_CPU_REQUESTS=0.05
+ENVIRONMENT_STREAM_MEMORY_REQUESTS=256Mi
 
-ENVIRONMENT_KUBERNETES_POSTGRESQL_CPU_LIMITS=100m
-ENVIRONMENT_KUBERNETES_POSTGRESQL_MEMORY_LIMITS=100Mi
-ENVIRONMENT_KUBERNETES_POSTGRESQL_CPU_REQUESTS=100m
-ENVIRONMENT_KUBERNETES_POSTGRESQL_MEMORY_REQUESTS=100Mi
+ENVIRONMENT_PLUGINS_CPU_LIMITS=0.1
+ENVIRONMENT_PLUGINS_MEMORY_LIMITS=512Mi
+ENVIRONMENT_PLUGINS_CPU_REQUESTS=0.05
+ENVIRONMENT_PLUGINS_MEMORY_REQUESTS=256Mi
 
-ENVIRONMENT_KUBERNETES_REDIS_CPU_LIMITS=100m
-ENVIRONMENT_KUBERNETES_REDIS_MEMORY_LIMITS=100Mi
-ENVIRONMENT_KUBERNETES_REDIS_CPU_REQUESTS=100m
-ENVIRONMENT_KUBERNETES_REDIS_MEMORY_REQUESTS=100Mi
+ENVIRONMENT_POSTGRESQL_CPU_LIMITS=0.1
+ENVIRONMENT_POSTGRESQL_MEMORY_LIMITS=100Mi
+ENVIRONMENT_POSTGRESQL_CPU_REQUESTS=0.1
+ENVIRONMENT_POSTGRESQL_MEMORY_REQUESTS=100Mi
+
+ENVIRONMENT_REDIS_CPU_LIMITS=0.1
+ENVIRONMENT_REDIS_MEMORY_LIMITS=100Mi
+ENVIRONMENT_REDIS_CPU_REQUESTS=0.1
+ENVIRONMENT_REDIS_MEMORY_REQUESTS=100Mi
+
+ENVIRONMENT_WEB_CPU_LIMITS=0.05
+ENVIRONMENT_WEB_MEMORY_LIMITS=128Mi
+ENVIRONMENT_WEB_CPU_REQUESTS=0.01
+ENVIRONMENT_WEB_MEMORY_REQUESTS=128Mi
 
 ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_RULE='0 1 * * *'
 ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_REGION=
 ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_BUCKET=
-ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_TIMEZONE=
+ENVIRONMENT_KUBERNETES_S3_BACKUP_CRONJOB_TIMEZONE=UTC
 
 ENVIRONMENT_KUBERNETES_STREAM_SERVER_REPLICAS=1
 ENVIRONMENT_KUBERNETES_WEB_SERVER_REPLICAS=1
diff --git a/version b/version
index 5ad8f21ac9..7ec1d6db40 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.0.14
\ No newline at end of file
+2.1.0
diff --git a/web/package-lock.json b/web/package-lock.json
index 1e1cd97a2d..dc4e07f1df 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.0.13",
+	"version": "2.1.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -9,7 +9,7 @@
 			"resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
 			"integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
 			"requires": {
-				"tinycolor2": "^1.4.1"
+				"tinycolor2": "1.4.1"
 			}
 		},
 		"@ant-design/compatible": {
@@ -17,15 +17,15 @@
 			"resolved": "https://registry.npmjs.org/@ant-design/compatible/-/compatible-1.0.5.tgz",
 			"integrity": "sha512-UrMtEtx0M7blj/0EKvhfE7U/Q6vLd9c1EUsIf2fl8C3CRWogAUu67FwKAJKtcwQZwkinCDCJgTjtscZm1UvX4A==",
 			"requires": {
-				"@ant-design/icons": "^4.0.0",
-				"classnames": "^2.2.6",
-				"lodash.camelcase": "^4.3.0",
-				"lodash.upperfirst": "^4.3.1",
-				"omit.js": "^1.0.2",
-				"rc-animate": "^2.10.2",
-				"rc-editor-mention": "^1.1.13",
-				"rc-form": "^2.4.10",
-				"rc-util": "^4.10.0"
+				"@ant-design/icons": "4.2.2",
+				"classnames": "2.2.6",
+				"lodash.camelcase": "4.3.0",
+				"lodash.upperfirst": "4.3.1",
+				"omit.js": "1.0.2",
+				"rc-animate": "2.11.1",
+				"rc-editor-mention": "1.1.13",
+				"rc-form": "2.4.11",
+				"rc-util": "4.21.1"
 			}
 		},
 		"@ant-design/css-animation": {
@@ -38,12 +38,12 @@
 			"resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-4.2.2.tgz",
 			"integrity": "sha512-DrVV+wcupnHS7PehJ6KiTcJtAR5c25UMgjGECCc6pUT9rsvw0AuYG+a4HDjfxEQuDqKTHwW+oX/nIvCymyLE8Q==",
 			"requires": {
-				"@ant-design/colors": "^3.1.0",
-				"@ant-design/icons-svg": "^4.0.0",
-				"@babel/runtime": "^7.10.4",
-				"classnames": "^2.2.6",
-				"insert-css": "^2.0.0",
-				"rc-util": "^5.0.1"
+				"@ant-design/colors": "3.2.2",
+				"@ant-design/icons-svg": "4.1.0",
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"insert-css": "2.0.0",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -51,8 +51,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -67,11 +67,11 @@
 			"resolved": "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-0.27.10.tgz",
 			"integrity": "sha512-Lg/9RlGaYGeFjB1UkvK50xUKf7XgIVpxXVPkm+45/VoA66c3uC1KN5yRxx7AEayHcSPZDqO9TGvMXu1WbbY2vw==",
 			"requires": {
-				"@babel/runtime": "^7.10.4",
-				"classnames": "^2.2.5",
-				"json2mq": "^0.2.0",
-				"lodash": "^4.17.15",
-				"resize-observer-polyfill": "^1.5.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"json2mq": "0.2.0",
+				"lodash": "4.17.19",
+				"resize-observer-polyfill": "1.5.1"
 			}
 		},
 		"@babel/code-frame": {
@@ -80,19 +80,14 @@
 			"integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
 			"dev": true,
 			"requires": {
-				"@babel/highlight": "^7.10.4"
+				"@babel/highlight": "7.10.4"
 			}
 		},
 		"@babel/compat-data": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-			"integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-			"dev": true,
-			"requires": {
-				"browserslist": "^4.12.0",
-				"invariant": "^2.2.4",
-				"semver": "^5.5.0"
-			}
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
+			"integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
+			"dev": true
 		},
 		"@babel/core": {
 			"version": "7.9.0",
@@ -100,282 +95,285 @@
 			"integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.8.3",
-				"@babel/generator": "^7.9.0",
-				"@babel/helper-module-transforms": "^7.9.0",
-				"@babel/helpers": "^7.9.0",
-				"@babel/parser": "^7.9.0",
-				"@babel/template": "^7.8.6",
-				"@babel/traverse": "^7.9.0",
-				"@babel/types": "^7.9.0",
-				"convert-source-map": "^1.7.0",
-				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.1",
-				"json5": "^2.1.2",
-				"lodash": "^4.17.13",
-				"resolve": "^1.3.2",
-				"semver": "^5.4.1",
-				"source-map": "^0.5.0"
+				"@babel/code-frame": "7.10.4",
+				"@babel/generator": "7.13.9",
+				"@babel/helper-module-transforms": "7.13.14",
+				"@babel/helpers": "7.13.10",
+				"@babel/parser": "7.13.13",
+				"@babel/template": "7.12.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14",
+				"convert-source-map": "1.7.0",
+				"debug": "4.3.1",
+				"gensync": "1.0.0-beta.2",
+				"json5": "2.2.0",
+				"lodash": "4.17.19",
+				"resolve": "1.17.0",
+				"semver": "5.7.1",
+				"source-map": "0.5.7"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				}
 			}
 		},
 		"@babel/generator": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.0.tgz",
-			"integrity": "sha512-fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ==",
+			"version": "7.13.9",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
+			"integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.11.0",
-				"jsesc": "^2.5.1",
-				"source-map": "^0.5.0"
+				"@babel/types": "7.13.14",
+				"jsesc": "2.5.2",
+				"source-map": "0.5.7"
 			}
 		},
 		"@babel/helper-annotate-as-pure": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-			"integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz",
+			"integrity": "sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-builder-binary-assignment-operator-visitor": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz",
-			"integrity": "sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz",
+			"integrity": "sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-explode-assignable-expression": "^7.10.4",
-				"@babel/types": "^7.10.4"
-			}
-		},
-		"@babel/helper-builder-react-jsx": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz",
-			"integrity": "sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/types": "^7.10.4"
-			}
-		},
-		"@babel/helper-builder-react-jsx-experimental": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.10.5.tgz",
-			"integrity": "sha512-Buewnx6M4ttG+NLkKyt7baQn7ScC/Td+e99G914fRU8fGIUivDDgVIQeDHFa5e4CRSJQt58WpNHhsAZgtzVhsg==",
-			"dev": true,
-			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-module-imports": "^7.10.4",
-				"@babel/types": "^7.10.5"
+				"@babel/helper-explode-assignable-expression": "7.13.0",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-compilation-targets": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-			"integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz",
+			"integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==",
 			"dev": true,
 			"requires": {
-				"@babel/compat-data": "^7.10.4",
-				"browserslist": "^4.12.0",
-				"invariant": "^2.2.4",
-				"levenary": "^1.1.1",
-				"semver": "^5.5.0"
+				"@babel/compat-data": "7.13.12",
+				"@babel/helper-validator-option": "7.12.17",
+				"browserslist": "4.16.3",
+				"semver": "6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
 			}
 		},
 		"@babel/helper-create-class-features-plugin": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-			"integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+			"version": "7.13.11",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.11.tgz",
+			"integrity": "sha512-ays0I7XYq9xbjCSvT+EvysLgfc3tOkwCULHjrnscGT3A9qD4sk3wXnJ3of0MAWsWGjdinFvajHU2smYuqXKMrw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-function-name": "^7.10.4",
-				"@babel/helper-member-expression-to-functions": "^7.10.5",
-				"@babel/helper-optimise-call-expression": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4",
-				"@babel/helper-split-export-declaration": "^7.10.4"
+				"@babel/helper-function-name": "7.12.13",
+				"@babel/helper-member-expression-to-functions": "7.13.12",
+				"@babel/helper-optimise-call-expression": "7.12.13",
+				"@babel/helper-replace-supers": "7.13.12",
+				"@babel/helper-split-export-declaration": "7.12.13"
 			}
 		},
 		"@babel/helper-create-regexp-features-plugin": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-			"integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+			"version": "7.12.17",
+			"resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz",
+			"integrity": "sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-regex": "^7.10.4",
-				"regexpu-core": "^4.7.0"
+				"@babel/helper-annotate-as-pure": "7.12.13",
+				"regexpu-core": "4.7.1"
 			}
 		},
-		"@babel/helper-define-map": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz",
-			"integrity": "sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==",
+		"@babel/helper-define-polyfill-provider": {
+			"version": "0.1.5",
+			"resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz",
+			"integrity": "sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-function-name": "^7.10.4",
-				"@babel/types": "^7.10.5",
-				"lodash": "^4.17.19"
+				"@babel/helper-compilation-targets": "7.13.13",
+				"@babel/helper-module-imports": "7.13.12",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/traverse": "7.13.13",
+				"debug": "4.3.1",
+				"lodash.debounce": "4.0.8",
+				"resolve": "1.17.0",
+				"semver": "6.3.0"
+			},
+			"dependencies": {
+				"debug": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+					"dev": true,
+					"requires": {
+						"ms": "2.1.2"
+					}
+				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
 			}
 		},
 		"@babel/helper-explode-assignable-expression": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz",
-			"integrity": "sha512-4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz",
+			"integrity": "sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==",
 			"dev": true,
 			"requires": {
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-function-name": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz",
-			"integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+			"integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-get-function-arity": "^7.10.4",
-				"@babel/template": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/helper-get-function-arity": "7.12.13",
+				"@babel/template": "7.12.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-get-function-arity": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-			"integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+			"integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-hoist-variables": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz",
-			"integrity": "sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz",
+			"integrity": "sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-member-expression-to-functions": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-			"integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+			"integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.11.0"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-module-imports": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-			"integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+			"integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-module-transforms": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-			"integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+			"version": "7.13.14",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
+			"integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-imports": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4",
-				"@babel/helper-simple-access": "^7.10.4",
-				"@babel/helper-split-export-declaration": "^7.11.0",
-				"@babel/template": "^7.10.4",
-				"@babel/types": "^7.11.0",
-				"lodash": "^4.17.19"
+				"@babel/helper-module-imports": "7.13.12",
+				"@babel/helper-replace-supers": "7.13.12",
+				"@babel/helper-simple-access": "7.13.12",
+				"@babel/helper-split-export-declaration": "7.12.13",
+				"@babel/helper-validator-identifier": "7.12.11",
+				"@babel/template": "7.12.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14"
+			},
+			"dependencies": {
+				"@babel/helper-validator-identifier": {
+					"version": "7.12.11",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+					"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+					"dev": true
+				}
 			}
 		},
 		"@babel/helper-optimise-call-expression": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz",
-			"integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+			"integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.10.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-plugin-utils": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-			"integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz",
+			"integrity": "sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==",
 			"dev": true
 		},
-		"@babel/helper-regex": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.10.5.tgz",
-			"integrity": "sha512-68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg==",
-			"dev": true,
-			"requires": {
-				"lodash": "^4.17.19"
-			}
-		},
 		"@babel/helper-remap-async-to-generator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz",
-			"integrity": "sha512-86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz",
+			"integrity": "sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-wrap-function": "^7.10.4",
-				"@babel/template": "^7.10.4",
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/helper-annotate-as-pure": "7.12.13",
+				"@babel/helper-wrap-function": "7.13.0",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-replace-supers": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-			"integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+			"integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-member-expression-to-functions": "^7.10.4",
-				"@babel/helper-optimise-call-expression": "^7.10.4",
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/helper-member-expression-to-functions": "7.13.12",
+				"@babel/helper-optimise-call-expression": "7.12.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-simple-access": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-			"integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+			"integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-skip-transparent-expression-wrappers": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-			"integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+			"integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.11.0"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-split-export-declaration": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz",
-			"integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+			"integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.11.0"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helper-validator-identifier": {
@@ -384,27 +382,33 @@
 			"integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
 			"dev": true
 		},
+		"@babel/helper-validator-option": {
+			"version": "7.12.17",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+			"integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
+			"dev": true
+		},
 		"@babel/helper-wrap-function": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-			"integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz",
+			"integrity": "sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-function-name": "^7.10.4",
-				"@babel/template": "^7.10.4",
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/helper-function-name": "7.12.13",
+				"@babel/template": "7.12.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/helpers": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.10.4.tgz",
-			"integrity": "sha512-L2gX/XeUONeEbI78dXSrJzGdz4GQ+ZTA/aazfUsFaWjSe95kiCuOZ5HsXvkiw3iwF+mFHSRUfJU8t6YavocdXA==",
+			"version": "7.13.10",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
+			"integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.10.4",
-				"@babel/traverse": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/template": "7.12.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/highlight": {
@@ -413,36 +417,47 @@
 			"integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.10.4",
-				"chalk": "^2.0.0",
-				"js-tokens": "^4.0.0"
+				"@babel/helper-validator-identifier": "7.10.4",
+				"chalk": "2.4.2",
+				"js-tokens": "4.0.0"
 			}
 		},
 		"@babel/parser": {
-			"version": "7.11.3",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.3.tgz",
-			"integrity": "sha512-REo8xv7+sDxkKvoxEywIdsNFiZLybwdI7hcT5uEPyQrSMB4YQ973BfC9OOrD/81MaIjh6UxdulIQXkjmiH3PcA==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
+			"integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
 			"dev": true
 		},
+		"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz",
+			"integrity": "sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "7.12.1",
+				"@babel/plugin-proposal-optional-chaining": "7.13.12"
+			}
+		},
 		"@babel/plugin-proposal-async-generator-functions": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-			"integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz",
+			"integrity": "sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-remap-async-to-generator": "^7.10.4",
-				"@babel/plugin-syntax-async-generators": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-remap-async-to-generator": "7.13.0",
+				"@babel/plugin-syntax-async-generators": "7.8.4"
 			}
 		},
 		"@babel/plugin-proposal-class-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-			"integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz",
+			"integrity": "sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-create-class-features-plugin": "7.13.11",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-proposal-decorators": {
@@ -451,121 +466,123 @@
 			"integrity": "sha512-e3RvdvS4qPJVTe288DlXjwKflpfy1hr0j5dz5WpIYYeP7vQZg2WfAEIp8k5/Lwis/m5REXEteIz6rrcDtXXG7w==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.8.3",
-				"@babel/helper-plugin-utils": "^7.8.3",
-				"@babel/plugin-syntax-decorators": "^7.8.3"
+				"@babel/helper-create-class-features-plugin": "7.13.11",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-decorators": "7.12.13"
 			}
 		},
 		"@babel/plugin-proposal-dynamic-import": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-			"integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz",
+			"integrity": "sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-dynamic-import": "7.8.3"
 			}
 		},
 		"@babel/plugin-proposal-export-namespace-from": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-			"integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz",
+			"integrity": "sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-export-namespace-from": "7.8.3"
 			}
 		},
 		"@babel/plugin-proposal-json-strings": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-			"integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz",
+			"integrity": "sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-json-strings": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-json-strings": "7.8.3"
 			}
 		},
 		"@babel/plugin-proposal-logical-assignment-operators": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-			"integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz",
+			"integrity": "sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-logical-assignment-operators": "7.10.4"
 			}
 		},
 		"@babel/plugin-proposal-nullish-coalescing-operator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-			"integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz",
+			"integrity": "sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3"
 			}
 		},
 		"@babel/plugin-proposal-numeric-separator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-			"integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz",
+			"integrity": "sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-numeric-separator": "7.10.4"
 			}
 		},
 		"@babel/plugin-proposal-object-rest-spread": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-			"integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz",
+			"integrity": "sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-				"@babel/plugin-transform-parameters": "^7.10.4"
+				"@babel/compat-data": "7.13.12",
+				"@babel/helper-compilation-targets": "7.13.13",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-object-rest-spread": "7.8.3",
+				"@babel/plugin-transform-parameters": "7.13.0"
 			}
 		},
 		"@babel/plugin-proposal-optional-catch-binding": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-			"integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz",
+			"integrity": "sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-optional-catch-binding": "7.8.3"
 			}
 		},
 		"@babel/plugin-proposal-optional-chaining": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-			"integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz",
+			"integrity": "sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "7.12.1",
+				"@babel/plugin-syntax-optional-chaining": "7.8.3"
 			}
 		},
 		"@babel/plugin-proposal-private-methods": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-			"integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz",
+			"integrity": "sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-create-class-features-plugin": "7.13.11",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-proposal-unicode-property-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-			"integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz",
+			"integrity": "sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-create-regexp-features-plugin": "7.12.17",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-async-generators": {
@@ -574,25 +591,25 @@
 			"integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-class-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz",
-			"integrity": "sha512-GCSBF7iUle6rNugfURwNmCGG3Z/2+opxAMLs1nND4bhEG5PuxTIggDBoeYYSujAlLtsupzOHYJQgPS3pivwXIA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+			"integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-decorators": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz",
-			"integrity": "sha512-2NaoC6fAk2VMdhY1eerkfHV+lVYC1u8b+jmRJISqANCJlTxYy19HGdIkkQtix2UtkcPuPu+IlDgrVseZnU03bw==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz",
+			"integrity": "sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-dynamic-import": {
@@ -601,7 +618,7 @@
 			"integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-export-namespace-from": {
@@ -610,16 +627,16 @@
 			"integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.3"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-flow": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz",
-			"integrity": "sha512-yxQsX1dJixF4qEEdzVbst3SZQ58Nrooz8NV9Z9GL4byTE25BvJgl5lf0RECUf0fh28rZBb/RYTWn/eeKwCMrZQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz",
+			"integrity": "sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-json-strings": {
@@ -628,16 +645,16 @@
 			"integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-jsx": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz",
-			"integrity": "sha512-KCg9mio9jwiARCB7WAcQ7Y1q+qicILjoK8LP/VkPkEKaf5dkaZZK1EcTe91a3JJlZ3qy6L5s9X52boEYi8DM9g==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz",
+			"integrity": "sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-logical-assignment-operators": {
@@ -646,7 +663,7 @@
 			"integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-nullish-coalescing-operator": {
@@ -655,7 +672,7 @@
 			"integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-numeric-separator": {
@@ -664,7 +681,7 @@
 			"integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-object-rest-spread": {
@@ -673,7 +690,7 @@
 			"integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-optional-catch-binding": {
@@ -682,7 +699,7 @@
 			"integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-optional-chaining": {
@@ -691,126 +708,125 @@
 			"integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.0"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-top-level-await": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz",
-			"integrity": "sha512-ni1brg4lXEmWyafKr0ccFWkJG0CeMt4WV1oyeBW6EFObF4oOHclbkj5cARxAPQyAQ2UTuplJyK4nfkXIMMFvsQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz",
+			"integrity": "sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-syntax-typescript": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz",
-			"integrity": "sha512-oSAEz1YkBCAKr5Yiq8/BNtvSAPwkp/IyUnwZogd8p+F0RuYQQrLeRUzIQhueQTTBy/F+a40uS7OFKxnkRvmvFQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz",
+			"integrity": "sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-arrow-functions": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-			"integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz",
+			"integrity": "sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-async-to-generator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-			"integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz",
+			"integrity": "sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-imports": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-remap-async-to-generator": "^7.10.4"
+				"@babel/helper-module-imports": "7.13.12",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-remap-async-to-generator": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-block-scoped-functions": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-			"integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz",
+			"integrity": "sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-block-scoping": {
-			"version": "7.11.1",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-			"integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz",
+			"integrity": "sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-classes": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-			"integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz",
+			"integrity": "sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-define-map": "^7.10.4",
-				"@babel/helper-function-name": "^7.10.4",
-				"@babel/helper-optimise-call-expression": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4",
-				"@babel/helper-split-export-declaration": "^7.10.4",
-				"globals": "^11.1.0"
+				"@babel/helper-annotate-as-pure": "7.12.13",
+				"@babel/helper-function-name": "7.12.13",
+				"@babel/helper-optimise-call-expression": "7.12.13",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-replace-supers": "7.13.12",
+				"@babel/helper-split-export-declaration": "7.12.13",
+				"globals": "11.12.0"
 			}
 		},
 		"@babel/plugin-transform-computed-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-			"integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz",
+			"integrity": "sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-destructuring": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-			"integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz",
+			"integrity": "sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-dotall-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-			"integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz",
+			"integrity": "sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-create-regexp-features-plugin": "7.12.17",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-duplicate-keys": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-			"integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz",
+			"integrity": "sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-exponentiation-operator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-			"integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz",
+			"integrity": "sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-builder-binary-assignment-operator-visitor": "7.12.13",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-flow-strip-types": {
@@ -819,226 +835,231 @@
 			"integrity": "sha512-7Qfg0lKQhEHs93FChxVLAvhBshOPQDtJUTVHr/ZwQNRccCm4O9D79r9tVSoV8iNwjP1YgfD+e/fgHcPkN1qEQg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.3",
-				"@babel/plugin-syntax-flow": "^7.8.3"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-flow": "7.12.13"
 			}
 		},
 		"@babel/plugin-transform-for-of": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-			"integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz",
+			"integrity": "sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-function-name": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-			"integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz",
+			"integrity": "sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-function-name": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-function-name": "7.12.13",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-literals": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-			"integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz",
+			"integrity": "sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-member-expression-literals": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-			"integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz",
+			"integrity": "sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-modules-amd": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-			"integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz",
+			"integrity": "sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-transforms": "^7.10.5",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-module-transforms": "7.13.14",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"babel-plugin-dynamic-import-node": "2.3.3"
 			}
 		},
 		"@babel/plugin-transform-modules-commonjs": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-			"integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz",
+			"integrity": "sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-transforms": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-simple-access": "^7.10.4",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-module-transforms": "7.13.14",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-simple-access": "7.13.12",
+				"babel-plugin-dynamic-import-node": "2.3.3"
 			}
 		},
 		"@babel/plugin-transform-modules-systemjs": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-			"integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+			"version": "7.13.8",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz",
+			"integrity": "sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-hoist-variables": "^7.10.4",
-				"@babel/helper-module-transforms": "^7.10.5",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"babel-plugin-dynamic-import-node": "^2.3.3"
+				"@babel/helper-hoist-variables": "7.13.0",
+				"@babel/helper-module-transforms": "7.13.14",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-validator-identifier": "7.12.11",
+				"babel-plugin-dynamic-import-node": "2.3.3"
+			},
+			"dependencies": {
+				"@babel/helper-validator-identifier": {
+					"version": "7.12.11",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+					"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+					"dev": true
+				}
 			}
 		},
 		"@babel/plugin-transform-modules-umd": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-			"integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz",
+			"integrity": "sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-transforms": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-module-transforms": "7.13.14",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-named-capturing-groups-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-			"integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz",
+			"integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4"
+				"@babel/helper-create-regexp-features-plugin": "7.12.17"
 			}
 		},
 		"@babel/plugin-transform-new-target": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-			"integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz",
+			"integrity": "sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-object-super": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-			"integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz",
+			"integrity": "sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-replace-supers": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-replace-supers": "7.13.12"
 			}
 		},
 		"@babel/plugin-transform-parameters": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-			"integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz",
+			"integrity": "sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-get-function-arity": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-property-literals": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-			"integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz",
+			"integrity": "sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-react-constant-elements": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz",
-			"integrity": "sha512-cYmQBW1pXrqBte1raMkAulXmi7rjg3VI6ZLg9QIic8Hq7BtYXaWuZSxsr2siOMI6SWwpxjWfnwhTUrd7JlAV7g==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.13.13.tgz",
+			"integrity": "sha512-SNJU53VM/SjQL0bZhyU+f4kJQz7bQQajnrZRSaU21hruG/NWY41AEM9AWXeXX90pYr/C2yAmTgI6yW3LlLrAUQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-react-display-name": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz",
-			"integrity": "sha512-Zd4X54Mu9SBfPGnEcaGcOrVAYOtjT2on8QZkLKEq1S/tHexG39d9XXGZv19VfRrDjPJzFmPfTAqOQS1pfFOujw==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz",
+			"integrity": "sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-react-jsx": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz",
-			"integrity": "sha512-L+MfRhWjX0eI7Js093MM6MacKU4M6dnCRa/QPDwYMxjljzSCzzlzKzj9Pk4P3OtrPcxr2N3znR419nr3Xw+65A==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.13.12.tgz",
+			"integrity": "sha512-jcEI2UqIcpCqB5U5DRxIl0tQEProI2gcu+g8VTIqxLO5Iidojb4d77q+fwGseCvd8af/lJ9masp4QWzBXFE2xA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-builder-react-jsx": "^7.10.4",
-				"@babel/helper-builder-react-jsx-experimental": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-jsx": "^7.10.4"
+				"@babel/helper-annotate-as-pure": "7.12.13",
+				"@babel/helper-module-imports": "7.13.12",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-jsx": "7.12.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@babel/plugin-transform-react-jsx-development": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.10.4.tgz",
-			"integrity": "sha512-RM3ZAd1sU1iQ7rI2dhrZRZGv0aqzNQMbkIUCS1txYpi9wHQ2ZHNjo5TwX+UD6pvFW4AbWqLVYvKy5qJSAyRGjQ==",
+			"version": "7.12.17",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz",
+			"integrity": "sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-builder-react-jsx-experimental": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-jsx": "^7.10.4"
+				"@babel/plugin-transform-react-jsx": "7.13.12"
 			}
 		},
 		"@babel/plugin-transform-react-jsx-self": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz",
-			"integrity": "sha512-yOvxY2pDiVJi0axdTWHSMi5T0DILN+H+SaeJeACHKjQLezEzhLx9nEF9xgpBLPtkZsks9cnb5P9iBEi21En3gg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz",
+			"integrity": "sha512-FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-jsx": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-react-jsx-source": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz",
-			"integrity": "sha512-wTeqHVkN1lfPLubRiZH3o73f4rfon42HpgxUSs86Nc+8QIcm/B9s8NNVXu/gwGcOyd7yDib9ikxoDLxJP0UiDA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz",
+			"integrity": "sha512-O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-jsx": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-react-pure-annotations": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz",
-			"integrity": "sha512-+njZkqcOuS8RaPakrnR9KvxjoG1ASJWpoIv/doyWngId88JoFlPlISenGXjrVacZUIALGUr6eodRs1vmPnF23A==",
+			"version": "7.12.1",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz",
+			"integrity": "sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-annotate-as-pure": "7.12.13",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-regenerator": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-			"integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz",
+			"integrity": "sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==",
 			"dev": true,
 			"requires": {
-				"regenerator-transform": "^0.14.2"
+				"regenerator-transform": "0.14.5"
 			}
 		},
 		"@babel/plugin-transform-reserved-words": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-			"integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz",
+			"integrity": "sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-runtime": {
@@ -1047,192 +1068,198 @@
 			"integrity": "sha512-pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-imports": "^7.8.3",
-				"@babel/helper-plugin-utils": "^7.8.3",
-				"resolve": "^1.8.1",
-				"semver": "^5.5.1"
+				"@babel/helper-module-imports": "7.13.12",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"resolve": "1.17.0",
+				"semver": "5.7.1"
 			}
 		},
 		"@babel/plugin-transform-shorthand-properties": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-			"integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz",
+			"integrity": "sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-spread": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-			"integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz",
+			"integrity": "sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-skip-transparent-expression-wrappers": "7.12.1"
 			}
 		},
 		"@babel/plugin-transform-sticky-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-			"integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz",
+			"integrity": "sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/helper-regex": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-template-literals": {
-			"version": "7.10.5",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-			"integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz",
+			"integrity": "sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-annotate-as-pure": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-typeof-symbol": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-			"integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz",
+			"integrity": "sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-typescript": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz",
-			"integrity": "sha512-edJsNzTtvb3MaXQwj8403B7mZoGu9ElDJQZOKjGUnvilquxBA3IQoEIOvkX/1O8xfAsnHS/oQhe2w/IXrr+w0w==",
+			"version": "7.13.0",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz",
+			"integrity": "sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-class-features-plugin": "^7.10.5",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-syntax-typescript": "^7.10.4"
+				"@babel/helper-create-class-features-plugin": "7.13.11",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-syntax-typescript": "7.12.13"
 			}
 		},
 		"@babel/plugin-transform-unicode-escapes": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-			"integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz",
+			"integrity": "sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/plugin-transform-unicode-regex": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-			"integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz",
+			"integrity": "sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-create-regexp-features-plugin": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4"
+				"@babel/helper-create-regexp-features-plugin": "7.12.17",
+				"@babel/helper-plugin-utils": "7.13.0"
 			}
 		},
 		"@babel/preset-env": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.0.tgz",
-			"integrity": "sha512-2u1/k7rG/gTh02dylX2kL3S0IJNF+J6bfDSp4DI2Ma8QN6Y9x9pmAax59fsCk6QUQG0yqH47yJWA+u1I1LccAg==",
-			"dev": true,
-			"requires": {
-				"@babel/compat-data": "^7.11.0",
-				"@babel/helper-compilation-targets": "^7.10.4",
-				"@babel/helper-module-imports": "^7.10.4",
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-				"@babel/plugin-proposal-class-properties": "^7.10.4",
-				"@babel/plugin-proposal-dynamic-import": "^7.10.4",
-				"@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-				"@babel/plugin-proposal-json-strings": "^7.10.4",
-				"@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-				"@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-				"@babel/plugin-proposal-numeric-separator": "^7.10.4",
-				"@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-				"@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-				"@babel/plugin-proposal-optional-chaining": "^7.11.0",
-				"@babel/plugin-proposal-private-methods": "^7.10.4",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
-				"@babel/plugin-syntax-async-generators": "^7.8.0",
-				"@babel/plugin-syntax-class-properties": "^7.10.4",
-				"@babel/plugin-syntax-dynamic-import": "^7.8.0",
-				"@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-				"@babel/plugin-syntax-json-strings": "^7.8.0",
-				"@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
-				"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-				"@babel/plugin-syntax-numeric-separator": "^7.10.4",
-				"@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-				"@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-				"@babel/plugin-syntax-optional-chaining": "^7.8.0",
-				"@babel/plugin-syntax-top-level-await": "^7.10.4",
-				"@babel/plugin-transform-arrow-functions": "^7.10.4",
-				"@babel/plugin-transform-async-to-generator": "^7.10.4",
-				"@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-				"@babel/plugin-transform-block-scoping": "^7.10.4",
-				"@babel/plugin-transform-classes": "^7.10.4",
-				"@babel/plugin-transform-computed-properties": "^7.10.4",
-				"@babel/plugin-transform-destructuring": "^7.10.4",
-				"@babel/plugin-transform-dotall-regex": "^7.10.4",
-				"@babel/plugin-transform-duplicate-keys": "^7.10.4",
-				"@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-				"@babel/plugin-transform-for-of": "^7.10.4",
-				"@babel/plugin-transform-function-name": "^7.10.4",
-				"@babel/plugin-transform-literals": "^7.10.4",
-				"@babel/plugin-transform-member-expression-literals": "^7.10.4",
-				"@babel/plugin-transform-modules-amd": "^7.10.4",
-				"@babel/plugin-transform-modules-commonjs": "^7.10.4",
-				"@babel/plugin-transform-modules-systemjs": "^7.10.4",
-				"@babel/plugin-transform-modules-umd": "^7.10.4",
-				"@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-				"@babel/plugin-transform-new-target": "^7.10.4",
-				"@babel/plugin-transform-object-super": "^7.10.4",
-				"@babel/plugin-transform-parameters": "^7.10.4",
-				"@babel/plugin-transform-property-literals": "^7.10.4",
-				"@babel/plugin-transform-regenerator": "^7.10.4",
-				"@babel/plugin-transform-reserved-words": "^7.10.4",
-				"@babel/plugin-transform-shorthand-properties": "^7.10.4",
-				"@babel/plugin-transform-spread": "^7.11.0",
-				"@babel/plugin-transform-sticky-regex": "^7.10.4",
-				"@babel/plugin-transform-template-literals": "^7.10.4",
-				"@babel/plugin-transform-typeof-symbol": "^7.10.4",
-				"@babel/plugin-transform-unicode-escapes": "^7.10.4",
-				"@babel/plugin-transform-unicode-regex": "^7.10.4",
-				"@babel/preset-modules": "^0.1.3",
-				"@babel/types": "^7.11.0",
-				"browserslist": "^4.12.0",
-				"core-js-compat": "^3.6.2",
-				"invariant": "^2.2.2",
-				"levenary": "^1.1.1",
-				"semver": "^5.5.0"
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz",
+			"integrity": "sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "7.13.12",
+				"@babel/helper-compilation-targets": "7.13.13",
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-validator-option": "7.12.17",
+				"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "7.13.12",
+				"@babel/plugin-proposal-async-generator-functions": "7.13.8",
+				"@babel/plugin-proposal-class-properties": "7.13.0",
+				"@babel/plugin-proposal-dynamic-import": "7.13.8",
+				"@babel/plugin-proposal-export-namespace-from": "7.12.13",
+				"@babel/plugin-proposal-json-strings": "7.13.8",
+				"@babel/plugin-proposal-logical-assignment-operators": "7.13.8",
+				"@babel/plugin-proposal-nullish-coalescing-operator": "7.13.8",
+				"@babel/plugin-proposal-numeric-separator": "7.12.13",
+				"@babel/plugin-proposal-object-rest-spread": "7.13.8",
+				"@babel/plugin-proposal-optional-catch-binding": "7.13.8",
+				"@babel/plugin-proposal-optional-chaining": "7.13.12",
+				"@babel/plugin-proposal-private-methods": "7.13.0",
+				"@babel/plugin-proposal-unicode-property-regex": "7.12.13",
+				"@babel/plugin-syntax-async-generators": "7.8.4",
+				"@babel/plugin-syntax-class-properties": "7.12.13",
+				"@babel/plugin-syntax-dynamic-import": "7.8.3",
+				"@babel/plugin-syntax-export-namespace-from": "7.8.3",
+				"@babel/plugin-syntax-json-strings": "7.8.3",
+				"@babel/plugin-syntax-logical-assignment-operators": "7.10.4",
+				"@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3",
+				"@babel/plugin-syntax-numeric-separator": "7.10.4",
+				"@babel/plugin-syntax-object-rest-spread": "7.8.3",
+				"@babel/plugin-syntax-optional-catch-binding": "7.8.3",
+				"@babel/plugin-syntax-optional-chaining": "7.8.3",
+				"@babel/plugin-syntax-top-level-await": "7.12.13",
+				"@babel/plugin-transform-arrow-functions": "7.13.0",
+				"@babel/plugin-transform-async-to-generator": "7.13.0",
+				"@babel/plugin-transform-block-scoped-functions": "7.12.13",
+				"@babel/plugin-transform-block-scoping": "7.12.13",
+				"@babel/plugin-transform-classes": "7.13.0",
+				"@babel/plugin-transform-computed-properties": "7.13.0",
+				"@babel/plugin-transform-destructuring": "7.13.0",
+				"@babel/plugin-transform-dotall-regex": "7.12.13",
+				"@babel/plugin-transform-duplicate-keys": "7.12.13",
+				"@babel/plugin-transform-exponentiation-operator": "7.12.13",
+				"@babel/plugin-transform-for-of": "7.13.0",
+				"@babel/plugin-transform-function-name": "7.12.13",
+				"@babel/plugin-transform-literals": "7.12.13",
+				"@babel/plugin-transform-member-expression-literals": "7.12.13",
+				"@babel/plugin-transform-modules-amd": "7.13.0",
+				"@babel/plugin-transform-modules-commonjs": "7.13.8",
+				"@babel/plugin-transform-modules-systemjs": "7.13.8",
+				"@babel/plugin-transform-modules-umd": "7.13.0",
+				"@babel/plugin-transform-named-capturing-groups-regex": "7.12.13",
+				"@babel/plugin-transform-new-target": "7.12.13",
+				"@babel/plugin-transform-object-super": "7.12.13",
+				"@babel/plugin-transform-parameters": "7.13.0",
+				"@babel/plugin-transform-property-literals": "7.12.13",
+				"@babel/plugin-transform-regenerator": "7.12.13",
+				"@babel/plugin-transform-reserved-words": "7.12.13",
+				"@babel/plugin-transform-shorthand-properties": "7.12.13",
+				"@babel/plugin-transform-spread": "7.13.0",
+				"@babel/plugin-transform-sticky-regex": "7.12.13",
+				"@babel/plugin-transform-template-literals": "7.13.0",
+				"@babel/plugin-transform-typeof-symbol": "7.12.13",
+				"@babel/plugin-transform-unicode-escapes": "7.12.13",
+				"@babel/plugin-transform-unicode-regex": "7.12.13",
+				"@babel/preset-modules": "0.1.4",
+				"@babel/types": "7.13.14",
+				"babel-plugin-polyfill-corejs2": "0.1.10",
+				"babel-plugin-polyfill-corejs3": "0.1.7",
+				"babel-plugin-polyfill-regenerator": "0.1.6",
+				"core-js-compat": "3.10.0",
+				"semver": "6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
 			}
 		},
 		"@babel/preset-modules": {
-			"version": "0.1.3",
-			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
-			"integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.4.tgz",
+			"integrity": "sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
-				"@babel/plugin-transform-dotall-regex": "^7.4.4",
-				"@babel/types": "^7.4.4",
-				"esutils": "^2.0.2"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-proposal-unicode-property-regex": "7.12.13",
+				"@babel/plugin-transform-dotall-regex": "7.12.13",
+				"@babel/types": "7.13.14",
+				"esutils": "2.0.3"
 			}
 		},
 		"@babel/preset-react": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.10.4.tgz",
-			"integrity": "sha512-BrHp4TgOIy4M19JAfO1LhycVXOPWdDbTRep7eVyatf174Hff+6Uk53sDyajqZPu8W1qXRBiYOfIamek6jA7YVw==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.13.13.tgz",
+			"integrity": "sha512-gx+tDLIE06sRjKJkVtpZ/t3mzCDOnPG+ggHZG9lffUbX8+wC739x20YQc9V35Do6ZAxaUc/HhVHIiOzz5MvDmA==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.10.4",
-				"@babel/plugin-transform-react-display-name": "^7.10.4",
-				"@babel/plugin-transform-react-jsx": "^7.10.4",
-				"@babel/plugin-transform-react-jsx-development": "^7.10.4",
-				"@babel/plugin-transform-react-jsx-self": "^7.10.4",
-				"@babel/plugin-transform-react-jsx-source": "^7.10.4",
-				"@babel/plugin-transform-react-pure-annotations": "^7.10.4"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/helper-validator-option": "7.12.17",
+				"@babel/plugin-transform-react-display-name": "7.12.13",
+				"@babel/plugin-transform-react-jsx": "7.13.12",
+				"@babel/plugin-transform-react-jsx-development": "7.12.17",
+				"@babel/plugin-transform-react-pure-annotations": "7.12.1"
 			}
 		},
 		"@babel/preset-typescript": {
@@ -1241,8 +1268,8 @@
 			"integrity": "sha512-S4cueFnGrIbvYJgwsVFKdvOmpiL0XGw9MFW9D0vgRys5g36PBhZRL8NX8Gr2akz8XRtzq6HuDXPD/1nniagNUg==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.8.3",
-				"@babel/plugin-transform-typescript": "^7.9.0"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"@babel/plugin-transform-typescript": "7.13.0"
 			}
 		},
 		"@babel/runtime": {
@@ -1250,7 +1277,7 @@
 			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz",
 			"integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==",
 			"requires": {
-				"regenerator-runtime": "^0.13.4"
+				"regenerator-runtime": "0.13.5"
 			},
 			"dependencies": {
 				"regenerator-runtime": {
@@ -1261,13 +1288,13 @@
 			}
 		},
 		"@babel/runtime-corejs3": {
-			"version": "7.11.2",
-			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz",
-			"integrity": "sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==",
+			"version": "7.13.10",
+			"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.13.10.tgz",
+			"integrity": "sha512-x/XYVQ1h684pp1mJwOV4CyvqZXqbc8CMsMGUnAbuc82ZCdv1U63w5RSUzgDSXQHG5Rps/kiksH6g2D5BuaKyXg==",
 			"dev": true,
 			"requires": {
-				"core-js-pure": "^3.0.0",
-				"regenerator-runtime": "^0.13.4"
+				"core-js-pure": "3.10.0",
+				"regenerator-runtime": "0.13.7"
 			},
 			"dependencies": {
 				"regenerator-runtime": {
@@ -1279,53 +1306,114 @@
 			}
 		},
 		"@babel/template": {
-			"version": "7.10.4",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-			"integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+			"integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.10.4",
-				"@babel/parser": "^7.10.4",
-				"@babel/types": "^7.10.4"
+				"@babel/code-frame": "7.12.13",
+				"@babel/parser": "7.13.13",
+				"@babel/types": "7.13.14"
+			},
+			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.12.13",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+					"integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+					"dev": true,
+					"requires": {
+						"@babel/highlight": "7.13.10"
+					}
+				},
+				"@babel/helper-validator-identifier": {
+					"version": "7.12.11",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+					"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+					"dev": true
+				},
+				"@babel/highlight": {
+					"version": "7.13.10",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+					"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+					"dev": true,
+					"requires": {
+						"@babel/helper-validator-identifier": "7.12.11",
+						"chalk": "2.4.2",
+						"js-tokens": "4.0.0"
+					}
+				}
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.0.tgz",
-			"integrity": "sha512-ZB2V+LskoWKNpMq6E5UUCrjtDUh5IOTAyIl0dTjIEoXum/iKWkoIEKIRDnUucO6f+2FzNkE0oD4RLKoPIufDtg==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz",
+			"integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.10.4",
-				"@babel/generator": "^7.11.0",
-				"@babel/helper-function-name": "^7.10.4",
-				"@babel/helper-split-export-declaration": "^7.11.0",
-				"@babel/parser": "^7.11.0",
-				"@babel/types": "^7.11.0",
-				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.19"
+				"@babel/code-frame": "7.12.13",
+				"@babel/generator": "7.13.9",
+				"@babel/helper-function-name": "7.12.13",
+				"@babel/helper-split-export-declaration": "7.12.13",
+				"@babel/parser": "7.13.13",
+				"@babel/types": "7.13.14",
+				"debug": "4.3.1",
+				"globals": "11.12.0"
 			},
 			"dependencies": {
+				"@babel/code-frame": {
+					"version": "7.12.13",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+					"integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
+					"dev": true,
+					"requires": {
+						"@babel/highlight": "7.13.10"
+					}
+				},
+				"@babel/helper-validator-identifier": {
+					"version": "7.12.11",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+					"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+					"dev": true
+				},
+				"@babel/highlight": {
+					"version": "7.13.10",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+					"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
+					"dev": true,
+					"requires": {
+						"@babel/helper-validator-identifier": "7.12.11",
+						"chalk": "2.4.2",
+						"js-tokens": "4.0.0"
+					}
+				},
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				}
 			}
 		},
 		"@babel/types": {
-			"version": "7.11.0",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.0.tgz",
-			"integrity": "sha512-O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA==",
+			"version": "7.13.14",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz",
+			"integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.10.4",
-				"lodash": "^4.17.19",
-				"to-fast-properties": "^2.0.0"
+				"@babel/helper-validator-identifier": "7.12.11",
+				"lodash": "4.17.19",
+				"to-fast-properties": "2.0.0"
+			},
+			"dependencies": {
+				"@babel/helper-validator-identifier": {
+					"version": "7.12.11",
+					"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+					"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+					"dev": true
+				}
 			}
 		},
 		"@cnakazawa/watch": {
@@ -1334,8 +1422,8 @@
 			"integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
 			"dev": true,
 			"requires": {
-				"exec-sh": "^0.3.2",
-				"minimist": "^1.2.0"
+				"exec-sh": "0.3.6",
+				"minimist": "1.2.5"
 			}
 		},
 		"@csstools/convert-colors": {
@@ -1374,10 +1462,10 @@
 			"integrity": "sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==",
 			"dev": true,
 			"requires": {
-				"@hapi/address": "2.x.x",
-				"@hapi/bourne": "1.x.x",
-				"@hapi/hoek": "8.x.x",
-				"@hapi/topo": "3.x.x"
+				"@hapi/address": "2.1.4",
+				"@hapi/bourne": "1.3.2",
+				"@hapi/hoek": "8.5.1",
+				"@hapi/topo": "3.1.6"
 			}
 		},
 		"@hapi/topo": {
@@ -1386,7 +1474,7 @@
 			"integrity": "sha512-tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ==",
 			"dev": true,
 			"requires": {
-				"@hapi/hoek": "^8.3.0"
+				"@hapi/hoek": "8.5.1"
 			}
 		},
 		"@jest/console": {
@@ -1395,9 +1483,9 @@
 			"integrity": "sha512-Zuj6b8TnKXi3q4ymac8EQfc3ea/uhLeCGThFqXeC8H9/raaH8ARPUTdId+XyGd03Z4In0/VjD2OYFcBF09fNLQ==",
 			"dev": true,
 			"requires": {
-				"@jest/source-map": "^24.9.0",
-				"chalk": "^2.0.1",
-				"slash": "^2.0.0"
+				"@jest/source-map": "24.9.0",
+				"chalk": "2.4.2",
+				"slash": "2.0.0"
 			}
 		},
 		"@jest/core": {
@@ -1406,34 +1494,34 @@
 			"integrity": "sha512-Fogg3s4wlAr1VX7q+rhV9RVnUv5tD7VuWfYy1+whMiWUrvl7U3QJSJyWcDio9Lq2prqYsZaeTv2Rz24pWGkJ2A==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "^24.7.1",
-				"@jest/reporters": "^24.9.0",
-				"@jest/test-result": "^24.9.0",
-				"@jest/transform": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"ansi-escapes": "^3.0.0",
-				"chalk": "^2.0.1",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.1.15",
-				"jest-changed-files": "^24.9.0",
-				"jest-config": "^24.9.0",
-				"jest-haste-map": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-regex-util": "^24.3.0",
-				"jest-resolve": "^24.9.0",
-				"jest-resolve-dependencies": "^24.9.0",
-				"jest-runner": "^24.9.0",
-				"jest-runtime": "^24.9.0",
-				"jest-snapshot": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jest-validate": "^24.9.0",
-				"jest-watcher": "^24.9.0",
-				"micromatch": "^3.1.10",
-				"p-each-series": "^1.0.0",
-				"realpath-native": "^1.1.0",
-				"rimraf": "^2.5.4",
-				"slash": "^2.0.0",
-				"strip-ansi": "^5.0.0"
+				"@jest/console": "24.9.0",
+				"@jest/reporters": "24.9.0",
+				"@jest/test-result": "24.9.0",
+				"@jest/transform": "24.9.0",
+				"@jest/types": "24.9.0",
+				"ansi-escapes": "3.2.0",
+				"chalk": "2.4.2",
+				"exit": "0.1.2",
+				"graceful-fs": "4.2.4",
+				"jest-changed-files": "24.9.0",
+				"jest-config": "24.9.0",
+				"jest-haste-map": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-regex-util": "24.9.0",
+				"jest-resolve": "24.9.0",
+				"jest-resolve-dependencies": "24.9.0",
+				"jest-runner": "24.9.0",
+				"jest-runtime": "24.9.0",
+				"jest-snapshot": "24.9.0",
+				"jest-util": "24.9.0",
+				"jest-validate": "24.9.0",
+				"jest-watcher": "24.9.0",
+				"micromatch": "3.1.10",
+				"p-each-series": "1.0.0",
+				"realpath-native": "1.1.0",
+				"rimraf": "2.7.1",
+				"slash": "2.0.0",
+				"strip-ansi": "5.2.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -1448,7 +1536,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				},
 				"strip-ansi": {
@@ -1457,7 +1545,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					}
 				}
 			}
@@ -1468,10 +1556,10 @@
 			"integrity": "sha512-5A1QluTPhvdIPFYnO3sZC3smkNeXPVELz7ikPbhUj0bQjB07EoE9qtLrem14ZUYWdVayYbsjVwIiL4WBIMV4aQ==",
 			"dev": true,
 			"requires": {
-				"@jest/fake-timers": "^24.9.0",
-				"@jest/transform": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"jest-mock": "^24.9.0"
+				"@jest/fake-timers": "24.9.0",
+				"@jest/transform": "24.9.0",
+				"@jest/types": "24.9.0",
+				"jest-mock": "24.9.0"
 			}
 		},
 		"@jest/fake-timers": {
@@ -1480,9 +1568,9 @@
 			"integrity": "sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-mock": "^24.9.0"
+				"@jest/types": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-mock": "24.9.0"
 			}
 		},
 		"@jest/reporters": {
@@ -1491,27 +1579,27 @@
 			"integrity": "sha512-mu4X0yjaHrffOsWmVLzitKmmmWSQ3GGuefgNscUSWNiUNcEOSEQk9k3pERKEQVBb0Cnn88+UESIsZEMH3o88Gw==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "^24.9.0",
-				"@jest/test-result": "^24.9.0",
-				"@jest/transform": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"chalk": "^2.0.1",
-				"exit": "^0.1.2",
-				"glob": "^7.1.2",
-				"istanbul-lib-coverage": "^2.0.2",
-				"istanbul-lib-instrument": "^3.0.1",
-				"istanbul-lib-report": "^2.0.4",
-				"istanbul-lib-source-maps": "^3.0.1",
-				"istanbul-reports": "^2.2.6",
-				"jest-haste-map": "^24.9.0",
-				"jest-resolve": "^24.9.0",
-				"jest-runtime": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jest-worker": "^24.6.0",
-				"node-notifier": "^5.4.2",
-				"slash": "^2.0.0",
-				"source-map": "^0.6.0",
-				"string-length": "^2.0.0"
+				"@jest/environment": "24.9.0",
+				"@jest/test-result": "24.9.0",
+				"@jest/transform": "24.9.0",
+				"@jest/types": "24.9.0",
+				"chalk": "2.4.2",
+				"exit": "0.1.2",
+				"glob": "7.1.6",
+				"istanbul-lib-coverage": "2.0.5",
+				"istanbul-lib-instrument": "3.3.0",
+				"istanbul-lib-report": "2.0.8",
+				"istanbul-lib-source-maps": "3.0.6",
+				"istanbul-reports": "2.2.7",
+				"jest-haste-map": "24.9.0",
+				"jest-resolve": "24.9.0",
+				"jest-runtime": "24.9.0",
+				"jest-util": "24.9.0",
+				"jest-worker": "24.9.0",
+				"node-notifier": "5.4.5",
+				"slash": "2.0.0",
+				"source-map": "0.6.1",
+				"string-length": "2.0.0"
 			},
 			"dependencies": {
 				"source-map": {
@@ -1528,9 +1616,9 @@
 			"integrity": "sha512-/Xw7xGlsZb4MJzNDgB7PW5crou5JqWiBQaz6xyPd3ArOg2nfn/PunV8+olXbbEZzNl591o5rWKE9BRDaFAuIBg==",
 			"dev": true,
 			"requires": {
-				"callsites": "^3.0.0",
-				"graceful-fs": "^4.1.15",
-				"source-map": "^0.6.0"
+				"callsites": "3.1.0",
+				"graceful-fs": "4.2.4",
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"callsites": {
@@ -1553,9 +1641,9 @@
 			"integrity": "sha512-XEFrHbBonBJ8dGp2JmF8kP/nQI/ImPpygKHwQ/SY+es59Z3L5PI4Qb9TQQMAEeYsThG1xF0k6tmG0tIKATNiiA==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"@types/istanbul-lib-coverage": "^2.0.0"
+				"@jest/console": "24.9.0",
+				"@jest/types": "24.9.0",
+				"@types/istanbul-lib-coverage": "2.0.3"
 			}
 		},
 		"@jest/test-sequencer": {
@@ -1564,10 +1652,10 @@
 			"integrity": "sha512-6qqsU4o0kW1dvA95qfNog8v8gkRN9ph6Lz7r96IvZpHdNipP2cBcb07J1Z45mz/VIS01OHJ3pY8T5fUY38tg4A==",
 			"dev": true,
 			"requires": {
-				"@jest/test-result": "^24.9.0",
-				"jest-haste-map": "^24.9.0",
-				"jest-runner": "^24.9.0",
-				"jest-runtime": "^24.9.0"
+				"@jest/test-result": "24.9.0",
+				"jest-haste-map": "24.9.0",
+				"jest-runner": "24.9.0",
+				"jest-runtime": "24.9.0"
 			}
 		},
 		"@jest/transform": {
@@ -1576,21 +1664,21 @@
 			"integrity": "sha512-TcQUmyNRxV94S0QpMOnZl0++6RMiqpbH/ZMccFB/amku6Uwvyb1cjYX7xkp5nGNkbX4QPH/FcB6q1HBTHynLmQ==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/types": "^24.9.0",
-				"babel-plugin-istanbul": "^5.1.0",
-				"chalk": "^2.0.1",
-				"convert-source-map": "^1.4.0",
-				"fast-json-stable-stringify": "^2.0.0",
-				"graceful-fs": "^4.1.15",
-				"jest-haste-map": "^24.9.0",
-				"jest-regex-util": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"micromatch": "^3.1.10",
-				"pirates": "^4.0.1",
-				"realpath-native": "^1.1.0",
-				"slash": "^2.0.0",
-				"source-map": "^0.6.1",
+				"@babel/core": "7.9.0",
+				"@jest/types": "24.9.0",
+				"babel-plugin-istanbul": "5.2.0",
+				"chalk": "2.4.2",
+				"convert-source-map": "1.7.0",
+				"fast-json-stable-stringify": "2.1.0",
+				"graceful-fs": "4.2.4",
+				"jest-haste-map": "24.9.0",
+				"jest-regex-util": "24.9.0",
+				"jest-util": "24.9.0",
+				"micromatch": "3.1.10",
+				"pirates": "4.0.1",
+				"realpath-native": "1.1.0",
+				"slash": "2.0.0",
+				"source-map": "0.6.1",
 				"write-file-atomic": "2.4.1"
 			},
 			"dependencies": {
@@ -1608,9 +1696,9 @@
 			"integrity": "sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==",
 			"dev": true,
 			"requires": {
-				"@types/istanbul-lib-coverage": "^2.0.0",
-				"@types/istanbul-reports": "^1.1.1",
-				"@types/yargs": "^13.0.0"
+				"@types/istanbul-lib-coverage": "2.0.3",
+				"@types/istanbul-reports": "1.1.2",
+				"@types/yargs": "13.0.11"
 			}
 		},
 		"@material/animation": {
@@ -1628,10 +1716,10 @@
 			"resolved": "https://registry.npmjs.org/@material/button/-/button-0.7.0.tgz",
 			"integrity": "sha512-T2Gcn8IJOJtzSU8mHN7HMqGbvkOy5lEWDZ/dLmVviGKeip22XR9pjm8sO52dCcs1rJJxsJPCl9UnaQUmT8Shaw==",
 			"requires": {
-				"@material/elevation": "^0.1.12",
-				"@material/ripple": "^0.8.7",
-				"@material/theme": "^0.3.1",
-				"@material/typography": "^0.3.0"
+				"@material/elevation": "0.1.13",
+				"@material/ripple": "0.8.8",
+				"@material/theme": "0.3.1",
+				"@material/typography": "0.3.0"
 			}
 		},
 		"@material/elevation": {
@@ -1639,7 +1727,7 @@
 			"resolved": "https://registry.npmjs.org/@material/elevation/-/elevation-0.1.13.tgz",
 			"integrity": "sha1-o4iF88r0OYymp0aMMIiH1wvUYFs=",
 			"requires": {
-				"@material/animation": "^0.4.1"
+				"@material/animation": "0.4.1"
 			}
 		},
 		"@material/ripple": {
@@ -1647,8 +1735,8 @@
 			"resolved": "https://registry.npmjs.org/@material/ripple/-/ripple-0.8.8.tgz",
 			"integrity": "sha1-Irie2eY4g/F/pPANEjcOMuDEWbc=",
 			"requires": {
-				"@material/base": "^0.2.6",
-				"@material/theme": "^0.4.0"
+				"@material/base": "0.2.6",
+				"@material/theme": "0.4.0"
 			},
 			"dependencies": {
 				"@material/theme": {
@@ -1674,8 +1762,8 @@
 			"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
 			"dev": true,
 			"requires": {
-				"call-me-maybe": "^1.0.1",
-				"glob-to-regexp": "^0.3.0"
+				"call-me-maybe": "1.0.1",
+				"glob-to-regexp": "0.3.0"
 			}
 		},
 		"@nodelib/fs.stat": {
@@ -1684,6 +1772,19 @@
 			"integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
 			"dev": true
 		},
+		"@paciolan/remote-component": {
+			"version": "2.11.0",
+			"resolved": "https://registry.npmjs.org/@paciolan/remote-component/-/remote-component-2.11.0.tgz",
+			"integrity": "sha512-ujQxfJa0Cp0q+uCiTFpscYD7q14f2rVuUl934HgVXBW/CBChfzLwZGYjtF59IAsbwVGMpgpUlMdD0B26p/hxTg==",
+			"requires": {
+				"@paciolan/remote-module-loader": "2.6.2"
+			}
+		},
+		"@paciolan/remote-module-loader": {
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/@paciolan/remote-module-loader/-/remote-module-loader-2.6.2.tgz",
+			"integrity": "sha512-A49c4kX70zNpjFNuLwa53+xMlGf1W/DXMqBFR1JOMGTIpfZ6KJLpfonRG+2eA1c3CFZNvn+j99QWFEd6lgKSMA=="
+		},
 		"@svgr/babel-plugin-add-jsx-attribute": {
 			"version": "4.2.0",
 			"resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-4.2.0.tgz",
@@ -1738,14 +1839,14 @@
 			"integrity": "sha512-6PG80tdz4eAlYUN3g5GZiUjg2FMcp+Wn6rtnz5WJG9ITGEF1pmFdzq02597Hn0OmnQuCVaBYQE1OVFAnwOl+0A==",
 			"dev": true,
 			"requires": {
-				"@svgr/babel-plugin-add-jsx-attribute": "^4.2.0",
-				"@svgr/babel-plugin-remove-jsx-attribute": "^4.2.0",
-				"@svgr/babel-plugin-remove-jsx-empty-expression": "^4.2.0",
-				"@svgr/babel-plugin-replace-jsx-attribute-value": "^4.2.0",
-				"@svgr/babel-plugin-svg-dynamic-title": "^4.3.3",
-				"@svgr/babel-plugin-svg-em-dimensions": "^4.2.0",
-				"@svgr/babel-plugin-transform-react-native-svg": "^4.2.0",
-				"@svgr/babel-plugin-transform-svg-component": "^4.2.0"
+				"@svgr/babel-plugin-add-jsx-attribute": "4.2.0",
+				"@svgr/babel-plugin-remove-jsx-attribute": "4.2.0",
+				"@svgr/babel-plugin-remove-jsx-empty-expression": "4.2.0",
+				"@svgr/babel-plugin-replace-jsx-attribute-value": "4.2.0",
+				"@svgr/babel-plugin-svg-dynamic-title": "4.3.3",
+				"@svgr/babel-plugin-svg-em-dimensions": "4.2.0",
+				"@svgr/babel-plugin-transform-react-native-svg": "4.2.0",
+				"@svgr/babel-plugin-transform-svg-component": "4.2.0"
 			}
 		},
 		"@svgr/core": {
@@ -1754,9 +1855,9 @@
 			"integrity": "sha512-qNuGF1QON1626UCaZamWt5yedpgOytvLj5BQZe2j1k1B8DUG4OyugZyfEwBeXozCUwhLEpsrgPrE+eCu4fY17w==",
 			"dev": true,
 			"requires": {
-				"@svgr/plugin-jsx": "^4.3.3",
-				"camelcase": "^5.3.1",
-				"cosmiconfig": "^5.2.1"
+				"@svgr/plugin-jsx": "4.3.3",
+				"camelcase": "5.3.1",
+				"cosmiconfig": "5.2.1"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -1773,7 +1874,7 @@
 			"integrity": "sha512-JioXclZGhFIDL3ddn4Kiq8qEqYM2PyDKV0aYno8+IXTLuYt6TOgHUbUAAFvqtb0Xn37NwP0BTHglejFoYr8RZg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.4.4"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@svgr/plugin-jsx": {
@@ -1782,10 +1883,10 @@
 			"integrity": "sha512-cLOCSpNWQnDB1/v+SUENHH7a0XY09bfuMKdq9+gYvtuwzC2rU4I0wKGFEp1i24holdQdwodCtDQdFtJiTCWc+w==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.4.5",
-				"@svgr/babel-preset": "^4.3.3",
-				"@svgr/hast-util-to-babel-ast": "^4.3.2",
-				"svg-parser": "^2.0.0"
+				"@babel/core": "7.9.0",
+				"@svgr/babel-preset": "4.3.3",
+				"@svgr/hast-util-to-babel-ast": "4.3.2",
+				"svg-parser": "2.0.4"
 			}
 		},
 		"@svgr/plugin-svgo": {
@@ -1794,9 +1895,9 @@
 			"integrity": "sha512-PrMtEDUWjX3Ea65JsVCwTIXuSqa3CG9px+DluF1/eo9mlDrgrtFE7NE/DjdhjJgSM9wenlVBzkzneSIUgfUI/w==",
 			"dev": true,
 			"requires": {
-				"cosmiconfig": "^5.2.1",
-				"merge-deep": "^3.0.2",
-				"svgo": "^1.2.2"
+				"cosmiconfig": "5.2.1",
+				"merge-deep": "3.0.3",
+				"svgo": "1.3.2"
 			}
 		},
 		"@svgr/webpack": {
@@ -1805,14 +1906,14 @@
 			"integrity": "sha512-bjnWolZ6KVsHhgyCoYRFmbd26p8XVbulCzSG53BDQqAr+JOAderYK7CuYrB3bDjHJuF6LJ7Wrr42+goLRV9qIg==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.4.5",
-				"@babel/plugin-transform-react-constant-elements": "^7.0.0",
-				"@babel/preset-env": "^7.4.5",
-				"@babel/preset-react": "^7.0.0",
-				"@svgr/core": "^4.3.3",
-				"@svgr/plugin-jsx": "^4.3.3",
-				"@svgr/plugin-svgo": "^4.3.1",
-				"loader-utils": "^1.2.3"
+				"@babel/core": "7.9.0",
+				"@babel/plugin-transform-react-constant-elements": "7.13.13",
+				"@babel/preset-env": "7.13.12",
+				"@babel/preset-react": "7.13.13",
+				"@svgr/core": "4.3.3",
+				"@svgr/plugin-jsx": "4.3.3",
+				"@svgr/plugin-svgo": "4.3.1",
+				"loader-utils": "1.4.0"
 			}
 		},
 		"@tanem/svg-injector": {
@@ -1820,9 +1921,9 @@
 			"resolved": "https://registry.npmjs.org/@tanem/svg-injector/-/svg-injector-8.2.2.tgz",
 			"integrity": "sha512-a4C3GMCD15URV+ZNjt8Fibxu04qejJip0G6qIDl/Dne7TGt++2MjJzwV5lRVo7yqT/OIVFOnAQwMH0qfHGWlpw==",
 			"requires": {
-				"@babel/runtime": "^7.12.5",
-				"content-type": "^1.0.4",
-				"tslib": "^2.0.3"
+				"@babel/runtime": "7.12.5",
+				"content-type": "1.0.4",
+				"tslib": "2.1.0"
 			},
 			"dependencies": {
 				"@babel/runtime": {
@@ -1830,7 +1931,7 @@
 					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
 					"integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
 					"requires": {
-						"regenerator-runtime": "^0.13.4"
+						"regenerator-runtime": "0.13.7"
 					}
 				},
 				"regenerator-runtime": {
@@ -1846,52 +1947,46 @@
 			}
 		},
 		"@types/babel__core": {
-			"version": "7.1.9",
-			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.9.tgz",
-			"integrity": "sha512-sY2RsIJ5rpER1u3/aQ8OFSI7qGIy8o1NEEbgb2UaJcvOtXOMpd39ko723NBpjQFg9SIX7TXtjejZVGeIMLhoOw==",
+			"version": "7.1.14",
+			"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.14.tgz",
+			"integrity": "sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==",
 			"dev": true,
 			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0",
-				"@types/babel__generator": "*",
-				"@types/babel__template": "*",
-				"@types/babel__traverse": "*"
+				"@babel/parser": "7.13.13",
+				"@babel/types": "7.13.14",
+				"@types/babel__generator": "7.6.2",
+				"@types/babel__template": "7.4.0",
+				"@types/babel__traverse": "7.11.1"
 			}
 		},
 		"@types/babel__generator": {
-			"version": "7.6.1",
-			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.1.tgz",
-			"integrity": "sha512-bBKm+2VPJcMRVwNhxKu8W+5/zT7pwNEqeokFOmbvVSqGzFneNxYcEBro9Ac7/N9tlsaPYnZLK8J1LWKkMsLAew==",
+			"version": "7.6.2",
+			"resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz",
+			"integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.0.0"
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@types/babel__template": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.0.2.tgz",
-			"integrity": "sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==",
+			"version": "7.4.0",
+			"resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz",
+			"integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==",
 			"dev": true,
 			"requires": {
-				"@babel/parser": "^7.1.0",
-				"@babel/types": "^7.0.0"
+				"@babel/parser": "7.13.13",
+				"@babel/types": "7.13.14"
 			}
 		},
 		"@types/babel__traverse": {
-			"version": "7.0.13",
-			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.13.tgz",
-			"integrity": "sha512-i+zS7t6/s9cdQvbqKDARrcbrPvtJGlbYsMkazo03nTAK3RX9FNrLllXys22uiTGJapPOTZTQ35nHh4ISph4SLQ==",
+			"version": "7.11.1",
+			"resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.11.1.tgz",
+			"integrity": "sha512-Vs0hm0vPahPMYi9tDjtP66llufgO3ST16WXaSTtDGEl9cewAl3AibmxWw6TINOqHPT9z0uABKAYjT9jNSg4npw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.3.0"
+				"@babel/types": "7.13.14"
 			}
 		},
-		"@types/color-name": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-			"dev": true
-		},
 		"@types/cookie": {
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.3.3.tgz",
@@ -1909,8 +2004,8 @@
 			"integrity": "sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==",
 			"dev": true,
 			"requires": {
-				"@types/minimatch": "*",
-				"@types/node": "*"
+				"@types/minimatch": "3.0.3",
+				"@types/node": "14.6.0"
 			}
 		},
 		"@types/istanbul-lib-coverage": {
@@ -1925,7 +2020,7 @@
 			"integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==",
 			"dev": true,
 			"requires": {
-				"@types/istanbul-lib-coverage": "*"
+				"@types/istanbul-lib-coverage": "2.0.3"
 			}
 		},
 		"@types/istanbul-reports": {
@@ -1934,14 +2029,14 @@
 			"integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==",
 			"dev": true,
 			"requires": {
-				"@types/istanbul-lib-coverage": "*",
-				"@types/istanbul-lib-report": "*"
+				"@types/istanbul-lib-coverage": "2.0.3",
+				"@types/istanbul-lib-report": "3.0.0"
 			}
 		},
 		"@types/json-schema": {
-			"version": "7.0.5",
-			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
-			"integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ==",
+			"version": "7.0.7",
+			"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz",
+			"integrity": "sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==",
 			"dev": true
 		},
 		"@types/minimatch": {
@@ -1992,18 +2087,18 @@
 			"dev": true
 		},
 		"@types/yargs": {
-			"version": "13.0.10",
-			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.10.tgz",
-			"integrity": "sha512-MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ==",
+			"version": "13.0.11",
+			"resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.11.tgz",
+			"integrity": "sha512-NRqD6T4gktUrDi1o1wLH3EKC1o2caCr7/wR87ODcbVITQF106OM3sFN92ysZ++wqelOd1CTzatnOBRDYYG6wGQ==",
 			"dev": true,
 			"requires": {
-				"@types/yargs-parser": "*"
+				"@types/yargs-parser": "20.2.0"
 			}
 		},
 		"@types/yargs-parser": {
-			"version": "15.0.0",
-			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz",
-			"integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
+			"version": "20.2.0",
+			"resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.0.tgz",
+			"integrity": "sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA==",
 			"dev": true
 		},
 		"@typescript-eslint/eslint-plugin": {
@@ -2013,9 +2108,9 @@
 			"dev": true,
 			"requires": {
 				"@typescript-eslint/experimental-utils": "2.34.0",
-				"functional-red-black-tree": "^1.0.1",
-				"regexpp": "^3.0.0",
-				"tsutils": "^3.17.1"
+				"functional-red-black-tree": "1.0.1",
+				"regexpp": "3.1.0",
+				"tsutils": "3.21.0"
 			}
 		},
 		"@typescript-eslint/experimental-utils": {
@@ -2024,10 +2119,10 @@
 			"integrity": "sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==",
 			"dev": true,
 			"requires": {
-				"@types/json-schema": "^7.0.3",
+				"@types/json-schema": "7.0.7",
 				"@typescript-eslint/typescript-estree": "2.34.0",
-				"eslint-scope": "^5.0.0",
-				"eslint-utils": "^2.0.0"
+				"eslint-scope": "5.1.1",
+				"eslint-utils": "2.1.0"
 			}
 		},
 		"@typescript-eslint/parser": {
@@ -2036,10 +2131,10 @@
 			"integrity": "sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==",
 			"dev": true,
 			"requires": {
-				"@types/eslint-visitor-keys": "^1.0.0",
+				"@types/eslint-visitor-keys": "1.0.0",
 				"@typescript-eslint/experimental-utils": "2.34.0",
 				"@typescript-eslint/typescript-estree": "2.34.0",
-				"eslint-visitor-keys": "^1.1.0"
+				"eslint-visitor-keys": "1.3.0"
 			}
 		},
 		"@typescript-eslint/typescript-estree": {
@@ -2048,28 +2143,46 @@
 			"integrity": "sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==",
 			"dev": true,
 			"requires": {
-				"debug": "^4.1.1",
-				"eslint-visitor-keys": "^1.1.0",
-				"glob": "^7.1.6",
-				"is-glob": "^4.0.1",
-				"lodash": "^4.17.15",
-				"semver": "^7.3.2",
-				"tsutils": "^3.17.1"
+				"debug": "4.3.1",
+				"eslint-visitor-keys": "1.3.0",
+				"glob": "7.1.6",
+				"is-glob": "4.0.1",
+				"lodash": "4.17.19",
+				"semver": "7.3.5",
+				"tsutils": "3.21.0"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
+					}
+				},
+				"lru-cache": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+					"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+					"dev": true,
+					"requires": {
+						"yallist": "4.0.0"
 					}
 				},
 				"semver": {
-					"version": "7.3.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-					"integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+					"version": "7.3.5",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+					"integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+					"dev": true,
+					"requires": {
+						"lru-cache": "6.0.0"
+					}
+				},
+				"yallist": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+					"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
 					"dev": true
 				}
 			}
@@ -2125,7 +2238,7 @@
 			"dev": true,
 			"requires": {
 				"@webassemblyjs/ast": "1.8.5",
-				"mamacro": "^0.0.3"
+				"mamacro": "0.0.3"
 			}
 		},
 		"@webassemblyjs/helper-wasm-bytecode": {
@@ -2152,7 +2265,7 @@
 			"integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
 			"dev": true,
 			"requires": {
-				"@xtuc/ieee754": "^1.2.0"
+				"@xtuc/ieee754": "1.2.0"
 			}
 		},
 		"@webassemblyjs/leb128": {
@@ -2262,6 +2375,12 @@
 			"integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
 			"dev": true
 		},
+		"abab": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz",
+			"integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==",
+			"dev": true
+		},
 		"abbrev": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -2274,14 +2393,38 @@
 			"integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
 			"dev": true,
 			"requires": {
-				"mime-types": "~2.1.24",
+				"mime-types": "2.1.27",
 				"negotiator": "0.6.2"
 			}
 		},
+		"acorn": {
+			"version": "7.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+			"integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+			"dev": true
+		},
+		"acorn-globals": {
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
+			"integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
+			"dev": true,
+			"requires": {
+				"acorn": "6.4.2",
+				"acorn-walk": "6.2.0"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "6.4.2",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+					"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
+					"dev": true
+				}
+			}
+		},
 		"acorn-jsx": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.2.0.tgz",
-			"integrity": "sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==",
+			"version": "5.3.1",
+			"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+			"integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
 			"dev": true
 		},
 		"acorn-walk": {
@@ -2295,7 +2438,7 @@
 			"resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
 			"integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
 			"requires": {
-				"object-assign": "4.x"
+				"object-assign": "4.1.1"
 			}
 		},
 		"add-px-to-style": {
@@ -2340,7 +2483,7 @@
 					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
 					"dev": true,
 					"requires": {
-						"minimist": "^1.2.0"
+						"minimist": "1.2.5"
 					}
 				},
 				"loader-utils": {
@@ -2349,9 +2492,9 @@
 					"integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
 					"dev": true,
 					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^2.0.0",
-						"json5": "^1.0.1"
+						"big.js": "5.2.2",
+						"emojis-list": "2.1.0",
+						"json5": "1.0.1"
 					}
 				}
 			}
@@ -2362,8 +2505,8 @@
 			"integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
 			"dev": true,
 			"requires": {
-				"clean-stack": "^2.0.0",
-				"indent-string": "^4.0.0"
+				"clean-stack": "2.2.0",
+				"indent-string": "4.0.0"
 			},
 			"dependencies": {
 				"indent-string": {
@@ -2379,15 +2522,15 @@
 			"resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
 			"integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
 			"requires": {
-				"array.prototype.find": "^2.1.1",
-				"function.prototype.name": "^1.1.2",
-				"is-regex": "^1.1.0",
-				"object-is": "^1.1.2",
-				"object.assign": "^4.1.0",
-				"object.entries": "^1.1.2",
-				"prop-types": "^15.7.2",
-				"prop-types-exact": "^1.2.0",
-				"react-is": "^16.13.1"
+				"array.prototype.find": "2.1.1",
+				"function.prototype.name": "1.1.2",
+				"is-regex": "1.1.0",
+				"object-is": "1.1.2",
+				"object.assign": "4.1.0",
+				"object.entries": "1.1.2",
+				"prop-types": "15.7.2",
+				"prop-types-exact": "1.2.0",
+				"react-is": "16.13.1"
 			}
 		},
 		"ajv": {
@@ -2396,10 +2539,10 @@
 			"integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
 			"dev": true,
 			"requires": {
-				"fast-deep-equal": "^3.1.1",
-				"fast-json-stable-stringify": "^2.0.0",
-				"json-schema-traverse": "^0.4.1",
-				"uri-js": "^4.2.2"
+				"fast-deep-equal": "3.1.3",
+				"fast-json-stable-stringify": "2.1.0",
+				"json-schema-traverse": "0.4.1",
+				"uri-js": "4.2.2"
 			}
 		},
 		"ajv-errors": {
@@ -2455,7 +2598,7 @@
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
 			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 			"requires": {
-				"color-convert": "^1.9.0"
+				"color-convert": "1.9.3"
 			}
 		},
 		"antd": {
@@ -2463,52 +2606,52 @@
 			"resolved": "https://registry.npmjs.org/antd/-/antd-4.6.2.tgz",
 			"integrity": "sha512-6hmSRiSV3Lzz/1fKGOLHld7gf0d+MW7fg7MNGCAAceGmxtG1WEaaOtV8dZeL2WXq0SGH4wY4GytN6chRrtatfw==",
 			"requires": {
-				"@ant-design/colors": "^4.0.5",
-				"@ant-design/css-animation": "^1.7.2",
-				"@ant-design/icons": "^4.2.1",
-				"@ant-design/react-slick": "~0.27.0",
-				"@babel/runtime": "^7.10.4",
-				"array-tree-filter": "^2.1.0",
-				"classnames": "^2.2.6",
-				"copy-to-clipboard": "^3.2.0",
-				"lodash": "^4.17.20",
-				"moment": "^2.25.3",
-				"omit.js": "^2.0.2",
-				"raf": "^3.4.1",
-				"rc-animate": "~3.1.0",
-				"rc-cascader": "~1.3.0",
-				"rc-checkbox": "~2.3.0",
-				"rc-collapse": "~2.0.0",
-				"rc-dialog": "~8.1.0",
-				"rc-drawer": "~4.1.0",
-				"rc-dropdown": "~3.1.2",
-				"rc-field-form": "~1.10.0",
-				"rc-image": "~3.0.2",
-				"rc-input-number": "~6.0.0",
-				"rc-mentions": "~1.4.0",
-				"rc-menu": "~8.5.2",
-				"rc-motion": "^1.0.0",
-				"rc-notification": "~4.4.0",
-				"rc-pagination": "~3.0.3",
-				"rc-picker": "~2.0.6",
-				"rc-progress": "~3.0.0",
-				"rc-rate": "~2.8.2",
-				"rc-resize-observer": "^0.2.3",
-				"rc-select": "~11.1.0",
-				"rc-slider": "~9.3.0",
-				"rc-steps": "~4.1.0",
-				"rc-switch": "~3.2.0",
-				"rc-table": "~7.9.2",
-				"rc-tabs": "~11.6.0",
-				"rc-textarea": "~0.3.0",
-				"rc-tooltip": "~4.2.0",
-				"rc-tree": "~3.9.0",
-				"rc-tree-select": "~4.1.1",
-				"rc-trigger": "~4.4.0",
-				"rc-upload": "~3.2.1",
-				"rc-util": "^5.1.0",
-				"scroll-into-view-if-needed": "^2.2.25",
-				"warning": "^4.0.3"
+				"@ant-design/colors": "4.0.5",
+				"@ant-design/css-animation": "1.7.3",
+				"@ant-design/icons": "4.2.2",
+				"@ant-design/react-slick": "0.27.10",
+				"@babel/runtime": "7.10.4",
+				"array-tree-filter": "2.1.0",
+				"classnames": "2.2.6",
+				"copy-to-clipboard": "3.3.1",
+				"lodash": "4.17.20",
+				"moment": "2.27.0",
+				"omit.js": "2.0.2",
+				"raf": "3.4.1",
+				"rc-animate": "3.1.0",
+				"rc-cascader": "1.3.0",
+				"rc-checkbox": "2.3.1",
+				"rc-collapse": "2.0.0",
+				"rc-dialog": "8.1.1",
+				"rc-drawer": "4.1.0",
+				"rc-dropdown": "3.1.2",
+				"rc-field-form": "1.10.1",
+				"rc-image": "3.0.4",
+				"rc-input-number": "6.0.0",
+				"rc-mentions": "1.4.2",
+				"rc-menu": "8.5.3",
+				"rc-motion": "1.1.2",
+				"rc-notification": "4.4.0",
+				"rc-pagination": "3.0.3",
+				"rc-picker": "2.0.9",
+				"rc-progress": "3.0.0",
+				"rc-rate": "2.8.2",
+				"rc-resize-observer": "0.2.5",
+				"rc-select": "11.1.7",
+				"rc-slider": "9.3.1",
+				"rc-steps": "4.1.2",
+				"rc-switch": "3.2.1",
+				"rc-table": "7.9.7",
+				"rc-tabs": "11.6.1",
+				"rc-textarea": "0.3.0",
+				"rc-tooltip": "4.2.2",
+				"rc-tree": "3.9.4",
+				"rc-tree-select": "4.1.2",
+				"rc-trigger": "4.4.2",
+				"rc-upload": "3.2.1",
+				"rc-util": "5.2.1",
+				"scroll-into-view-if-needed": "2.2.26",
+				"warning": "4.0.3"
 			},
 			"dependencies": {
 				"@ant-design/colors": {
@@ -2516,7 +2659,7 @@
 					"resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-4.0.5.tgz",
 					"integrity": "sha512-3mnuX2prnWOWvpFTS2WH2LoouWlOgtnIpc6IarWN6GOzzLF8dW/U8UctuvIPhoboETehZfJ61XP+CGakBEPJ3Q==",
 					"requires": {
-						"tinycolor2": "^1.4.1"
+						"tinycolor2": "1.4.1"
 					}
 				},
 				"lodash": {
@@ -2539,11 +2682,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-animate": {
@@ -2551,10 +2694,10 @@
 					"resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.0.tgz",
 					"integrity": "sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==",
 					"requires": {
-						"@ant-design/css-animation": "^1.7.2",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.0",
-						"rc-util": "^5.0.1"
+						"@ant-design/css-animation": "1.7.3",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-tooltip": {
@@ -2562,7 +2705,7 @@
 					"resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-4.2.2.tgz",
 					"integrity": "sha512-mAs+gAngUyHVA6HdFXsELoJOHgfjAACLLc8SGtnVhovJdyqs5ZGSL9p5i+ApNaVpwjswqShw7L4DRtMl7cXCQg==",
 					"requires": {
-						"rc-trigger": "^4.2.1"
+						"rc-trigger": "4.4.2"
 					}
 				},
 				"rc-trigger": {
@@ -2570,12 +2713,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -2583,8 +2726,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -2594,29 +2737,29 @@
 			"resolved": "https://registry.npmjs.org/antd-mobile/-/antd-mobile-2.2.3.tgz",
 			"integrity": "sha512-MiztdndUjyccaL1DcJsaixOYmo9T5bprqbXK/xLFjMmSPIPCm/O63kTbOXu3Q/R7eRUCMXli33W4zp3oZSle2Q==",
 			"requires": {
-				"array-tree-filter": "~2.1.0",
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.1",
-				"normalize.css": "^7.0.0",
-				"rc-checkbox": "~2.0.0",
-				"rc-collapse": "~1.9.1",
-				"rc-slider": "~8.2.0",
-				"rc-swipeout": "~2.0.0",
-				"rmc-calendar": "^1.0.0",
-				"rmc-cascader": "~5.0.0",
-				"rmc-date-picker": "^6.0.8",
-				"rmc-dialog": "^1.0.1",
-				"rmc-drawer": "^0.4.11",
-				"rmc-feedback": "^2.0.0",
-				"rmc-input-number": "^1.0.0",
-				"rmc-list-view": "^0.11.0",
-				"rmc-notification": "~1.0.0",
-				"rmc-nuka-carousel": "~3.0.0",
-				"rmc-picker": "~5.0.0",
-				"rmc-pull-to-refresh": "~1.0.1",
-				"rmc-steps": "~1.0.0",
-				"rmc-tabs": "~1.2.0",
-				"rmc-tooltip": "~1.0.0"
+				"array-tree-filter": "2.1.0",
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"normalize.css": "7.0.0",
+				"rc-checkbox": "2.0.3",
+				"rc-collapse": "1.9.3",
+				"rc-slider": "8.2.0",
+				"rc-swipeout": "2.0.11",
+				"rmc-calendar": "1.1.4",
+				"rmc-cascader": "5.0.3",
+				"rmc-date-picker": "6.0.10",
+				"rmc-dialog": "1.1.1",
+				"rmc-drawer": "0.4.11",
+				"rmc-feedback": "2.0.0",
+				"rmc-input-number": "1.0.5",
+				"rmc-list-view": "0.11.5",
+				"rmc-notification": "1.0.0",
+				"rmc-nuka-carousel": "3.0.1",
+				"rmc-picker": "5.0.10",
+				"rmc-pull-to-refresh": "1.0.13",
+				"rmc-steps": "1.0.1",
+				"rmc-tabs": "1.2.29",
+				"rmc-tooltip": "1.0.1"
 			},
 			"dependencies": {
 				"rc-checkbox": {
@@ -2624,10 +2767,10 @@
 					"resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.0.3.tgz",
 					"integrity": "sha1-Q2qdUIlI4iSYDwU16nOLSBd6jyU=",
 					"requires": {
-						"babel-runtime": "^6.23.0",
-						"classnames": "2.x",
-						"prop-types": "15.x",
-						"rc-util": "^4.0.4"
+						"babel-runtime": "6.26.0",
+						"classnames": "2.2.6",
+						"prop-types": "15.7.2",
+						"rc-util": "4.21.1"
 					}
 				},
 				"rc-collapse": {
@@ -2635,10 +2778,10 @@
 					"resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.9.3.tgz",
 					"integrity": "sha512-8cG+FzudmgFCC9zRGKXJZA36zoI9Dmyjp6UDi8N80sXUch0JOpsZDxgcFzw4HPpPpK/dARtTilEe9zyuspnW0w==",
 					"requires": {
-						"classnames": "2.x",
-						"css-animation": "1.x",
-						"prop-types": "^15.5.6",
-						"rc-animate": "2.x"
+						"classnames": "2.2.6",
+						"css-animation": "1.6.1",
+						"prop-types": "15.7.2",
+						"rc-animate": "2.11.1"
 					}
 				},
 				"rc-slider": {
@@ -2646,13 +2789,13 @@
 					"resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.2.0.tgz",
 					"integrity": "sha1-rjfRcUTK1g4dpurA7k/8/qCwpug=",
 					"requires": {
-						"babel-runtime": "6.x",
-						"classnames": "^2.2.5",
-						"prop-types": "^15.5.4",
-						"rc-tooltip": "^3.4.2",
-						"rc-util": "^4.0.4",
-						"shallowequal": "^1.0.1",
-						"warning": "^3.0.0"
+						"babel-runtime": "6.26.0",
+						"classnames": "2.2.6",
+						"prop-types": "15.7.2",
+						"rc-tooltip": "3.7.3",
+						"rc-util": "4.21.1",
+						"shallowequal": "1.1.0",
+						"warning": "3.0.0"
 					}
 				},
 				"warning": {
@@ -2660,7 +2803,7 @@
 					"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
 					"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
 					"requires": {
-						"loose-envify": "^1.0.0"
+						"loose-envify": "1.4.0"
 					}
 				}
 			}
@@ -2671,8 +2814,8 @@
 			"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
 			"dev": true,
 			"requires": {
-				"micromatch": "^3.1.4",
-				"normalize-path": "^2.1.1"
+				"micromatch": "3.1.10",
+				"normalize-path": "2.1.1"
 			},
 			"dependencies": {
 				"normalize-path": {
@@ -2681,7 +2824,7 @@
 					"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
 					"dev": true,
 					"requires": {
-						"remove-trailing-separator": "^1.0.1"
+						"remove-trailing-separator": "1.1.0"
 					}
 				}
 			}
@@ -2698,8 +2841,8 @@
 			"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 			"dev": true,
 			"requires": {
-				"delegates": "^1.0.0",
-				"readable-stream": "^2.0.6"
+				"delegates": "1.0.0",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -2708,13 +2851,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -2729,7 +2872,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -2740,7 +2883,7 @@
 			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
 			"requires": {
-				"sprintf-js": "~1.0.2"
+				"sprintf-js": "1.0.3"
 			}
 		},
 		"aria-query": {
@@ -2750,7 +2893,7 @@
 			"dev": true,
 			"requires": {
 				"ast-types-flow": "0.0.7",
-				"commander": "^2.11.0"
+				"commander": "2.20.3"
 			}
 		},
 		"arity-n": {
@@ -2790,22 +2933,115 @@
 			"dev": true
 		},
 		"array-flatten": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-			"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+			"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
 			"dev": true
 		},
 		"array-includes": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
-			"integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-			"dev": true,
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0",
-				"is-string": "^1.0.5"
+			"version": "3.1.3",
+			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.3.tgz",
+			"integrity": "sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==",
+			"dev": true,
+			"requires": {
+				"call-bind": "1.0.2",
+				"define-properties": "1.1.3",
+				"es-abstract": "1.18.0",
+				"get-intrinsic": "1.1.1",
+				"is-string": "1.0.5"
+			},
+			"dependencies": {
+				"es-abstract": {
+					"version": "1.18.0",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+					"integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"es-to-primitive": "1.2.1",
+						"function-bind": "1.1.1",
+						"get-intrinsic": "1.1.1",
+						"has": "1.0.3",
+						"has-symbols": "1.0.2",
+						"is-callable": "1.2.3",
+						"is-negative-zero": "2.0.1",
+						"is-regex": "1.1.2",
+						"is-string": "1.0.5",
+						"object-inspect": "1.9.0",
+						"object-keys": "1.1.1",
+						"object.assign": "4.1.2",
+						"string.prototype.trimend": "1.0.4",
+						"string.prototype.trimstart": "1.0.4",
+						"unbox-primitive": "1.0.1"
+					}
+				},
+				"has-symbols": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+					"dev": true
+				},
+				"is-callable": {
+					"version": "1.2.3",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"dev": true
+				},
+				"is-regex": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+					"integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"has-symbols": "1.0.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.9.0",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+					"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+					"dev": true
+				},
+				"object.assign": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+					"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3",
+						"has-symbols": "1.0.2",
+						"object-keys": "1.1.1"
+					}
+				},
+				"string.prototype.trimend": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+					"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				},
+				"string.prototype.trimstart": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+					"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				}
 			}
 		},
+		"array-move": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/array-move/-/array-move-3.0.1.tgz",
+			"integrity": "sha512-H3Of6NIn2nNU1gsVDqDnYKY/LCdWvCMMOWifNGhKcVQgiZ6nOek39aESOvro6zmueP07exSl93YLvkN4fZOkSg=="
+		},
 		"array-tree-filter": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
@@ -2817,7 +3053,7 @@
 			"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
 			"dev": true,
 			"requires": {
-				"array-uniq": "^1.0.1"
+				"array-uniq": "1.0.3"
 			}
 		},
 		"array-uniq": {
@@ -2837,8 +3073,8 @@
 			"resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.1.tgz",
 			"integrity": "sha512-mi+MYNJYLTx2eNYy+Yh6raoQacCsNeeMUaspFPh9Y141lFSsWxxB8V9mM2ye+eqiRs917J6/pJ4M9ZPzenWckA==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.4"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"array.prototype.flat": {
@@ -2846,8 +3082,8 @@
 			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
 			"integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"arrify": {
@@ -2867,7 +3103,7 @@
 			"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
 			"dev": true,
 			"requires": {
-				"safer-buffer": "~2.1.0"
+				"safer-buffer": "2.1.2"
 			}
 		},
 		"asn1.js": {
@@ -2876,16 +3112,16 @@
 			"integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"safer-buffer": "^2.1.0"
+				"bn.js": "4.12.0",
+				"inherits": "2.0.4",
+				"minimalistic-assert": "1.0.1",
+				"safer-buffer": "2.1.2"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
@@ -2929,7 +3165,7 @@
 			"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
 			"dev": true,
 			"requires": {
-				"lodash": "^4.17.14"
+				"lodash": "4.17.19"
 			}
 		},
 		"async-each": {
@@ -2973,13 +3209,13 @@
 			"integrity": "sha512-XrvP4VVHdRBCdX1S3WXVD8+RyG9qeb1D5Sn1DeLiG2xfSpzellk5k54xbUERJ3M5DggQxes39UGOTP8CFrEGbg==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.12.0",
-				"caniuse-lite": "^1.0.30001109",
-				"colorette": "^1.2.1",
-				"normalize-range": "^0.1.2",
-				"num2fraction": "^1.2.2",
-				"postcss": "^7.0.32",
-				"postcss-value-parser": "^4.1.0"
+				"browserslist": "4.16.3",
+				"caniuse-lite": "1.0.30001207",
+				"colorette": "1.2.2",
+				"normalize-range": "0.1.2",
+				"num2fraction": "1.2.2",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "4.1.0"
 			},
 			"dependencies": {
 				"postcss-value-parser": {
@@ -3012,7 +3248,7 @@
 			"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
 			"integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
 			"requires": {
-				"follow-redirects": "^1.10.0"
+				"follow-redirects": "1.12.1"
 			}
 		},
 		"axobject-query": {
@@ -3027,9 +3263,9 @@
 			"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
 			"dev": true,
 			"requires": {
-				"chalk": "^1.1.3",
-				"esutils": "^2.0.2",
-				"js-tokens": "^3.0.2"
+				"chalk": "1.1.3",
+				"esutils": "2.0.3",
+				"js-tokens": "3.0.2"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -3044,11 +3280,11 @@
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
 					}
 				},
 				"js-tokens": {
@@ -3071,12 +3307,12 @@
 			"integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@babel/parser": "^7.7.0",
-				"@babel/traverse": "^7.7.0",
-				"@babel/types": "^7.7.0",
-				"eslint-visitor-keys": "^1.0.0",
-				"resolve": "^1.12.0"
+				"@babel/code-frame": "7.10.4",
+				"@babel/parser": "7.13.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14",
+				"eslint-visitor-keys": "1.3.0",
+				"resolve": "1.17.0"
 			}
 		},
 		"babel-extract-comments": {
@@ -3085,7 +3321,7 @@
 			"integrity": "sha512-qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ==",
 			"dev": true,
 			"requires": {
-				"babylon": "^6.18.0"
+				"babylon": "6.18.0"
 			}
 		},
 		"babel-jest": {
@@ -3094,13 +3330,13 @@
 			"integrity": "sha512-ntuddfyiN+EhMw58PTNL1ph4C9rECiQXjI4nMMBKBaNjXvqLdkXpPRcMSr4iyBrJg/+wz9brFUD6RhOAT6r4Iw==",
 			"dev": true,
 			"requires": {
-				"@jest/transform": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"@types/babel__core": "^7.1.0",
-				"babel-plugin-istanbul": "^5.1.0",
-				"babel-preset-jest": "^24.9.0",
-				"chalk": "^2.4.2",
-				"slash": "^2.0.0"
+				"@jest/transform": "24.9.0",
+				"@jest/types": "24.9.0",
+				"@types/babel__core": "7.1.14",
+				"babel-plugin-istanbul": "5.2.0",
+				"babel-preset-jest": "24.9.0",
+				"chalk": "2.4.2",
+				"slash": "2.0.0"
 			}
 		},
 		"babel-loader": {
@@ -3109,11 +3345,11 @@
 			"integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
 			"dev": true,
 			"requires": {
-				"find-cache-dir": "^2.1.0",
-				"loader-utils": "^1.4.0",
-				"mkdirp": "^0.5.3",
-				"pify": "^4.0.1",
-				"schema-utils": "^2.6.5"
+				"find-cache-dir": "2.1.0",
+				"loader-utils": "1.4.0",
+				"mkdirp": "0.5.5",
+				"pify": "4.0.1",
+				"schema-utils": "2.7.1"
 			},
 			"dependencies": {
 				"pify": {
@@ -3130,7 +3366,7 @@
 			"integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
 			"dev": true,
 			"requires": {
-				"object.assign": "^4.1.0"
+				"object.assign": "4.1.0"
 			}
 		},
 		"babel-plugin-istanbul": {
@@ -3139,10 +3375,10 @@
 			"integrity": "sha512-5LphC0USA8t4i1zCtjbbNb6jJj/9+X6P37Qfirc/70EQ34xKlMW+a1RHGwxGI+SwWpNwZ27HqvzAobeqaXwiZw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-plugin-utils": "^7.0.0",
-				"find-up": "^3.0.0",
-				"istanbul-lib-instrument": "^3.3.0",
-				"test-exclude": "^5.2.3"
+				"@babel/helper-plugin-utils": "7.13.0",
+				"find-up": "3.0.0",
+				"istanbul-lib-instrument": "3.3.0",
+				"test-exclude": "5.2.3"
 			}
 		},
 		"babel-plugin-jest-hoist": {
@@ -3151,7 +3387,7 @@
 			"integrity": "sha512-2EMA2P8Vp7lG0RAzr4HXqtYwacfMErOuv1U3wrvxHX6rD1sV6xS3WXG3r8TRQ2r6w8OhvSdWt+z41hQNwNm3Xw==",
 			"dev": true,
 			"requires": {
-				"@types/babel__traverse": "^7.0.6"
+				"@types/babel__traverse": "7.11.1"
 			}
 		},
 		"babel-plugin-macros": {
@@ -3160,9 +3396,9 @@
 			"integrity": "sha512-SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.7.2",
-				"cosmiconfig": "^6.0.0",
-				"resolve": "^1.12.0"
+				"@babel/runtime": "7.10.4",
+				"cosmiconfig": "6.0.0",
+				"resolve": "1.17.0"
 			},
 			"dependencies": {
 				"cosmiconfig": {
@@ -3171,33 +3407,33 @@
 					"integrity": "sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
 					"dev": true,
 					"requires": {
-						"@types/parse-json": "^4.0.0",
-						"import-fresh": "^3.1.0",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0",
-						"yaml": "^1.7.2"
+						"@types/parse-json": "4.0.0",
+						"import-fresh": "3.3.0",
+						"parse-json": "5.2.0",
+						"path-type": "4.0.0",
+						"yaml": "1.10.0"
 					}
 				},
 				"import-fresh": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-					"integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+					"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
 					"dev": true,
 					"requires": {
-						"parent-module": "^1.0.0",
-						"resolve-from": "^4.0.0"
+						"parent-module": "1.0.1",
+						"resolve-from": "4.0.0"
 					}
 				},
 				"parse-json": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.1.tgz",
-					"integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+					"integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
 					"dev": true,
 					"requires": {
-						"@babel/code-frame": "^7.0.0",
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1",
-						"lines-and-columns": "^1.1.6"
+						"@babel/code-frame": "7.10.4",
+						"error-ex": "1.3.2",
+						"json-parse-even-better-errors": "2.3.1",
+						"lines-and-columns": "1.1.6"
 					}
 				},
 				"path-type": {
@@ -3215,11 +3451,49 @@
 			}
 		},
 		"babel-plugin-named-asset-import": {
-			"version": "0.3.6",
-			"resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz",
-			"integrity": "sha512-1aGDUfL1qOOIoqk9QKGIo2lANk+C7ko/fqH0uIyC71x3PEGz0uVP8ISgfEsFuG+FKmjHTvFK/nNM8dowpmUxLA==",
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz",
+			"integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==",
 			"dev": true
 		},
+		"babel-plugin-polyfill-corejs2": {
+			"version": "0.1.10",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz",
+			"integrity": "sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA==",
+			"dev": true,
+			"requires": {
+				"@babel/compat-data": "7.13.12",
+				"@babel/helper-define-polyfill-provider": "0.1.5",
+				"semver": "6.3.0"
+			},
+			"dependencies": {
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				}
+			}
+		},
+		"babel-plugin-polyfill-corejs3": {
+			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz",
+			"integrity": "sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-define-polyfill-provider": "0.1.5",
+				"core-js-compat": "3.10.0"
+			}
+		},
+		"babel-plugin-polyfill-regenerator": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz",
+			"integrity": "sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-define-polyfill-provider": "0.1.5"
+			}
+		},
 		"babel-plugin-syntax-object-rest-spread": {
 			"version": "6.13.0",
 			"resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz",
@@ -3232,8 +3506,8 @@
 			"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
 			"dev": true,
 			"requires": {
-				"babel-plugin-syntax-object-rest-spread": "^6.8.0",
-				"babel-runtime": "^6.26.0"
+				"babel-plugin-syntax-object-rest-spread": "6.13.0",
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"babel-plugin-transform-react-remove-prop-types": {
@@ -3242,31 +3516,14 @@
 			"integrity": "sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==",
 			"dev": true
 		},
-		"babel-polyfill": {
-			"version": "6.26.0",
-			"resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
-			"integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
-			"requires": {
-				"babel-runtime": "^6.26.0",
-				"core-js": "^2.5.0",
-				"regenerator-runtime": "^0.10.5"
-			},
-			"dependencies": {
-				"regenerator-runtime": {
-					"version": "0.10.5",
-					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
-					"integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
-				}
-			}
-		},
 		"babel-preset-jest": {
 			"version": "24.9.0",
 			"resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-24.9.0.tgz",
 			"integrity": "sha512-izTUuhE4TMfTRPF92fFwD2QfdXaZW08qvWTFCI51V8rW5x00UuPgc3ajRoWofXOuxjfcOM5zzSYsQS3H8KGCAg==",
 			"dev": true,
 			"requires": {
-				"@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-				"babel-plugin-jest-hoist": "^24.9.0"
+				"@babel/plugin-syntax-object-rest-spread": "7.8.3",
+				"babel-plugin-jest-hoist": "24.9.0"
 			}
 		},
 		"babel-preset-react-app": {
@@ -3298,8 +3555,8 @@
 					"integrity": "sha512-EqFhbo7IosdgPgZggHaNObkmO1kNUe3slaKu54d5OWvy+p9QIKOzK1GAEpAIsZtWVtPXUHSMcT4smvDrCfY4AA==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-create-class-features-plugin": "^7.8.3",
-						"@babel/helper-plugin-utils": "^7.8.3"
+						"@babel/helper-create-class-features-plugin": "7.13.11",
+						"@babel/helper-plugin-utils": "7.13.0"
 					}
 				},
 				"@babel/plugin-proposal-nullish-coalescing-operator": {
@@ -3308,8 +3565,8 @@
 					"integrity": "sha512-TS9MlfzXpXKt6YYomudb/KU7nQI6/xnapG6in1uZxoxDghuSMZsPb6D2fyUwNYSAp4l1iR7QtFOjkqcRYcUsfw==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-plugin-utils": "^7.8.3",
-						"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
+						"@babel/helper-plugin-utils": "7.13.0",
+						"@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3"
 					}
 				},
 				"@babel/plugin-proposal-numeric-separator": {
@@ -3318,8 +3575,8 @@
 					"integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-plugin-utils": "^7.8.3",
-						"@babel/plugin-syntax-numeric-separator": "^7.8.3"
+						"@babel/helper-plugin-utils": "7.13.0",
+						"@babel/plugin-syntax-numeric-separator": "7.10.4"
 					}
 				},
 				"@babel/plugin-proposal-optional-chaining": {
@@ -3328,8 +3585,8 @@
 					"integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-plugin-utils": "^7.8.3",
-						"@babel/plugin-syntax-optional-chaining": "^7.8.0"
+						"@babel/helper-plugin-utils": "7.13.0",
+						"@babel/plugin-syntax-optional-chaining": "7.8.3"
 					}
 				},
 				"@babel/plugin-transform-react-display-name": {
@@ -3338,7 +3595,7 @@
 					"integrity": "sha512-3Jy/PCw8Fe6uBKtEgz3M82ljt+lTg+xJaM4og+eyu83qLT87ZUSckn0wy7r31jflURWLO83TW6Ylf7lyXj3m5A==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-plugin-utils": "^7.8.3"
+						"@babel/helper-plugin-utils": "7.13.0"
 					}
 				},
 				"@babel/preset-env": {
@@ -3347,66 +3604,66 @@
 					"integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==",
 					"dev": true,
 					"requires": {
-						"@babel/compat-data": "^7.9.0",
-						"@babel/helper-compilation-targets": "^7.8.7",
-						"@babel/helper-module-imports": "^7.8.3",
-						"@babel/helper-plugin-utils": "^7.8.3",
-						"@babel/plugin-proposal-async-generator-functions": "^7.8.3",
-						"@babel/plugin-proposal-dynamic-import": "^7.8.3",
-						"@babel/plugin-proposal-json-strings": "^7.8.3",
-						"@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-						"@babel/plugin-proposal-numeric-separator": "^7.8.3",
-						"@babel/plugin-proposal-object-rest-spread": "^7.9.0",
-						"@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-						"@babel/plugin-proposal-optional-chaining": "^7.9.0",
-						"@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
-						"@babel/plugin-syntax-async-generators": "^7.8.0",
-						"@babel/plugin-syntax-dynamic-import": "^7.8.0",
-						"@babel/plugin-syntax-json-strings": "^7.8.0",
-						"@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
-						"@babel/plugin-syntax-numeric-separator": "^7.8.0",
-						"@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-						"@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
-						"@babel/plugin-syntax-optional-chaining": "^7.8.0",
-						"@babel/plugin-syntax-top-level-await": "^7.8.3",
-						"@babel/plugin-transform-arrow-functions": "^7.8.3",
-						"@babel/plugin-transform-async-to-generator": "^7.8.3",
-						"@babel/plugin-transform-block-scoped-functions": "^7.8.3",
-						"@babel/plugin-transform-block-scoping": "^7.8.3",
-						"@babel/plugin-transform-classes": "^7.9.0",
-						"@babel/plugin-transform-computed-properties": "^7.8.3",
-						"@babel/plugin-transform-destructuring": "^7.8.3",
-						"@babel/plugin-transform-dotall-regex": "^7.8.3",
-						"@babel/plugin-transform-duplicate-keys": "^7.8.3",
-						"@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-						"@babel/plugin-transform-for-of": "^7.9.0",
-						"@babel/plugin-transform-function-name": "^7.8.3",
-						"@babel/plugin-transform-literals": "^7.8.3",
-						"@babel/plugin-transform-member-expression-literals": "^7.8.3",
-						"@babel/plugin-transform-modules-amd": "^7.9.0",
-						"@babel/plugin-transform-modules-commonjs": "^7.9.0",
-						"@babel/plugin-transform-modules-systemjs": "^7.9.0",
-						"@babel/plugin-transform-modules-umd": "^7.9.0",
-						"@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
-						"@babel/plugin-transform-new-target": "^7.8.3",
-						"@babel/plugin-transform-object-super": "^7.8.3",
-						"@babel/plugin-transform-parameters": "^7.8.7",
-						"@babel/plugin-transform-property-literals": "^7.8.3",
-						"@babel/plugin-transform-regenerator": "^7.8.7",
-						"@babel/plugin-transform-reserved-words": "^7.8.3",
-						"@babel/plugin-transform-shorthand-properties": "^7.8.3",
-						"@babel/plugin-transform-spread": "^7.8.3",
-						"@babel/plugin-transform-sticky-regex": "^7.8.3",
-						"@babel/plugin-transform-template-literals": "^7.8.3",
-						"@babel/plugin-transform-typeof-symbol": "^7.8.4",
-						"@babel/plugin-transform-unicode-regex": "^7.8.3",
-						"@babel/preset-modules": "^0.1.3",
-						"@babel/types": "^7.9.0",
-						"browserslist": "^4.9.1",
-						"core-js-compat": "^3.6.2",
-						"invariant": "^2.2.2",
-						"levenary": "^1.1.1",
-						"semver": "^5.5.0"
+						"@babel/compat-data": "7.13.12",
+						"@babel/helper-compilation-targets": "7.13.13",
+						"@babel/helper-module-imports": "7.13.12",
+						"@babel/helper-plugin-utils": "7.13.0",
+						"@babel/plugin-proposal-async-generator-functions": "7.13.8",
+						"@babel/plugin-proposal-dynamic-import": "7.13.8",
+						"@babel/plugin-proposal-json-strings": "7.13.8",
+						"@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3",
+						"@babel/plugin-proposal-numeric-separator": "7.8.3",
+						"@babel/plugin-proposal-object-rest-spread": "7.13.8",
+						"@babel/plugin-proposal-optional-catch-binding": "7.13.8",
+						"@babel/plugin-proposal-optional-chaining": "7.9.0",
+						"@babel/plugin-proposal-unicode-property-regex": "7.12.13",
+						"@babel/plugin-syntax-async-generators": "7.8.4",
+						"@babel/plugin-syntax-dynamic-import": "7.8.3",
+						"@babel/plugin-syntax-json-strings": "7.8.3",
+						"@babel/plugin-syntax-nullish-coalescing-operator": "7.8.3",
+						"@babel/plugin-syntax-numeric-separator": "7.10.4",
+						"@babel/plugin-syntax-object-rest-spread": "7.8.3",
+						"@babel/plugin-syntax-optional-catch-binding": "7.8.3",
+						"@babel/plugin-syntax-optional-chaining": "7.8.3",
+						"@babel/plugin-syntax-top-level-await": "7.12.13",
+						"@babel/plugin-transform-arrow-functions": "7.13.0",
+						"@babel/plugin-transform-async-to-generator": "7.13.0",
+						"@babel/plugin-transform-block-scoped-functions": "7.12.13",
+						"@babel/plugin-transform-block-scoping": "7.12.13",
+						"@babel/plugin-transform-classes": "7.13.0",
+						"@babel/plugin-transform-computed-properties": "7.13.0",
+						"@babel/plugin-transform-destructuring": "7.13.0",
+						"@babel/plugin-transform-dotall-regex": "7.12.13",
+						"@babel/plugin-transform-duplicate-keys": "7.12.13",
+						"@babel/plugin-transform-exponentiation-operator": "7.12.13",
+						"@babel/plugin-transform-for-of": "7.13.0",
+						"@babel/plugin-transform-function-name": "7.12.13",
+						"@babel/plugin-transform-literals": "7.12.13",
+						"@babel/plugin-transform-member-expression-literals": "7.12.13",
+						"@babel/plugin-transform-modules-amd": "7.13.0",
+						"@babel/plugin-transform-modules-commonjs": "7.13.8",
+						"@babel/plugin-transform-modules-systemjs": "7.13.8",
+						"@babel/plugin-transform-modules-umd": "7.13.0",
+						"@babel/plugin-transform-named-capturing-groups-regex": "7.12.13",
+						"@babel/plugin-transform-new-target": "7.12.13",
+						"@babel/plugin-transform-object-super": "7.12.13",
+						"@babel/plugin-transform-parameters": "7.13.0",
+						"@babel/plugin-transform-property-literals": "7.12.13",
+						"@babel/plugin-transform-regenerator": "7.12.13",
+						"@babel/plugin-transform-reserved-words": "7.12.13",
+						"@babel/plugin-transform-shorthand-properties": "7.12.13",
+						"@babel/plugin-transform-spread": "7.13.0",
+						"@babel/plugin-transform-sticky-regex": "7.12.13",
+						"@babel/plugin-transform-template-literals": "7.13.0",
+						"@babel/plugin-transform-typeof-symbol": "7.12.13",
+						"@babel/plugin-transform-unicode-regex": "7.12.13",
+						"@babel/preset-modules": "0.1.4",
+						"@babel/types": "7.13.14",
+						"browserslist": "4.16.3",
+						"core-js-compat": "3.10.0",
+						"invariant": "2.2.4",
+						"levenary": "1.1.1",
+						"semver": "5.7.1"
 					}
 				},
 				"@babel/preset-react": {
@@ -3415,12 +3672,12 @@
 					"integrity": "sha512-aJBYF23MPj0RNdp/4bHnAP0NVqqZRr9kl0NAOP4nJCex6OYVio59+dnQzsAWFuogdLyeaKA1hmfUIVZkY5J+TQ==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-plugin-utils": "^7.8.3",
-						"@babel/plugin-transform-react-display-name": "^7.8.3",
-						"@babel/plugin-transform-react-jsx": "^7.9.1",
-						"@babel/plugin-transform-react-jsx-development": "^7.9.0",
-						"@babel/plugin-transform-react-jsx-self": "^7.9.0",
-						"@babel/plugin-transform-react-jsx-source": "^7.9.0"
+						"@babel/helper-plugin-utils": "7.13.0",
+						"@babel/plugin-transform-react-display-name": "7.8.3",
+						"@babel/plugin-transform-react-jsx": "7.13.12",
+						"@babel/plugin-transform-react-jsx-development": "7.12.17",
+						"@babel/plugin-transform-react-jsx-self": "7.12.13",
+						"@babel/plugin-transform-react-jsx-source": "7.12.13"
 					}
 				},
 				"@babel/runtime": {
@@ -3429,7 +3686,7 @@
 					"integrity": "sha512-cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==",
 					"dev": true,
 					"requires": {
-						"regenerator-runtime": "^0.13.4"
+						"regenerator-runtime": "0.13.7"
 					}
 				},
 				"regenerator-runtime": {
@@ -3445,8 +3702,20 @@
 			"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
 			"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
 			"requires": {
-				"core-js": "^2.4.0",
-				"regenerator-runtime": "^0.11.0"
+				"core-js": "2.6.12",
+				"regenerator-runtime": "0.11.1"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "2.6.12",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+					"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+				},
+				"regenerator-runtime": {
+					"version": "0.11.1",
+					"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+					"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+				}
 			}
 		},
 		"babylon": {
@@ -3466,13 +3735,13 @@
 			"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
 			"dev": true,
 			"requires": {
-				"cache-base": "^1.0.1",
-				"class-utils": "^0.3.5",
-				"component-emitter": "^1.2.1",
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.1",
-				"mixin-deep": "^1.2.0",
-				"pascalcase": "^0.1.1"
+				"cache-base": "1.0.1",
+				"class-utils": "0.3.6",
+				"component-emitter": "1.3.0",
+				"define-property": "1.0.0",
+				"isobject": "3.0.1",
+				"mixin-deep": "1.3.2",
+				"pascalcase": "0.1.1"
 			},
 			"dependencies": {
 				"define-property": {
@@ -3481,7 +3750,7 @@
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^1.0.0"
+						"is-descriptor": "1.0.2"
 					}
 				},
 				"is-accessor-descriptor": {
@@ -3490,7 +3759,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-data-descriptor": {
@@ -3499,7 +3768,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-descriptor": {
@@ -3508,9 +3777,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-accessor-descriptor": "1.0.0",
+						"is-data-descriptor": "1.0.0",
+						"kind-of": "6.0.3"
 					}
 				}
 			}
@@ -3520,7 +3789,7 @@
 			"resolved": "https://registry.npmjs.org/base-x/-/base-x-3.0.8.tgz",
 			"integrity": "sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA==",
 			"requires": {
-				"safe-buffer": "^5.0.1"
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"base64-js": {
@@ -3539,8 +3808,8 @@
 			"resolved": "https://registry.npmjs.org/bchaddrjs/-/bchaddrjs-0.3.2.tgz",
 			"integrity": "sha512-jpoq2GX6PphcCpuvvrQG4oQmEzn4nGQSm5dT208W72r9GDdbmNPi0hG9TY/dFF3r9sNtdl0qKwNsh8dNL3Q62g==",
 			"requires": {
-				"bs58check": "^2.1.2",
-				"cashaddrjs": "^0.3.3"
+				"bs58check": "2.1.2",
+				"cashaddrjs": "0.3.12"
 			}
 		},
 		"bcrypt-pbkdf": {
@@ -3549,7 +3818,7 @@
 			"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
 			"dev": true,
 			"requires": {
-				"tweetnacl": "^0.14.3"
+				"tweetnacl": "0.14.5"
 			}
 		},
 		"big-integer": {
@@ -3564,28 +3833,18 @@
 			"dev": true
 		},
 		"binary-extensions": {
-			"version": "1.13.1",
-			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-			"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+			"integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
 			"dev": true
 		},
-		"bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"file-uri-to-path": "1.0.0"
-			}
-		},
 		"block-stream": {
 			"version": "0.0.9",
 			"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
 			"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
 			"dev": true,
 			"requires": {
-				"inherits": "~2.0.0"
+				"inherits": "2.0.4"
 			}
 		},
 		"bluebird": {
@@ -3594,9 +3853,9 @@
 			"integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w=="
 		},
 		"bn.js": {
-			"version": "5.1.3",
-			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz",
-			"integrity": "sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==",
+			"version": "5.2.0",
+			"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+			"integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
 			"dev": true
 		},
 		"body-parser": {
@@ -3606,17 +3865,23 @@
 			"dev": true,
 			"requires": {
 				"bytes": "3.1.0",
-				"content-type": "~1.0.4",
+				"content-type": "1.0.4",
 				"debug": "2.6.9",
-				"depd": "~1.1.2",
+				"depd": "1.1.2",
 				"http-errors": "1.7.2",
 				"iconv-lite": "0.4.24",
-				"on-finished": "~2.3.0",
+				"on-finished": "2.3.0",
 				"qs": "6.7.0",
 				"raw-body": "2.4.0",
-				"type-is": "~1.6.17"
+				"type-is": "1.6.18"
 			},
 			"dependencies": {
+				"bytes": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+					"integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+					"dev": true
+				},
 				"debug": {
 					"version": "2.6.9",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -3646,20 +3911,12 @@
 			"integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
 			"dev": true,
 			"requires": {
-				"array-flatten": "^2.1.0",
-				"deep-equal": "^1.0.1",
-				"dns-equal": "^1.0.0",
-				"dns-txt": "^2.0.2",
-				"multicast-dns": "^6.0.1",
-				"multicast-dns-service-types": "^1.1.0"
-			},
-			"dependencies": {
-				"array-flatten": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
-					"integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
-					"dev": true
-				}
+				"array-flatten": "2.1.2",
+				"deep-equal": "1.1.1",
+				"dns-equal": "1.0.0",
+				"dns-txt": "2.0.2",
+				"multicast-dns": "6.2.3",
+				"multicast-dns-service-types": "1.1.0"
 			}
 		},
 		"boolbase": {
@@ -3673,7 +3930,7 @@
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 			"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 			"requires": {
-				"balanced-match": "^1.0.0",
+				"balanced-match": "1.0.0",
 				"concat-map": "0.0.1"
 			}
 		},
@@ -3683,16 +3940,16 @@
 			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
 			"dev": true,
 			"requires": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
+				"arr-flatten": "1.1.0",
+				"array-unique": "0.3.2",
+				"extend-shallow": "2.0.1",
+				"fill-range": "4.0.0",
+				"isobject": "3.0.1",
+				"repeat-element": "1.1.3",
+				"snapdragon": "0.8.2",
+				"snapdragon-node": "2.1.1",
+				"split-string": "3.1.0",
+				"to-regex": "3.0.2"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -3701,7 +3958,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"is-extendable": "0.1.1"
 					}
 				}
 			}
@@ -3746,12 +4003,12 @@
 			"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 			"dev": true,
 			"requires": {
-				"buffer-xor": "^1.0.3",
-				"cipher-base": "^1.0.0",
-				"create-hash": "^1.1.0",
-				"evp_bytestokey": "^1.0.3",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+				"buffer-xor": "1.0.3",
+				"cipher-base": "1.0.4",
+				"create-hash": "1.2.0",
+				"evp_bytestokey": "1.0.3",
+				"inherits": "2.0.4",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"browserify-bignum": {
@@ -3765,9 +4022,9 @@
 			"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 			"dev": true,
 			"requires": {
-				"browserify-aes": "^1.0.4",
-				"browserify-des": "^1.0.0",
-				"evp_bytestokey": "^1.0.0"
+				"browserify-aes": "1.2.0",
+				"browserify-des": "1.0.2",
+				"evp_bytestokey": "1.0.3"
 			}
 		},
 		"browserify-des": {
@@ -3776,28 +4033,20 @@
 			"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 			"dev": true,
 			"requires": {
-				"cipher-base": "^1.0.1",
-				"des.js": "^1.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
+				"cipher-base": "1.0.4",
+				"des.js": "1.0.1",
+				"inherits": "2.0.4",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"browserify-rsa": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-			"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+			"integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.1.0",
-				"randombytes": "^2.0.1"
-			},
-			"dependencies": {
-				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
-					"dev": true
-				}
+				"bn.js": "5.2.0",
+				"randombytes": "2.1.0"
 			}
 		},
 		"browserify-sign": {
@@ -3806,15 +4055,15 @@
 			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
-				"create-hash": "^1.2.0",
-				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
-				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"bn.js": "5.2.0",
+				"browserify-rsa": "4.1.0",
+				"create-hash": "1.2.0",
+				"create-hmac": "1.1.7",
+				"elliptic": "6.5.4",
+				"inherits": "2.0.4",
+				"parse-asn1": "5.1.6",
+				"readable-stream": "3.6.0",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"browserify-zlib": {
@@ -3823,19 +4072,20 @@
 			"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 			"dev": true,
 			"requires": {
-				"pako": "~1.0.5"
+				"pako": "1.0.11"
 			}
 		},
 		"browserslist": {
-			"version": "4.14.0",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz",
-			"integrity": "sha512-pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ==",
+			"version": "4.16.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+			"integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
 			"dev": true,
 			"requires": {
-				"caniuse-lite": "^1.0.30001111",
-				"electron-to-chromium": "^1.3.523",
-				"escalade": "^3.0.2",
-				"node-releases": "^1.1.60"
+				"caniuse-lite": "1.0.30001207",
+				"colorette": "1.2.2",
+				"electron-to-chromium": "1.3.708",
+				"escalade": "3.1.1",
+				"node-releases": "1.1.71"
 			}
 		},
 		"bs58": {
@@ -3843,7 +4093,7 @@
 			"resolved": "https://registry.npmjs.org/bs58/-/bs58-4.0.1.tgz",
 			"integrity": "sha1-vhYedsNU9veIrkBx9j806MTwpCo=",
 			"requires": {
-				"base-x": "^3.0.2"
+				"base-x": "3.0.8"
 			}
 		},
 		"bs58check": {
@@ -3851,9 +4101,9 @@
 			"resolved": "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz",
 			"integrity": "sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA==",
 			"requires": {
-				"bs58": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"safe-buffer": "^5.1.2"
+				"bs58": "4.0.1",
+				"create-hash": "1.2.0",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"bser": {
@@ -3862,7 +4112,7 @@
 			"integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
 			"dev": true,
 			"requires": {
-				"node-int64": "^0.4.0"
+				"node-int64": "0.4.0"
 			}
 		},
 		"buffer": {
@@ -3870,8 +4120,8 @@
 			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz",
 			"integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==",
 			"requires": {
-				"base64-js": "^1.0.2",
-				"ieee754": "^1.1.4"
+				"base64-js": "1.3.1",
+				"ieee754": "1.1.13"
 			}
 		},
 		"buffer-from": {
@@ -3903,9 +4153,9 @@
 			"integrity": "sha512-d7TeT8m2HuymDjSEmMppWe/h5SSPPUZkaWKrAofx6gNXDdZ3FL/81oOTGPG+LIaZbNr9m4rtUi98Yw0Q1vHIIw=="
 		},
 		"bytes": {
-			"version": "3.1.0",
-			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-			"integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+			"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
 			"dev": true
 		},
 		"cacache": {
@@ -3914,24 +4164,24 @@
 			"integrity": "sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==",
 			"dev": true,
 			"requires": {
-				"chownr": "^1.1.2",
-				"figgy-pudding": "^3.5.1",
-				"fs-minipass": "^2.0.0",
-				"glob": "^7.1.4",
-				"graceful-fs": "^4.2.2",
-				"infer-owner": "^1.0.4",
-				"lru-cache": "^5.1.1",
-				"minipass": "^3.0.0",
-				"minipass-collect": "^1.0.2",
-				"minipass-flush": "^1.0.5",
-				"minipass-pipeline": "^1.2.2",
-				"mkdirp": "^0.5.1",
-				"move-concurrently": "^1.0.1",
-				"p-map": "^3.0.0",
-				"promise-inflight": "^1.0.1",
-				"rimraf": "^2.7.1",
-				"ssri": "^7.0.0",
-				"unique-filename": "^1.1.1"
+				"chownr": "1.1.4",
+				"figgy-pudding": "3.5.2",
+				"fs-minipass": "2.1.0",
+				"glob": "7.1.6",
+				"graceful-fs": "4.2.4",
+				"infer-owner": "1.0.4",
+				"lru-cache": "5.1.1",
+				"minipass": "3.1.3",
+				"minipass-collect": "1.0.2",
+				"minipass-flush": "1.0.5",
+				"minipass-pipeline": "1.2.4",
+				"mkdirp": "0.5.5",
+				"move-concurrently": "1.0.1",
+				"p-map": "3.0.0",
+				"promise-inflight": "1.0.1",
+				"rimraf": "2.7.1",
+				"ssri": "7.1.0",
+				"unique-filename": "1.1.1"
 			},
 			"dependencies": {
 				"lru-cache": {
@@ -3940,7 +4190,7 @@
 					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"yallist": "^3.0.2"
+						"yallist": "3.1.1"
 					}
 				},
 				"p-map": {
@@ -3949,7 +4199,7 @@
 					"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
 					"dev": true,
 					"requires": {
-						"aggregate-error": "^3.0.0"
+						"aggregate-error": "3.0.1"
 					}
 				},
 				"rimraf": {
@@ -3958,7 +4208,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				},
 				"yallist": {
@@ -3975,15 +4225,25 @@
 			"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
 			"dev": true,
 			"requires": {
-				"collection-visit": "^1.0.0",
-				"component-emitter": "^1.2.1",
-				"get-value": "^2.0.6",
-				"has-value": "^1.0.0",
-				"isobject": "^3.0.1",
-				"set-value": "^2.0.0",
-				"to-object-path": "^0.3.0",
-				"union-value": "^1.0.0",
-				"unset-value": "^1.0.0"
+				"collection-visit": "1.0.0",
+				"component-emitter": "1.3.0",
+				"get-value": "2.0.6",
+				"has-value": "1.0.0",
+				"isobject": "3.0.1",
+				"set-value": "2.0.1",
+				"to-object-path": "0.3.0",
+				"union-value": "1.0.1",
+				"unset-value": "1.0.0"
+			}
+		},
+		"call-bind": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"dev": true,
+			"requires": {
+				"function-bind": "1.1.1",
+				"get-intrinsic": "1.1.1"
 			}
 		},
 		"call-me-maybe": {
@@ -3998,7 +4258,7 @@
 			"integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
 			"dev": true,
 			"requires": {
-				"callsites": "^2.0.0"
+				"callsites": "2.0.0"
 			}
 		},
 		"caller-path": {
@@ -4007,7 +4267,7 @@
 			"integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
 			"dev": true,
 			"requires": {
-				"caller-callsite": "^2.0.0"
+				"caller-callsite": "2.0.0"
 			}
 		},
 		"callsites": {
@@ -4021,8 +4281,8 @@
 			"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.1.tgz",
 			"integrity": "sha512-7fa2WcG4fYFkclIvEmxBbTvmibwF2/agfEBc6q3lOpVu0A13ltLsA+Hr/8Hp6kp5f+G7hKi6t8lys6XxP+1K6Q==",
 			"requires": {
-				"pascal-case": "^3.1.1",
-				"tslib": "^1.10.0"
+				"pascal-case": "3.1.1",
+				"tslib": "1.13.0"
 			}
 		},
 		"camelcase": {
@@ -4037,8 +4297,8 @@
 			"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
 			"dev": true,
 			"requires": {
-				"camelcase": "^2.0.0",
-				"map-obj": "^1.0.0"
+				"camelcase": "2.1.1",
+				"map-obj": "1.0.1"
 			}
 		},
 		"camelize": {
@@ -4052,16 +4312,16 @@
 			"integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-lite": "^1.0.0",
-				"lodash.memoize": "^4.1.2",
-				"lodash.uniq": "^4.5.0"
+				"browserslist": "4.16.3",
+				"caniuse-lite": "1.0.30001207",
+				"lodash.memoize": "4.1.2",
+				"lodash.uniq": "4.5.0"
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001116",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001116.tgz",
-			"integrity": "sha512-f2lcYnmAI5Mst9+g0nkMIznFGsArRmZ0qU+dnq8l91hymdc2J3SFbiPhOJEeDqC1vtE8nc1qNQyklzB8veJefQ==",
+			"version": "1.0.30001207",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001207.tgz",
+			"integrity": "sha512-UPQZdmAsyp2qfCTiMU/zqGSWOYaY9F9LL61V8f+8MrubsaDGpaHD9HRV/EWZGULZn0Hxu48SKzI5DgFwTvHuYw==",
 			"dev": true
 		},
 		"capture-exit": {
@@ -4070,7 +4330,7 @@
 			"integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
 			"dev": true,
 			"requires": {
-				"rsvp": "^4.8.4"
+				"rsvp": "4.8.5"
 			}
 		},
 		"case-sensitive-paths-webpack-plugin": {
@@ -4103,9 +4363,9 @@
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
 			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 			"requires": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
+				"ansi-styles": "3.2.1",
+				"escape-string-regexp": "1.0.5",
+				"supports-color": "5.5.0"
 			}
 		},
 		"chardet": {
@@ -4115,23 +4375,80 @@
 			"dev": true
 		},
 		"chokidar": {
-			"version": "2.1.8",
-			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-			"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+			"version": "3.5.1",
+			"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.1.tgz",
+			"integrity": "sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==",
 			"dev": true,
 			"requires": {
-				"anymatch": "^2.0.0",
-				"async-each": "^1.0.1",
-				"braces": "^2.3.2",
-				"fsevents": "^1.2.7",
-				"glob-parent": "^3.1.0",
-				"inherits": "^2.0.3",
-				"is-binary-path": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"normalize-path": "^3.0.0",
-				"path-is-absolute": "^1.0.0",
-				"readdirp": "^2.2.1",
-				"upath": "^1.1.1"
+				"anymatch": "3.1.1",
+				"braces": "3.0.2",
+				"fsevents": "2.3.2",
+				"glob-parent": "5.1.2",
+				"is-binary-path": "2.1.0",
+				"is-glob": "4.0.1",
+				"normalize-path": "3.0.0",
+				"readdirp": "3.5.0"
+			},
+			"dependencies": {
+				"anymatch": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
+					"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
+					"dev": true,
+					"requires": {
+						"normalize-path": "3.0.0",
+						"picomatch": "2.2.2"
+					}
+				},
+				"braces": {
+					"version": "3.0.2",
+					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+					"dev": true,
+					"requires": {
+						"fill-range": "7.0.1"
+					}
+				},
+				"fill-range": {
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+					"dev": true,
+					"requires": {
+						"to-regex-range": "5.0.1"
+					}
+				},
+				"fsevents": {
+					"version": "2.3.2",
+					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+					"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+					"dev": true,
+					"optional": true
+				},
+				"glob-parent": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+					"dev": true,
+					"requires": {
+						"is-glob": "4.0.1"
+					}
+				},
+				"is-number": {
+					"version": "7.0.0",
+					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+					"dev": true
+				},
+				"to-regex-range": {
+					"version": "5.0.1",
+					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+					"dev": true,
+					"requires": {
+						"is-number": "7.0.0"
+					}
+				}
 			}
 		},
 		"chownr": {
@@ -4146,7 +4463,7 @@
 			"integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
 			"dev": true,
 			"requires": {
-				"tslib": "^1.9.0"
+				"tslib": "1.13.0"
 			}
 		},
 		"ci-info": {
@@ -4160,8 +4477,8 @@
 			"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
 			"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+				"inherits": "2.0.4",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"class-utils": {
@@ -4170,10 +4487,10 @@
 			"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
 			"dev": true,
 			"requires": {
-				"arr-union": "^3.1.0",
-				"define-property": "^0.2.5",
-				"isobject": "^3.0.0",
-				"static-extend": "^0.1.1"
+				"arr-union": "3.1.0",
+				"define-property": "0.2.5",
+				"isobject": "3.0.1",
+				"static-extend": "0.1.2"
 			},
 			"dependencies": {
 				"define-property": {
@@ -4182,7 +4499,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
+						"is-descriptor": "0.1.6"
 					}
 				}
 			}
@@ -4197,7 +4514,7 @@
 			"resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz",
 			"integrity": "sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==",
 			"requires": {
-				"source-map": "~0.6.0"
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"source-map": {
@@ -4219,7 +4536,7 @@
 			"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
 			"dev": true,
 			"requires": {
-				"restore-cursor": "^2.0.0"
+				"restore-cursor": "2.0.0"
 			}
 		},
 		"cli-table3": {
@@ -4228,9 +4545,9 @@
 			"integrity": "sha512-7Qg2Jrep1S/+Q3EceiZtQcDPWxhAvBw+ERf1162v4sikJrvojMHFqXt8QIVha8UlH9rgU0BeWPytZ9/TzYqlUw==",
 			"dev": true,
 			"requires": {
-				"colors": "^1.1.2",
-				"object-assign": "^4.1.0",
-				"string-width": "^2.1.1"
+				"colors": "1.4.0",
+				"object-assign": "4.1.1",
+				"string-width": "2.1.1"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -4251,8 +4568,8 @@
 					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 					"dev": true,
 					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "4.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -4261,7 +4578,7 @@
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^3.0.0"
+						"ansi-regex": "3.0.0"
 					}
 				}
 			}
@@ -4272,8 +4589,8 @@
 			"integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
 			"dev": true,
 			"requires": {
-				"slice-ansi": "^3.0.0",
-				"string-width": "^4.2.0"
+				"slice-ansi": "3.0.0",
+				"string-width": "4.2.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -4300,9 +4617,9 @@
 					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.0"
+						"emoji-regex": "8.0.0",
+						"is-fullwidth-code-point": "3.0.0",
+						"strip-ansi": "6.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -4311,7 +4628,7 @@
 					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^5.0.0"
+						"ansi-regex": "5.0.0"
 					}
 				}
 			}
@@ -4328,9 +4645,9 @@
 			"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
 			"dev": true,
 			"requires": {
-				"string-width": "^3.1.0",
-				"strip-ansi": "^5.2.0",
-				"wrap-ansi": "^5.1.0"
+				"string-width": "3.1.0",
+				"strip-ansi": "5.2.0",
+				"wrap-ansi": "5.1.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -4351,9 +4668,9 @@
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
+						"emoji-regex": "7.0.3",
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "5.2.0"
 					}
 				},
 				"strip-ansi": {
@@ -4362,7 +4679,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					}
 				},
 				"wrap-ansi": {
@@ -4371,9 +4688,9 @@
 					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0"
+						"ansi-styles": "3.2.1",
+						"string-width": "3.1.0",
+						"strip-ansi": "5.2.0"
 					}
 				}
 			}
@@ -4384,11 +4701,11 @@
 			"integrity": "sha1-TnPdCen7lxzDhnDF3O2cGJZIHMY=",
 			"dev": true,
 			"requires": {
-				"for-own": "^0.1.3",
-				"is-plain-object": "^2.0.1",
-				"kind-of": "^3.0.2",
-				"lazy-cache": "^1.0.3",
-				"shallow-clone": "^0.1.2"
+				"for-own": "0.1.5",
+				"is-plain-object": "2.0.4",
+				"kind-of": "3.2.2",
+				"lazy-cache": "1.0.4",
+				"shallow-clone": "0.1.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -4397,7 +4714,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -4414,9 +4731,9 @@
 			"integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
 			"dev": true,
 			"requires": {
-				"@types/q": "^1.5.1",
-				"chalk": "^2.4.1",
-				"q": "^1.1.2"
+				"@types/q": "1.5.4",
+				"chalk": "2.4.2",
+				"q": "1.5.1"
 			}
 		},
 		"code-point-at": {
@@ -4431,8 +4748,8 @@
 			"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
 			"dev": true,
 			"requires": {
-				"map-visit": "^1.0.0",
-				"object-visit": "^1.0.0"
+				"map-visit": "1.0.0",
+				"object-visit": "1.0.1"
 			}
 		},
 		"color": {
@@ -4440,8 +4757,8 @@
 			"resolved": "https://registry.npmjs.org/color/-/color-3.1.3.tgz",
 			"integrity": "sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==",
 			"requires": {
-				"color-convert": "^1.9.1",
-				"color-string": "^1.5.4"
+				"color-convert": "1.9.3",
+				"color-string": "1.5.4"
 			}
 		},
 		"color-convert": {
@@ -4462,14 +4779,14 @@
 			"resolved": "https://registry.npmjs.org/color-string/-/color-string-1.5.4.tgz",
 			"integrity": "sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==",
 			"requires": {
-				"color-name": "^1.0.0",
-				"simple-swizzle": "^0.2.2"
+				"color-name": "1.1.3",
+				"simple-swizzle": "0.2.2"
 			}
 		},
 		"colorette": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.1.tgz",
-			"integrity": "sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==",
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+			"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
 			"dev": true
 		},
 		"colors": {
@@ -4485,7 +4802,7 @@
 			"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
 			"dev": true,
 			"requires": {
-				"delayed-stream": "~1.0.0"
+				"delayed-stream": "1.0.0"
 			}
 		},
 		"commander": {
@@ -4541,7 +4858,7 @@
 			"integrity": "sha1-ntZ18TzFRQHTCVCkhv9qe6OrGF8=",
 			"dev": true,
 			"requires": {
-				"arity-n": "^1.0.4"
+				"arity-n": "1.0.4"
 			}
 		},
 		"compressible": {
@@ -4550,7 +4867,7 @@
 			"integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
 			"dev": true,
 			"requires": {
-				"mime-db": ">= 1.43.0 < 2"
+				"mime-db": "1.44.0"
 			}
 		},
 		"compression": {
@@ -4559,21 +4876,15 @@
 			"integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
 			"dev": true,
 			"requires": {
-				"accepts": "~1.3.5",
+				"accepts": "1.3.7",
 				"bytes": "3.0.0",
-				"compressible": "~2.0.16",
+				"compressible": "2.0.18",
 				"debug": "2.6.9",
-				"on-headers": "~1.0.2",
+				"on-headers": "1.0.2",
 				"safe-buffer": "5.1.2",
-				"vary": "~1.1.2"
+				"vary": "1.1.2"
 			},
 			"dependencies": {
-				"bytes": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-					"integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
-					"dev": true
-				},
 				"debug": {
 					"version": "2.6.9",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -4618,10 +4929,10 @@
 			"integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
 			"dev": true,
 			"requires": {
-				"buffer-from": "^1.0.0",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.2.2",
-				"typedarray": "^0.0.6"
+				"buffer-from": "1.1.1",
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7",
+				"typedarray": "0.0.6"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -4630,13 +4941,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -4651,15 +4962,15 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
 		},
 		"confusing-browser-globals": {
-			"version": "1.0.9",
-			"resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
-			"integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
+			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz",
+			"integrity": "sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA==",
 			"dev": true
 		},
 		"connect-history-api-fallback": {
@@ -4725,7 +5036,7 @@
 			"integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "~5.1.1"
+				"safe-buffer": "5.1.2"
 			},
 			"dependencies": {
 				"safe-buffer": {
@@ -4753,12 +5064,12 @@
 			"integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
 			"dev": true,
 			"requires": {
-				"aproba": "^1.1.1",
-				"fs-write-stream-atomic": "^1.0.8",
-				"iferr": "^0.1.5",
-				"mkdirp": "^0.5.1",
-				"rimraf": "^2.5.4",
-				"run-queue": "^1.0.0"
+				"aproba": "1.2.0",
+				"fs-write-stream-atomic": "1.0.10",
+				"iferr": "0.1.5",
+				"mkdirp": "0.5.5",
+				"rimraf": "2.7.1",
+				"run-queue": "1.0.3"
 			},
 			"dependencies": {
 				"rimraf": {
@@ -4767,7 +5078,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -4783,21 +5094,21 @@
 			"resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
 			"integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
 			"requires": {
-				"toggle-selection": "^1.0.6"
+				"toggle-selection": "1.0.6"
 			}
 		},
 		"core-js": {
-			"version": "2.6.11",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz",
-			"integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg=="
+			"version": "3.6.5",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+			"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
 		},
 		"core-js-compat": {
-			"version": "3.6.5",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-			"integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+			"version": "3.10.0",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.10.0.tgz",
+			"integrity": "sha512-9yVewub2MXNYyGvuLnMHcN1k9RkvB7/ofktpeKTIaASyB88YYqGzUnu0ywMMhJrDHOMiTjSHWGzR+i7Wb9Z1kQ==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.8.5",
+				"browserslist": "4.16.3",
 				"semver": "7.0.0"
 			},
 			"dependencies": {
@@ -4810,9 +5121,9 @@
 			}
 		},
 		"core-js-pure": {
-			"version": "3.6.5",
-			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.6.5.tgz",
-			"integrity": "sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==",
+			"version": "3.10.0",
+			"resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.10.0.tgz",
+			"integrity": "sha512-CC582enhrFZStO4F8lGI7QL3SYx7/AIRc+IdSi3btrQGrVsTawo5K/crmKbRrQ+MOMhNX4v+PATn0k2NN6wI7A==",
 			"dev": true
 		},
 		"core-util-is": {
@@ -4827,10 +5138,10 @@
 			"integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
 			"dev": true,
 			"requires": {
-				"import-fresh": "^2.0.0",
-				"is-directory": "^0.3.1",
-				"js-yaml": "^3.13.1",
-				"parse-json": "^4.0.0"
+				"import-fresh": "2.0.0",
+				"is-directory": "0.3.1",
+				"js-yaml": "3.14.1",
+				"parse-json": "4.0.0"
 			}
 		},
 		"country-data": {
@@ -4838,8 +5149,8 @@
 			"resolved": "https://registry.npmjs.org/country-data/-/country-data-0.0.31.tgz",
 			"integrity": "sha1-gJZrjh0Uf6bWpYnTKTP4eTd0lW0=",
 			"requires": {
-				"currency-symbol-map": "~2",
-				"underscore": ">1.4.4"
+				"currency-symbol-map": "2.2.0",
+				"underscore": "1.10.2"
 			}
 		},
 		"cp-file": {
@@ -4848,10 +5159,10 @@
 			"integrity": "sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"make-dir": "^3.0.0",
-				"nested-error-stacks": "^2.0.0",
-				"p-event": "^4.1.0"
+				"graceful-fs": "4.2.4",
+				"make-dir": "3.1.0",
+				"nested-error-stacks": "2.1.0",
+				"p-event": "4.2.0"
 			},
 			"dependencies": {
 				"make-dir": {
@@ -4860,7 +5171,7 @@
 					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
 					"dev": true,
 					"requires": {
-						"semver": "^6.0.0"
+						"semver": "6.3.0"
 					}
 				},
 				"semver": {
@@ -4877,15 +5188,15 @@
 			"integrity": "sha512-XwlImkjPxMr01qXqC564VD4rfcDQ2eKtYmFlCy0ixsLRJ1cwYVUBh+v47jsQTO1IrmvdjqO813VpDQ0JiTuOdA==",
 			"dev": true,
 			"requires": {
-				"arrify": "^2.0.1",
-				"cp-file": "^7.0.0",
-				"globby": "^9.2.0",
-				"has-glob": "^1.0.0",
-				"junk": "^3.1.0",
-				"nested-error-stacks": "^2.1.0",
-				"p-all": "^2.1.0",
-				"p-filter": "^2.1.0",
-				"p-map": "^3.0.0"
+				"arrify": "2.0.1",
+				"cp-file": "7.0.0",
+				"globby": "9.2.0",
+				"has-glob": "1.0.0",
+				"junk": "3.1.0",
+				"nested-error-stacks": "2.1.0",
+				"p-all": "2.1.0",
+				"p-filter": "2.1.0",
+				"p-map": "3.0.0"
 			},
 			"dependencies": {
 				"arrify": {
@@ -4900,7 +5211,7 @@
 					"integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==",
 					"dev": true,
 					"requires": {
-						"path-type": "^3.0.0"
+						"path-type": "3.0.0"
 					}
 				},
 				"globby": {
@@ -4909,14 +5220,14 @@
 					"integrity": "sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg==",
 					"dev": true,
 					"requires": {
-						"@types/glob": "^7.1.1",
-						"array-union": "^1.0.2",
-						"dir-glob": "^2.2.2",
-						"fast-glob": "^2.2.6",
-						"glob": "^7.1.3",
-						"ignore": "^4.0.3",
-						"pify": "^4.0.1",
-						"slash": "^2.0.0"
+						"@types/glob": "7.1.3",
+						"array-union": "1.0.2",
+						"dir-glob": "2.2.2",
+						"fast-glob": "2.2.7",
+						"glob": "7.1.6",
+						"ignore": "4.0.6",
+						"pify": "4.0.1",
+						"slash": "2.0.0"
 					}
 				},
 				"p-map": {
@@ -4925,7 +5236,7 @@
 					"integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
 					"dev": true,
 					"requires": {
-						"aggregate-error": "^3.0.0"
+						"aggregate-error": "3.0.1"
 					}
 				},
 				"path-type": {
@@ -4934,7 +5245,7 @@
 					"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
 					"dev": true,
 					"requires": {
-						"pify": "^3.0.0"
+						"pify": "3.0.0"
 					},
 					"dependencies": {
 						"pify": {
@@ -4959,8 +5270,8 @@
 			"integrity": "sha512-HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg==",
 			"dev": true,
 			"requires": {
-				"cpy": "^8.0.0",
-				"meow": "^6.1.1"
+				"cpy": "8.1.0",
+				"meow": "6.1.1"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -4975,9 +5286,9 @@
 					"integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==",
 					"dev": true,
 					"requires": {
-						"camelcase": "^5.3.1",
-						"map-obj": "^4.0.0",
-						"quick-lru": "^4.0.1"
+						"camelcase": "5.3.1",
+						"map-obj": "4.1.0",
+						"quick-lru": "4.0.1"
 					}
 				},
 				"find-up": {
@@ -4986,8 +5297,8 @@
 					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 					"dev": true,
 					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
+						"locate-path": "5.0.0",
+						"path-exists": "4.0.0"
 					}
 				},
 				"indent-string": {
@@ -5002,7 +5313,7 @@
 					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 					"dev": true,
 					"requires": {
-						"p-locate": "^4.1.0"
+						"p-locate": "4.1.0"
 					}
 				},
 				"map-obj": {
@@ -5017,17 +5328,17 @@
 					"integrity": "sha512-3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg==",
 					"dev": true,
 					"requires": {
-						"@types/minimist": "^1.2.0",
-						"camelcase-keys": "^6.2.2",
-						"decamelize-keys": "^1.1.0",
-						"hard-rejection": "^2.1.0",
-						"minimist-options": "^4.0.2",
-						"normalize-package-data": "^2.5.0",
-						"read-pkg-up": "^7.0.1",
-						"redent": "^3.0.0",
-						"trim-newlines": "^3.0.0",
-						"type-fest": "^0.13.1",
-						"yargs-parser": "^18.1.3"
+						"@types/minimist": "1.2.0",
+						"camelcase-keys": "6.2.2",
+						"decamelize-keys": "1.1.0",
+						"hard-rejection": "2.1.0",
+						"minimist-options": "4.1.0",
+						"normalize-package-data": "2.5.0",
+						"read-pkg-up": "7.0.1",
+						"redent": "3.0.0",
+						"trim-newlines": "3.0.0",
+						"type-fest": "0.13.1",
+						"yargs-parser": "18.1.3"
 					}
 				},
 				"p-locate": {
@@ -5036,7 +5347,7 @@
 					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 					"dev": true,
 					"requires": {
-						"p-limit": "^2.2.0"
+						"p-limit": "2.3.0"
 					}
 				},
 				"parse-json": {
@@ -5045,10 +5356,10 @@
 					"integrity": "sha512-ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ==",
 					"dev": true,
 					"requires": {
-						"@babel/code-frame": "^7.0.0",
-						"error-ex": "^1.3.1",
-						"json-parse-better-errors": "^1.0.1",
-						"lines-and-columns": "^1.1.6"
+						"@babel/code-frame": "7.10.4",
+						"error-ex": "1.3.2",
+						"json-parse-better-errors": "1.0.2",
+						"lines-and-columns": "1.1.6"
 					}
 				},
 				"path-exists": {
@@ -5063,10 +5374,10 @@
 					"integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
 					"dev": true,
 					"requires": {
-						"@types/normalize-package-data": "^2.4.0",
-						"normalize-package-data": "^2.5.0",
-						"parse-json": "^5.0.0",
-						"type-fest": "^0.6.0"
+						"@types/normalize-package-data": "2.4.0",
+						"normalize-package-data": "2.5.0",
+						"parse-json": "5.0.1",
+						"type-fest": "0.6.0"
 					},
 					"dependencies": {
 						"type-fest": {
@@ -5083,9 +5394,9 @@
 					"integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
 					"dev": true,
 					"requires": {
-						"find-up": "^4.1.0",
-						"read-pkg": "^5.2.0",
-						"type-fest": "^0.8.1"
+						"find-up": "4.1.0",
+						"read-pkg": "5.2.0",
+						"type-fest": "0.8.1"
 					},
 					"dependencies": {
 						"type-fest": {
@@ -5102,8 +5413,8 @@
 					"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
 					"dev": true,
 					"requires": {
-						"indent-string": "^4.0.0",
-						"strip-indent": "^3.0.0"
+						"indent-string": "4.0.0",
+						"strip-indent": "3.0.0"
 					}
 				},
 				"strip-indent": {
@@ -5112,7 +5423,7 @@
 					"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
 					"dev": true,
 					"requires": {
-						"min-indent": "^1.0.0"
+						"min-indent": "1.0.1"
 					}
 				},
 				"trim-newlines": {
@@ -5133,8 +5444,8 @@
 					"integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
 					"dev": true,
 					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
+						"camelcase": "5.3.1",
+						"decamelize": "1.2.0"
 					}
 				}
 			}
@@ -5144,7 +5455,7 @@
 			"resolved": "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz",
 			"integrity": "sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==",
 			"requires": {
-				"buffer": "^5.1.0"
+				"buffer": "5.6.0"
 			}
 		},
 		"create-ecdh": {
@@ -5153,14 +5464,14 @@
 			"integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.1.0",
-				"elliptic": "^6.5.3"
+				"bn.js": "4.12.0",
+				"elliptic": "6.5.4"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
@@ -5170,11 +5481,11 @@
 			"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
 			"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 			"requires": {
-				"cipher-base": "^1.0.1",
-				"inherits": "^2.0.1",
-				"md5.js": "^1.3.4",
-				"ripemd160": "^2.0.1",
-				"sha.js": "^2.4.0"
+				"cipher-base": "1.0.4",
+				"inherits": "2.0.4",
+				"md5.js": "1.3.5",
+				"ripemd160": "2.0.2",
+				"sha.js": "2.4.11"
 			}
 		},
 		"create-hmac": {
@@ -5183,12 +5494,12 @@
 			"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 			"dev": true,
 			"requires": {
-				"cipher-base": "^1.0.3",
-				"create-hash": "^1.1.0",
-				"inherits": "^2.0.1",
-				"ripemd160": "^2.0.0",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
+				"cipher-base": "1.0.4",
+				"create-hash": "1.2.0",
+				"inherits": "2.0.4",
+				"ripemd160": "2.0.2",
+				"safe-buffer": "5.2.1",
+				"sha.js": "2.4.11"
 			}
 		},
 		"create-react-class": {
@@ -5196,9 +5507,9 @@
 			"resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
 			"integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
 			"requires": {
-				"fbjs": "^0.8.9",
-				"loose-envify": "^1.3.1",
-				"object-assign": "^4.1.1"
+				"fbjs": "0.8.17",
+				"loose-envify": "1.4.0",
+				"object-assign": "4.1.1"
 			}
 		},
 		"cross-spawn": {
@@ -5206,11 +5517,11 @@
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
 			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
 			"requires": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"nice-try": "1.0.5",
+				"path-key": "2.0.1",
+				"semver": "5.7.1",
+				"shebang-command": "1.2.0",
+				"which": "1.3.1"
 			}
 		},
 		"crypto-browserify": {
@@ -5219,17 +5530,17 @@
 			"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 			"dev": true,
 			"requires": {
-				"browserify-cipher": "^1.0.0",
-				"browserify-sign": "^4.0.0",
-				"create-ecdh": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"create-hmac": "^1.1.0",
-				"diffie-hellman": "^5.0.0",
-				"inherits": "^2.0.1",
-				"pbkdf2": "^3.0.3",
-				"public-encrypt": "^4.0.0",
-				"randombytes": "^2.0.0",
-				"randomfill": "^1.0.3"
+				"browserify-cipher": "1.0.1",
+				"browserify-sign": "4.2.1",
+				"create-ecdh": "4.0.4",
+				"create-hash": "1.2.0",
+				"create-hmac": "1.1.7",
+				"diffie-hellman": "5.0.3",
+				"inherits": "2.0.4",
+				"pbkdf2": "3.1.1",
+				"public-encrypt": "4.0.3",
+				"randombytes": "2.1.0",
+				"randomfill": "1.0.4"
 			}
 		},
 		"css": {
@@ -5238,10 +5549,10 @@
 			"integrity": "sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.3",
-				"source-map": "^0.6.1",
-				"source-map-resolve": "^0.5.2",
-				"urix": "^0.1.0"
+				"inherits": "2.0.4",
+				"source-map": "0.6.1",
+				"source-map-resolve": "0.5.3",
+				"urix": "0.1.0"
 			},
 			"dependencies": {
 				"source-map": {
@@ -5257,8 +5568,8 @@
 			"resolved": "https://registry.npmjs.org/css-animation/-/css-animation-1.6.1.tgz",
 			"integrity": "sha512-/48+/BaEaHRY6kNQ2OIPzKf9A6g8WjZYjhiNDNuIVbsm5tXCGIAsHDjB4Xu1C4vXJtUWZo26O68OQkDpNBaPog==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"component-classes": "^1.2.5"
+				"babel-runtime": "6.26.0",
+				"component-classes": "1.2.6"
 			}
 		},
 		"css-b64-images": {
@@ -5272,7 +5583,7 @@
 			"integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.5"
+				"postcss": "7.0.35"
 			}
 		},
 		"css-color-keywords": {
@@ -5292,8 +5603,8 @@
 			"integrity": "sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.1",
-				"timsort": "^0.3.0"
+				"postcss": "7.0.35",
+				"timsort": "0.3.0"
 			}
 		},
 		"css-has-pseudo": {
@@ -5302,8 +5613,8 @@
 			"integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.6",
-				"postcss-selector-parser": "^5.0.0-rc.4"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "5.0.0"
 			},
 			"dependencies": {
 				"cssesc": {
@@ -5318,9 +5629,9 @@
 					"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
 					"dev": true,
 					"requires": {
-						"cssesc": "^2.0.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"cssesc": "2.0.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -5331,18 +5642,18 @@
 			"integrity": "sha512-jYq4zdZT0oS0Iykt+fqnzVLRIeiPWhka+7BqPn+oSIpWJAHak5tmB/WZrJ2a21JhCeFyNnnlroSl8c+MtVndzA==",
 			"dev": true,
 			"requires": {
-				"camelcase": "^5.3.1",
-				"cssesc": "^3.0.0",
-				"icss-utils": "^4.1.1",
-				"loader-utils": "^1.2.3",
-				"normalize-path": "^3.0.0",
-				"postcss": "^7.0.23",
-				"postcss-modules-extract-imports": "^2.0.0",
-				"postcss-modules-local-by-default": "^3.0.2",
-				"postcss-modules-scope": "^2.1.1",
-				"postcss-modules-values": "^3.0.0",
-				"postcss-value-parser": "^4.0.2",
-				"schema-utils": "^2.6.0"
+				"camelcase": "5.3.1",
+				"cssesc": "3.0.0",
+				"icss-utils": "4.1.1",
+				"loader-utils": "1.4.0",
+				"normalize-path": "3.0.0",
+				"postcss": "7.0.35",
+				"postcss-modules-extract-imports": "2.0.0",
+				"postcss-modules-local-by-default": "3.0.3",
+				"postcss-modules-scope": "2.2.0",
+				"postcss-modules-values": "3.0.0",
+				"postcss-value-parser": "4.1.0",
+				"schema-utils": "2.7.1"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -5365,7 +5676,7 @@
 			"integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.5"
+				"postcss": "7.0.35"
 			}
 		},
 		"css-select": {
@@ -5374,10 +5685,10 @@
 			"integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
 			"dev": true,
 			"requires": {
-				"boolbase": "^1.0.0",
-				"css-what": "^3.2.1",
-				"domutils": "^1.7.0",
-				"nth-check": "^1.0.2"
+				"boolbase": "1.0.0",
+				"css-what": "3.4.2",
+				"domutils": "1.7.0",
+				"nth-check": "1.0.2"
 			}
 		},
 		"css-select-base-adapter": {
@@ -5391,9 +5702,9 @@
 			"resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-2.3.2.tgz",
 			"integrity": "sha512-VOFaeZA053BqvvvqIA8c9n0+9vFppVBAHCp6JgFTtTMU3Mzi+XnelJ9XC9ul3BqFzZyQ5N+H0SnwsWT2Ebchxw==",
 			"requires": {
-				"camelize": "^1.0.0",
-				"css-color-keywords": "^1.0.0",
-				"postcss-value-parser": "^3.3.0"
+				"camelize": "1.0.0",
+				"css-color-keywords": "1.0.0",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"css-tree": {
@@ -5403,7 +5714,7 @@
 			"dev": true,
 			"requires": {
 				"mdn-data": "2.0.4",
-				"source-map": "^0.6.1"
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"source-map": {
@@ -5415,9 +5726,9 @@
 			}
 		},
 		"css-what": {
-			"version": "3.3.0",
-			"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
-			"integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==",
+			"version": "3.4.2",
+			"resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+			"integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
 			"dev": true
 		},
 		"cssdb": {
@@ -5438,10 +5749,10 @@
 			"integrity": "sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==",
 			"dev": true,
 			"requires": {
-				"cosmiconfig": "^5.0.0",
-				"cssnano-preset-default": "^4.0.7",
-				"is-resolvable": "^1.0.0",
-				"postcss": "^7.0.0"
+				"cosmiconfig": "5.2.1",
+				"cssnano-preset-default": "4.0.7",
+				"is-resolvable": "1.1.0",
+				"postcss": "7.0.35"
 			}
 		},
 		"cssnano-preset-default": {
@@ -5450,36 +5761,36 @@
 			"integrity": "sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==",
 			"dev": true,
 			"requires": {
-				"css-declaration-sorter": "^4.0.1",
-				"cssnano-util-raw-cache": "^4.0.1",
-				"postcss": "^7.0.0",
-				"postcss-calc": "^7.0.1",
-				"postcss-colormin": "^4.0.3",
-				"postcss-convert-values": "^4.0.1",
-				"postcss-discard-comments": "^4.0.2",
-				"postcss-discard-duplicates": "^4.0.2",
-				"postcss-discard-empty": "^4.0.1",
-				"postcss-discard-overridden": "^4.0.1",
-				"postcss-merge-longhand": "^4.0.11",
-				"postcss-merge-rules": "^4.0.3",
-				"postcss-minify-font-values": "^4.0.2",
-				"postcss-minify-gradients": "^4.0.2",
-				"postcss-minify-params": "^4.0.2",
-				"postcss-minify-selectors": "^4.0.2",
-				"postcss-normalize-charset": "^4.0.1",
-				"postcss-normalize-display-values": "^4.0.2",
-				"postcss-normalize-positions": "^4.0.2",
-				"postcss-normalize-repeat-style": "^4.0.2",
-				"postcss-normalize-string": "^4.0.2",
-				"postcss-normalize-timing-functions": "^4.0.2",
-				"postcss-normalize-unicode": "^4.0.1",
-				"postcss-normalize-url": "^4.0.1",
-				"postcss-normalize-whitespace": "^4.0.2",
-				"postcss-ordered-values": "^4.1.2",
-				"postcss-reduce-initial": "^4.0.3",
-				"postcss-reduce-transforms": "^4.0.2",
-				"postcss-svgo": "^4.0.2",
-				"postcss-unique-selectors": "^4.0.1"
+				"css-declaration-sorter": "4.0.1",
+				"cssnano-util-raw-cache": "4.0.1",
+				"postcss": "7.0.35",
+				"postcss-calc": "7.0.5",
+				"postcss-colormin": "4.0.3",
+				"postcss-convert-values": "4.0.1",
+				"postcss-discard-comments": "4.0.2",
+				"postcss-discard-duplicates": "4.0.2",
+				"postcss-discard-empty": "4.0.1",
+				"postcss-discard-overridden": "4.0.1",
+				"postcss-merge-longhand": "4.0.11",
+				"postcss-merge-rules": "4.0.3",
+				"postcss-minify-font-values": "4.0.2",
+				"postcss-minify-gradients": "4.0.2",
+				"postcss-minify-params": "4.0.2",
+				"postcss-minify-selectors": "4.0.2",
+				"postcss-normalize-charset": "4.0.1",
+				"postcss-normalize-display-values": "4.0.2",
+				"postcss-normalize-positions": "4.0.2",
+				"postcss-normalize-repeat-style": "4.0.2",
+				"postcss-normalize-string": "4.0.2",
+				"postcss-normalize-timing-functions": "4.0.2",
+				"postcss-normalize-unicode": "4.0.1",
+				"postcss-normalize-url": "4.0.1",
+				"postcss-normalize-whitespace": "4.0.2",
+				"postcss-ordered-values": "4.1.2",
+				"postcss-reduce-initial": "4.0.3",
+				"postcss-reduce-transforms": "4.0.2",
+				"postcss-svgo": "4.0.2",
+				"postcss-unique-selectors": "4.0.1"
 			}
 		},
 		"cssnano-util-get-arguments": {
@@ -5500,7 +5811,7 @@
 			"integrity": "sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"cssnano-util-same-parent": {
@@ -5510,28 +5821,28 @@
 			"dev": true
 		},
 		"csso": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz",
-			"integrity": "sha512-NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ==",
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+			"integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
 			"dev": true,
 			"requires": {
-				"css-tree": "1.0.0-alpha.39"
+				"css-tree": "1.1.3"
 			},
 			"dependencies": {
 				"css-tree": {
-					"version": "1.0.0-alpha.39",
-					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz",
-					"integrity": "sha512-7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA==",
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+					"integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
 					"dev": true,
 					"requires": {
-						"mdn-data": "2.0.6",
-						"source-map": "^0.6.1"
+						"mdn-data": "2.0.14",
+						"source-map": "0.6.1"
 					}
 				},
 				"mdn-data": {
-					"version": "2.0.6",
-					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz",
-					"integrity": "sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA==",
+					"version": "2.0.14",
+					"resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+					"integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
 					"dev": true
 				},
 				"source-map": {
@@ -5548,6 +5859,15 @@
 			"integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
 			"dev": true
 		},
+		"cssstyle": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
+			"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
+			"dev": true,
+			"requires": {
+				"cssom": "0.3.8"
+			}
+		},
 		"csstype": {
 			"version": "3.0.5",
 			"resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.5.tgz",
@@ -5564,7 +5884,7 @@
 			"integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
 			"dev": true,
 			"requires": {
-				"array-find-index": "^1.0.1"
+				"array-find-index": "1.0.2"
 			}
 		},
 		"cycle": {
@@ -5585,8 +5905,8 @@
 			"integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
 			"dev": true,
 			"requires": {
-				"es5-ext": "^0.10.50",
-				"type": "^1.0.1"
+				"es5-ext": "0.10.53",
+				"type": "1.2.0"
 			}
 		},
 		"d3-array": {
@@ -5619,10 +5939,10 @@
 			"resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
 			"integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
 			"requires": {
-				"d3-collection": "1",
-				"d3-dispatch": "1",
-				"d3-quadtree": "1",
-				"d3-timer": "1"
+				"d3-collection": "1.0.7",
+				"d3-dispatch": "1.0.6",
+				"d3-quadtree": "1.0.7",
+				"d3-timer": "1.0.10"
 			}
 		},
 		"d3-format": {
@@ -5635,7 +5955,7 @@
 			"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
 			"integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
 			"requires": {
-				"d3-color": "1"
+				"d3-color": "1.4.1"
 			}
 		},
 		"d3-path": {
@@ -5653,12 +5973,12 @@
 			"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
 			"integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
 			"requires": {
-				"d3-array": "^1.2.0",
-				"d3-collection": "1",
-				"d3-format": "1",
-				"d3-interpolate": "1",
-				"d3-time": "1",
-				"d3-time-format": "2"
+				"d3-array": "1.2.4",
+				"d3-collection": "1.0.7",
+				"d3-format": "1.4.4",
+				"d3-interpolate": "1.4.0",
+				"d3-time": "1.0.11",
+				"d3-time-format": "2.2.3"
 			}
 		},
 		"d3-selection": {
@@ -5671,7 +5991,7 @@
 			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
 			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
 			"requires": {
-				"d3-path": "1"
+				"d3-path": "1.0.9"
 			}
 		},
 		"d3-time": {
@@ -5684,7 +6004,7 @@
 			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.3.tgz",
 			"integrity": "sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==",
 			"requires": {
-				"d3-time": "1"
+				"d3-time": "1.0.11"
 			}
 		},
 		"d3-timer": {
@@ -5704,7 +6024,7 @@
 			"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
 			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0"
+				"assert-plus": "1.0.0"
 			}
 		},
 		"data-urls": {
@@ -5713,35 +6033,20 @@
 			"integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==",
 			"dev": true,
 			"requires": {
-				"abab": "^2.0.0",
-				"whatwg-mimetype": "^2.2.0",
-				"whatwg-url": "^7.0.0"
+				"abab": "2.0.5",
+				"whatwg-mimetype": "2.3.0",
+				"whatwg-url": "7.1.0"
 			},
 			"dependencies": {
-				"abab": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
-					"integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
-					"dev": true
-				},
-				"tr46": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-					"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.1.0"
-					}
-				},
 				"whatwg-url": {
 					"version": "7.1.0",
 					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
 					"integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
 					"dev": true,
 					"requires": {
-						"lodash.sortby": "^4.7.0",
-						"tr46": "^1.0.1",
-						"webidl-conversions": "^4.0.2"
+						"lodash.sortby": "4.7.0",
+						"tr46": "1.0.1",
+						"webidl-conversions": "4.0.2"
 					}
 				}
 			}
@@ -5756,7 +6061,7 @@
 			"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
 			"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 			"requires": {
-				"ms": "^2.1.1"
+				"ms": "2.1.2"
 			}
 		},
 		"decamelize": {
@@ -5771,8 +6076,8 @@
 			"integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=",
 			"dev": true,
 			"requires": {
-				"decamelize": "^1.1.0",
-				"map-obj": "^1.0.0"
+				"decamelize": "1.2.0",
+				"map-obj": "1.0.1"
 			}
 		},
 		"decimal.js": {
@@ -5802,12 +6107,12 @@
 			"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
 			"dev": true,
 			"requires": {
-				"is-arguments": "^1.0.4",
-				"is-date-object": "^1.0.1",
-				"is-regex": "^1.0.4",
-				"object-is": "^1.0.1",
-				"object-keys": "^1.1.1",
-				"regexp.prototype.flags": "^1.2.0"
+				"is-arguments": "1.0.4",
+				"is-date-object": "1.0.2",
+				"is-regex": "1.1.0",
+				"object-is": "1.1.2",
+				"object-keys": "1.1.1",
+				"regexp.prototype.flags": "1.3.0"
 			}
 		},
 		"deep-is": {
@@ -5827,8 +6132,8 @@
 			"integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
 			"dev": true,
 			"requires": {
-				"execa": "^1.0.0",
-				"ip-regex": "^2.1.0"
+				"execa": "1.0.0",
+				"ip-regex": "2.1.0"
 			}
 		},
 		"define-properties": {
@@ -5836,7 +6141,7 @@
 			"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
 			"integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
 			"requires": {
-				"object-keys": "^1.0.12"
+				"object-keys": "1.1.1"
 			}
 		},
 		"define-property": {
@@ -5845,8 +6150,8 @@
 			"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
 			"dev": true,
 			"requires": {
-				"is-descriptor": "^1.0.2",
-				"isobject": "^3.0.1"
+				"is-descriptor": "1.0.2",
+				"isobject": "3.0.1"
 			},
 			"dependencies": {
 				"is-accessor-descriptor": {
@@ -5855,7 +6160,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-data-descriptor": {
@@ -5864,7 +6169,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-descriptor": {
@@ -5873,9 +6178,68 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-accessor-descriptor": "1.0.0",
+						"is-data-descriptor": "1.0.0",
+						"kind-of": "6.0.3"
+					}
+				}
+			}
+		},
+		"del": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+			"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+			"dev": true,
+			"requires": {
+				"@types/glob": "7.1.3",
+				"globby": "6.1.0",
+				"is-path-cwd": "2.2.0",
+				"is-path-in-cwd": "2.1.0",
+				"p-map": "2.1.0",
+				"pify": "4.0.1",
+				"rimraf": "2.7.1"
+			},
+			"dependencies": {
+				"globby": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+					"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+					"dev": true,
+					"requires": {
+						"array-union": "1.0.2",
+						"glob": "7.1.6",
+						"object-assign": "4.1.1",
+						"pify": "2.3.0",
+						"pinkie-promise": "2.0.1"
+					},
+					"dependencies": {
+						"pify": {
+							"version": "2.3.0",
+							"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+							"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+							"dev": true
+						}
+					}
+				},
+				"p-map": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+					"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+					"dev": true
+				},
+				"pify": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+					"dev": true
+				},
+				"rimraf": {
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"dev": true,
+					"requires": {
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -5904,8 +6268,8 @@
 			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0"
+				"inherits": "2.0.4",
+				"minimalistic-assert": "1.0.1"
 			}
 		},
 		"destroy": {
@@ -5921,9 +6285,9 @@
 			"dev": true
 		},
 		"detect-node": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
-			"integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.5.tgz",
+			"integrity": "sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==",
 			"dev": true
 		},
 		"detect-port-alt": {
@@ -5932,8 +6296,8 @@
 			"integrity": "sha512-5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q==",
 			"dev": true,
 			"requires": {
-				"address": "^1.0.1",
-				"debug": "^2.6.0"
+				"address": "1.1.2",
+				"debug": "2.6.9"
 			},
 			"dependencies": {
 				"debug": {
@@ -5965,15 +6329,15 @@
 			"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.1.0",
-				"miller-rabin": "^4.0.0",
-				"randombytes": "^2.0.0"
+				"bn.js": "4.12.0",
+				"miller-rabin": "4.0.1",
+				"randombytes": "2.1.0"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
@@ -5984,8 +6348,8 @@
 			"integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==",
 			"dev": true,
 			"requires": {
-				"arrify": "^1.0.1",
-				"path-type": "^3.0.0"
+				"arrify": "1.0.1",
+				"path-type": "3.0.0"
 			},
 			"dependencies": {
 				"path-type": {
@@ -5994,7 +6358,7 @@
 					"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
 					"dev": true,
 					"requires": {
-						"pify": "^3.0.0"
+						"pify": "3.0.0"
 					}
 				}
 			}
@@ -6016,8 +6380,8 @@
 			"integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
 			"dev": true,
 			"requires": {
-				"ip": "^1.1.0",
-				"safe-buffer": "^5.0.1"
+				"ip": "1.1.5",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"dns-txt": {
@@ -6026,7 +6390,7 @@
 			"integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
 			"dev": true,
 			"requires": {
-				"buffer-indexof": "^1.0.0"
+				"buffer-indexof": "1.1.1"
 			}
 		},
 		"doctrine": {
@@ -6035,7 +6399,7 @@
 			"integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
 			"dev": true,
 			"requires": {
-				"esutils": "^2.0.2"
+				"esutils": "2.0.3"
 			}
 		},
 		"document.contains": {
@@ -6043,7 +6407,7 @@
 			"resolved": "https://registry.npmjs.org/document.contains/-/document.contains-1.0.2.tgz",
 			"integrity": "sha512-YcvYFs15mX8m3AO1QNQy3BlIpSMfNRj3Ujk2BEJxsZG+HZf7/hZ6jr7mDpXrF8q+ff95Vef5yjhiZxm8CGJr6Q==",
 			"requires": {
-				"define-properties": "^1.1.3"
+				"define-properties": "1.1.3"
 			}
 		},
 		"dom-align": {
@@ -6057,7 +6421,7 @@
 			"integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
 			"dev": true,
 			"requires": {
-				"utila": "~0.4"
+				"utila": "0.4.0"
 			}
 		},
 		"dom-css": {
@@ -6075,8 +6439,8 @@
 			"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.0.tgz",
 			"integrity": "sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ==",
 			"requires": {
-				"@babel/runtime": "^7.8.7",
-				"csstype": "^3.0.2"
+				"@babel/runtime": "7.10.4",
+				"csstype": "3.0.5"
 			}
 		},
 		"dom-scroll-into-view": {
@@ -6090,14 +6454,14 @@
 			"integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "^2.0.1",
-				"entities": "^2.0.0"
+				"domelementtype": "2.2.0",
+				"entities": "2.2.0"
 			},
 			"dependencies": {
 				"domelementtype": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-					"integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz",
+					"integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==",
 					"dev": true
 				}
 			}
@@ -6120,7 +6484,7 @@
 			"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
 			"dev": true,
 			"requires": {
-				"webidl-conversions": "^4.0.2"
+				"webidl-conversions": "4.0.2"
 			}
 		},
 		"domhandler": {
@@ -6129,7 +6493,7 @@
 			"integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "1"
+				"domelementtype": "1.3.1"
 			}
 		},
 		"domutils": {
@@ -6138,8 +6502,8 @@
 			"integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
 			"dev": true,
 			"requires": {
-				"dom-serializer": "0",
-				"domelementtype": "1"
+				"dom-serializer": "0.2.2",
+				"domelementtype": "1.3.1"
 			}
 		},
 		"dot-case": {
@@ -6147,17 +6511,17 @@
 			"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.3.tgz",
 			"integrity": "sha512-7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA==",
 			"requires": {
-				"no-case": "^3.0.3",
-				"tslib": "^1.10.0"
+				"no-case": "3.0.3",
+				"tslib": "1.13.0"
 			}
 		},
 		"dot-prop": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz",
-			"integrity": "sha512-uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A==",
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+			"integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
 			"dev": true,
 			"requires": {
-				"is-obj": "^2.0.0"
+				"is-obj": "2.0.0"
 			},
 			"dependencies": {
 				"is-obj": {
@@ -6185,9 +6549,9 @@
 			"resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.5.tgz",
 			"integrity": "sha512-RlHcoDtblwCD6Bw2ay3D0dTLA6lH8862OcdJrHGnYrY5JjlitzSzGvGQwqqumVvbGUNDSZLD3FyNpSs4z5WIUg==",
 			"requires": {
-				"fbjs": "^1.0.0",
-				"immutable": "~3.7.4",
-				"object-assign": "^4.1.1"
+				"fbjs": "1.0.0",
+				"immutable": "3.7.6",
+				"object-assign": "4.1.1"
 			},
 			"dependencies": {
 				"fbjs": {
@@ -6195,14 +6559,21 @@
 					"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-1.0.0.tgz",
 					"integrity": "sha512-MUgcMEJaFhCaF1QtWGnmq9ZDRAzECTCRAF7O6UZIlAlkTs1SasiX9aP0Iw7wfD2mJ7wDTNfg2w7u5fSCwJk1OA==",
 					"requires": {
-						"core-js": "^2.4.1",
-						"fbjs-css-vars": "^1.0.0",
-						"isomorphic-fetch": "^2.1.1",
-						"loose-envify": "^1.0.0",
-						"object-assign": "^4.1.0",
-						"promise": "^7.1.1",
-						"setimmediate": "^1.0.5",
-						"ua-parser-js": "^0.7.18"
+						"core-js": "2.6.12",
+						"fbjs-css-vars": "1.0.2",
+						"isomorphic-fetch": "2.2.1",
+						"loose-envify": "1.4.0",
+						"object-assign": "4.1.1",
+						"promise": "7.3.1",
+						"setimmediate": "1.0.5",
+						"ua-parser-js": "0.7.21"
+					},
+					"dependencies": {
+						"core-js": {
+							"version": "2.6.12",
+							"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
+							"integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
+						}
 					}
 				}
 			}
@@ -6229,10 +6600,10 @@
 			"integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
 			"dev": true,
 			"requires": {
-				"end-of-stream": "^1.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0",
-				"stream-shift": "^1.0.0"
+				"end-of-stream": "1.4.4",
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7",
+				"stream-shift": "1.0.1"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -6241,13 +6612,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -6262,7 +6633,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -6273,8 +6644,8 @@
 			"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
 			"dev": true,
 			"requires": {
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.1.0"
+				"jsbn": "0.1.1",
+				"safer-buffer": "2.1.2"
 			}
 		},
 		"ee-first": {
@@ -6284,30 +6655,30 @@
 			"dev": true
 		},
 		"electron-to-chromium": {
-			"version": "1.3.539",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.539.tgz",
-			"integrity": "sha512-rM0LWDIstdqfaRUADZetNrL6+zd/0NBmavbMEhBXgc2u/CC1d1GaDyN5hho29fFvBiOVFwrSWZkzmNcZnCEDog==",
+			"version": "1.3.708",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.708.tgz",
+			"integrity": "sha512-+A8ggYZ5riOLMcVAuzHx6bforaPzaiLnW1QOMD2SlMYQVi7QQTyQ/WrlZoebIH9ikmgr+tLJGpNITFFCUiQcPw==",
 			"dev": true
 		},
 		"elliptic": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-			"integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.4.0",
-				"brorand": "^1.0.1",
-				"hash.js": "^1.0.0",
-				"hmac-drbg": "^1.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.0"
+				"bn.js": "4.12.0",
+				"brorand": "1.1.0",
+				"hash.js": "1.1.7",
+				"hmac-drbg": "1.0.1",
+				"inherits": "2.0.4",
+				"minimalistic-assert": "1.0.1",
+				"minimalistic-crypto-utils": "1.0.1"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
@@ -6317,7 +6688,7 @@
 			"resolved": "https://registry.npmjs.org/emoji-mart/-/emoji-mart-2.11.1.tgz",
 			"integrity": "sha512-Hr4N56YEkaPtmojO2dfgnMLLE/d5HpnhH0+M8cw9LRHpG2EgQQaCelRad3d5qQAPHI5+K0wMc/rwM0eRo0FnUA==",
 			"requires": {
-				"prop-types": "^15.6.0"
+				"prop-types": "15.7.2"
 			}
 		},
 		"emoji-regex": {
@@ -6343,7 +6714,7 @@
 			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
 			"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
 			"requires": {
-				"iconv-lite": "~0.4.13"
+				"iconv-lite": "0.4.24"
 			}
 		},
 		"end-of-stream": {
@@ -6352,18 +6723,18 @@
 			"integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
 			"dev": true,
 			"requires": {
-				"once": "^1.4.0"
+				"once": "1.4.0"
 			}
 		},
 		"enhanced-resolve": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz",
-			"integrity": "sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz",
+			"integrity": "sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"memory-fs": "^0.5.0",
-				"tapable": "^1.0.0"
+				"graceful-fs": "4.2.4",
+				"memory-fs": "0.5.0",
+				"tapable": "1.1.3"
 			},
 			"dependencies": {
 				"memory-fs": {
@@ -6372,8 +6743,8 @@
 					"integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
 					"dev": true,
 					"requires": {
-						"errno": "^0.1.3",
-						"readable-stream": "^2.0.1"
+						"errno": "0.1.8",
+						"readable-stream": "2.3.7"
 					}
 				},
 				"readable-stream": {
@@ -6382,13 +6753,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -6403,7 +6774,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -6414,7 +6785,7 @@
 			"integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^4.1.1"
+				"ansi-colors": "4.1.1"
 			},
 			"dependencies": {
 				"ansi-colors": {
@@ -6426,18 +6797,18 @@
 			}
 		},
 		"entities": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
-			"integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+			"integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
 			"dev": true
 		},
 		"errno": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
-			"integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+			"version": "0.1.8",
+			"resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+			"integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
 			"dev": true,
 			"requires": {
-				"prr": "~1.0.1"
+				"prr": "1.0.1"
 			}
 		},
 		"error-ex": {
@@ -6445,7 +6816,7 @@
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
 			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
 			"requires": {
-				"is-arrayish": "^0.2.1"
+				"is-arrayish": "0.2.1"
 			}
 		},
 		"es-abstract": {
@@ -6453,17 +6824,17 @@
 			"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.6.tgz",
 			"integrity": "sha512-Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw==",
 			"requires": {
-				"es-to-primitive": "^1.2.1",
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3",
-				"has-symbols": "^1.0.1",
-				"is-callable": "^1.2.0",
-				"is-regex": "^1.1.0",
-				"object-inspect": "^1.7.0",
-				"object-keys": "^1.1.1",
-				"object.assign": "^4.1.0",
-				"string.prototype.trimend": "^1.0.1",
-				"string.prototype.trimstart": "^1.0.1"
+				"es-to-primitive": "1.2.1",
+				"function-bind": "1.1.1",
+				"has": "1.0.3",
+				"has-symbols": "1.0.1",
+				"is-callable": "1.2.0",
+				"is-regex": "1.1.0",
+				"object-inspect": "1.8.0",
+				"object-keys": "1.1.1",
+				"object.assign": "4.1.0",
+				"string.prototype.trimend": "1.0.1",
+				"string.prototype.trimstart": "1.0.1"
 			}
 		},
 		"es-to-primitive": {
@@ -6471,9 +6842,9 @@
 			"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 			"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
 			"requires": {
-				"is-callable": "^1.1.4",
-				"is-date-object": "^1.0.1",
-				"is-symbol": "^1.0.2"
+				"is-callable": "1.2.0",
+				"is-date-object": "1.0.2",
+				"is-symbol": "1.0.3"
 			}
 		},
 		"es5-ext": {
@@ -6482,9 +6853,9 @@
 			"integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
 			"dev": true,
 			"requires": {
-				"es6-iterator": "~2.0.3",
-				"es6-symbol": "~3.1.3",
-				"next-tick": "~1.0.0"
+				"es6-iterator": "2.0.3",
+				"es6-symbol": "3.1.3",
+				"next-tick": "1.0.0"
 			}
 		},
 		"es6-error": {
@@ -6498,9 +6869,9 @@
 			"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
 			"dev": true,
 			"requires": {
-				"d": "1",
-				"es5-ext": "^0.10.35",
-				"es6-symbol": "^3.1.1"
+				"d": "1.0.1",
+				"es5-ext": "0.10.53",
+				"es6-symbol": "3.1.3"
 			}
 		},
 		"es6-symbol": {
@@ -6509,14 +6880,14 @@
 			"integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
 			"dev": true,
 			"requires": {
-				"d": "^1.0.1",
-				"ext": "^1.1.2"
+				"d": "1.0.1",
+				"ext": "1.4.0"
 			}
 		},
 		"escalade": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.0.2.tgz",
-			"integrity": "sha512-gPYAU37hYCUhW5euPeR+Y74F7BL+IBsV93j5cvGriSaD1aG6MGsqsV1yamRdrWrb2j3aiZvb0X+UBOWpx3JWtQ==",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
 			"dev": true
 		},
 		"escape-html": {
@@ -6541,11 +6912,11 @@
 			"integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==",
 			"dev": true,
 			"requires": {
-				"esprima": "^4.0.1",
-				"estraverse": "^4.2.0",
-				"esutils": "^2.0.2",
-				"optionator": "^0.8.1",
-				"source-map": "~0.6.1"
+				"esprima": "4.0.1",
+				"estraverse": "4.3.0",
+				"esutils": "2.0.3",
+				"optionator": "0.8.3",
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"source-map": {
@@ -6563,43 +6934,43 @@
 			"integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"ajv": "^6.10.0",
-				"chalk": "^2.1.0",
-				"cross-spawn": "^6.0.5",
-				"debug": "^4.0.1",
-				"doctrine": "^3.0.0",
-				"eslint-scope": "^5.0.0",
-				"eslint-utils": "^1.4.3",
-				"eslint-visitor-keys": "^1.1.0",
-				"espree": "^6.1.2",
-				"esquery": "^1.0.1",
-				"esutils": "^2.0.2",
-				"file-entry-cache": "^5.0.1",
-				"functional-red-black-tree": "^1.0.1",
-				"glob-parent": "^5.0.0",
-				"globals": "^12.1.0",
-				"ignore": "^4.0.6",
-				"import-fresh": "^3.0.0",
-				"imurmurhash": "^0.1.4",
-				"inquirer": "^7.0.0",
-				"is-glob": "^4.0.0",
-				"js-yaml": "^3.13.1",
-				"json-stable-stringify-without-jsonify": "^1.0.1",
-				"levn": "^0.3.0",
-				"lodash": "^4.17.14",
-				"minimatch": "^3.0.4",
-				"mkdirp": "^0.5.1",
-				"natural-compare": "^1.4.0",
-				"optionator": "^0.8.3",
-				"progress": "^2.0.0",
-				"regexpp": "^2.0.1",
-				"semver": "^6.1.2",
-				"strip-ansi": "^5.2.0",
-				"strip-json-comments": "^3.0.1",
-				"table": "^5.2.3",
-				"text-table": "^0.2.0",
-				"v8-compile-cache": "^2.0.3"
+				"@babel/code-frame": "7.10.4",
+				"ajv": "6.12.3",
+				"chalk": "2.4.2",
+				"cross-spawn": "6.0.5",
+				"debug": "4.3.1",
+				"doctrine": "3.0.0",
+				"eslint-scope": "5.1.1",
+				"eslint-utils": "1.4.3",
+				"eslint-visitor-keys": "1.3.0",
+				"espree": "6.2.1",
+				"esquery": "1.4.0",
+				"esutils": "2.0.3",
+				"file-entry-cache": "5.0.1",
+				"functional-red-black-tree": "1.0.1",
+				"glob-parent": "5.1.2",
+				"globals": "12.4.0",
+				"ignore": "4.0.6",
+				"import-fresh": "3.3.0",
+				"imurmurhash": "0.1.4",
+				"inquirer": "7.3.3",
+				"is-glob": "4.0.1",
+				"js-yaml": "3.14.1",
+				"json-stable-stringify-without-jsonify": "1.0.1",
+				"levn": "0.3.0",
+				"lodash": "4.17.19",
+				"minimatch": "3.0.4",
+				"mkdirp": "0.5.5",
+				"natural-compare": "1.4.0",
+				"optionator": "0.8.3",
+				"progress": "2.0.3",
+				"regexpp": "2.0.1",
+				"semver": "6.3.0",
+				"strip-ansi": "5.2.0",
+				"strip-json-comments": "3.1.1",
+				"table": "5.4.6",
+				"text-table": "0.2.0",
+				"v8-compile-cache": "2.3.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -6609,12 +6980,12 @@
 					"dev": true
 				},
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				},
 				"eslint-utils": {
@@ -6623,16 +6994,16 @@
 					"integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
 					"dev": true,
 					"requires": {
-						"eslint-visitor-keys": "^1.1.0"
+						"eslint-visitor-keys": "1.3.0"
 					}
 				},
 				"glob-parent": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-					"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+					"integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^4.0.1"
+						"is-glob": "4.0.1"
 					}
 				},
 				"globals": {
@@ -6641,17 +7012,17 @@
 					"integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
 					"dev": true,
 					"requires": {
-						"type-fest": "^0.8.1"
+						"type-fest": "0.8.1"
 					}
 				},
 				"import-fresh": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
-					"integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+					"integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
 					"dev": true,
 					"requires": {
-						"parent-module": "^1.0.0",
-						"resolve-from": "^4.0.0"
+						"parent-module": "1.0.1",
+						"resolve-from": "4.0.0"
 					}
 				},
 				"regexpp": {
@@ -6678,7 +7049,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					}
 				}
 			}
@@ -6689,7 +7060,7 @@
 			"integrity": "sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ==",
 			"dev": true,
 			"requires": {
-				"confusing-browser-globals": "^1.0.9"
+				"confusing-browser-globals": "1.0.10"
 			}
 		},
 		"eslint-import-resolver-node": {
@@ -6698,8 +7069,8 @@
 			"integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==",
 			"dev": true,
 			"requires": {
-				"debug": "^2.6.9",
-				"resolve": "^1.13.1"
+				"debug": "2.6.9",
+				"resolve": "1.17.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -6725,11 +7096,11 @@
 			"integrity": "sha512-+YRqB95PnNvxNp1HEjQmvf9KNvCin5HXYYseOXVC2U0KEcw4IkQ2IQEBG46j7+gW39bMzeu0GsUhVbBY3Votpw==",
 			"dev": true,
 			"requires": {
-				"fs-extra": "^8.1.0",
-				"loader-fs-cache": "^1.0.2",
-				"loader-utils": "^1.2.3",
-				"object-hash": "^2.0.1",
-				"schema-utils": "^2.6.1"
+				"fs-extra": "8.1.0",
+				"loader-fs-cache": "1.0.3",
+				"loader-utils": "1.4.0",
+				"object-hash": "2.1.1",
+				"schema-utils": "2.7.1"
 			}
 		},
 		"eslint-module-utils": {
@@ -6738,8 +7109,8 @@
 			"integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==",
 			"dev": true,
 			"requires": {
-				"debug": "^2.6.9",
-				"pkg-dir": "^2.0.0"
+				"debug": "2.6.9",
+				"pkg-dir": "2.0.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -6757,7 +7128,7 @@
 					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
 					"dev": true,
 					"requires": {
-						"locate-path": "^2.0.0"
+						"locate-path": "2.0.0"
 					}
 				},
 				"locate-path": {
@@ -6766,8 +7137,8 @@
 					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
 					"dev": true,
 					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
+						"p-locate": "2.0.0",
+						"path-exists": "3.0.0"
 					}
 				},
 				"ms": {
@@ -6782,7 +7153,7 @@
 					"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
 					"dev": true,
 					"requires": {
-						"p-try": "^1.0.0"
+						"p-try": "1.0.0"
 					}
 				},
 				"p-locate": {
@@ -6791,7 +7162,7 @@
 					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"p-limit": "1.3.0"
 					}
 				},
 				"p-try": {
@@ -6806,7 +7177,7 @@
 					"integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.1.0"
+						"find-up": "2.1.0"
 					}
 				}
 			}
@@ -6817,7 +7188,7 @@
 			"integrity": "sha512-W5hLjpFfZyZsXfo5anlu7HM970JBDqbEshAJUkeczP6BFCIfJXuiIBQXyberLRtOStT0OGPF8efeTbxlHk4LpQ==",
 			"dev": true,
 			"requires": {
-				"lodash": "^4.17.15"
+				"lodash": "4.17.19"
 			}
 		},
 		"eslint-plugin-import": {
@@ -6826,18 +7197,18 @@
 			"integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==",
 			"dev": true,
 			"requires": {
-				"array-includes": "^3.0.3",
-				"array.prototype.flat": "^1.2.1",
-				"contains-path": "^0.1.0",
-				"debug": "^2.6.9",
+				"array-includes": "3.1.3",
+				"array.prototype.flat": "1.2.3",
+				"contains-path": "0.1.0",
+				"debug": "2.6.9",
 				"doctrine": "1.5.0",
-				"eslint-import-resolver-node": "^0.3.2",
-				"eslint-module-utils": "^2.4.1",
-				"has": "^1.0.3",
-				"minimatch": "^3.0.4",
-				"object.values": "^1.1.0",
-				"read-pkg-up": "^2.0.0",
-				"resolve": "^1.12.0"
+				"eslint-import-resolver-node": "0.3.4",
+				"eslint-module-utils": "2.6.0",
+				"has": "1.0.3",
+				"minimatch": "3.0.4",
+				"object.values": "1.1.1",
+				"read-pkg-up": "2.0.0",
+				"resolve": "1.17.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -6855,8 +7226,8 @@
 					"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
 					"dev": true,
 					"requires": {
-						"esutils": "^2.0.2",
-						"isarray": "^1.0.0"
+						"esutils": "2.0.3",
+						"isarray": "1.0.0"
 					}
 				},
 				"find-up": {
@@ -6865,7 +7236,7 @@
 					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
 					"dev": true,
 					"requires": {
-						"locate-path": "^2.0.0"
+						"locate-path": "2.0.0"
 					}
 				},
 				"load-json-file": {
@@ -6874,10 +7245,10 @@
 					"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^2.2.0",
-						"pify": "^2.0.0",
-						"strip-bom": "^3.0.0"
+						"graceful-fs": "4.2.4",
+						"parse-json": "2.2.0",
+						"pify": "2.3.0",
+						"strip-bom": "3.0.0"
 					}
 				},
 				"locate-path": {
@@ -6886,8 +7257,8 @@
 					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
 					"dev": true,
 					"requires": {
-						"p-locate": "^2.0.0",
-						"path-exists": "^3.0.0"
+						"p-locate": "2.0.0",
+						"path-exists": "3.0.0"
 					}
 				},
 				"ms": {
@@ -6902,7 +7273,7 @@
 					"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
 					"dev": true,
 					"requires": {
-						"p-try": "^1.0.0"
+						"p-try": "1.0.0"
 					}
 				},
 				"p-locate": {
@@ -6911,7 +7282,7 @@
 					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
 					"dev": true,
 					"requires": {
-						"p-limit": "^1.1.0"
+						"p-limit": "1.3.0"
 					}
 				},
 				"p-try": {
@@ -6926,7 +7297,7 @@
 					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"error-ex": "1.3.2"
 					}
 				},
 				"path-type": {
@@ -6935,7 +7306,7 @@
 					"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
 					"dev": true,
 					"requires": {
-						"pify": "^2.0.0"
+						"pify": "2.3.0"
 					}
 				},
 				"pify": {
@@ -6950,9 +7321,9 @@
 					"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^2.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^2.0.0"
+						"load-json-file": "2.0.0",
+						"normalize-package-data": "2.5.0",
+						"path-type": "2.0.0"
 					}
 				},
 				"read-pkg-up": {
@@ -6961,8 +7332,8 @@
 					"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
 					"dev": true,
 					"requires": {
-						"find-up": "^2.0.0",
-						"read-pkg": "^2.0.0"
+						"find-up": "2.1.0",
+						"read-pkg": "2.0.0"
 					}
 				},
 				"strip-bom": {
@@ -6979,15 +7350,15 @@
 			"integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.4.5",
-				"aria-query": "^3.0.0",
-				"array-includes": "^3.0.3",
-				"ast-types-flow": "^0.0.7",
-				"axobject-query": "^2.0.2",
-				"damerau-levenshtein": "^1.0.4",
-				"emoji-regex": "^7.0.2",
-				"has": "^1.0.3",
-				"jsx-ast-utils": "^2.2.1"
+				"@babel/runtime": "7.10.4",
+				"aria-query": "3.0.0",
+				"array-includes": "3.1.3",
+				"ast-types-flow": "0.0.7",
+				"axobject-query": "2.2.0",
+				"damerau-levenshtein": "1.0.6",
+				"emoji-regex": "7.0.3",
+				"has": "1.0.3",
+				"jsx-ast-utils": "2.4.1"
 			}
 		},
 		"eslint-plugin-react": {
@@ -6996,18 +7367,18 @@
 			"integrity": "sha512-SPT8j72CGuAP+JFbT0sJHOB80TX/pu44gQ4vXH/cq+hQTiY2PuZ6IHkqXJV6x1b28GDdo1lbInjKUrrdUf0LOQ==",
 			"dev": true,
 			"requires": {
-				"array-includes": "^3.1.1",
-				"doctrine": "^2.1.0",
-				"has": "^1.0.3",
-				"jsx-ast-utils": "^2.2.3",
-				"object.entries": "^1.1.1",
-				"object.fromentries": "^2.0.2",
-				"object.values": "^1.1.1",
-				"prop-types": "^15.7.2",
-				"resolve": "^1.15.1",
-				"semver": "^6.3.0",
-				"string.prototype.matchall": "^4.0.2",
-				"xregexp": "^4.3.0"
+				"array-includes": "3.1.3",
+				"doctrine": "2.1.0",
+				"has": "1.0.3",
+				"jsx-ast-utils": "2.4.1",
+				"object.entries": "1.1.2",
+				"object.fromentries": "2.0.4",
+				"object.values": "1.1.1",
+				"prop-types": "15.7.2",
+				"resolve": "1.17.0",
+				"semver": "6.3.0",
+				"string.prototype.matchall": "4.0.4",
+				"xregexp": "4.4.1"
 			},
 			"dependencies": {
 				"doctrine": {
@@ -7016,7 +7387,7 @@
 					"integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
 					"dev": true,
 					"requires": {
-						"esutils": "^2.0.2"
+						"esutils": "2.0.3"
 					}
 				},
 				"semver": {
@@ -7034,13 +7405,13 @@
 			"dev": true
 		},
 		"eslint-scope": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz",
-			"integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==",
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+			"integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
 			"dev": true,
 			"requires": {
-				"esrecurse": "^4.1.0",
-				"estraverse": "^4.1.1"
+				"esrecurse": "4.3.0",
+				"estraverse": "4.3.0"
 			}
 		},
 		"eslint-utils": {
@@ -7049,7 +7420,7 @@
 			"integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
 			"dev": true,
 			"requires": {
-				"eslint-visitor-keys": "^1.1.0"
+				"eslint-visitor-keys": "1.3.0"
 			}
 		},
 		"eslint-visitor-keys": {
@@ -7064,17 +7435,9 @@
 			"integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
 			"dev": true,
 			"requires": {
-				"acorn": "^7.1.1",
-				"acorn-jsx": "^5.2.0",
-				"eslint-visitor-keys": "^1.1.0"
-			},
-			"dependencies": {
-				"acorn": {
-					"version": "7.4.0",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
-					"integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==",
-					"dev": true
-				}
+				"acorn": "7.4.1",
+				"acorn-jsx": "5.3.1",
+				"eslint-visitor-keys": "1.3.0"
 			}
 		},
 		"esprima": {
@@ -7084,12 +7447,12 @@
 			"dev": true
 		},
 		"esquery": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz",
-			"integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz",
+			"integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
 			"dev": true,
 			"requires": {
-				"estraverse": "^5.1.0"
+				"estraverse": "5.2.0"
 			},
 			"dependencies": {
 				"estraverse": {
@@ -7101,12 +7464,20 @@
 			}
 		},
 		"esrecurse": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-			"integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+			"version": "4.3.0",
+			"resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+			"integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
 			"dev": true,
 			"requires": {
-				"estraverse": "^4.1.0"
+				"estraverse": "5.2.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "5.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz",
+					"integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==",
+					"dev": true
+				}
 			}
 		},
 		"estraverse": {
@@ -7128,24 +7499,24 @@
 			"dev": true
 		},
 		"eventemitter3": {
-			"version": "4.0.4",
-			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz",
-			"integrity": "sha512-rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ==",
+			"version": "4.0.7",
+			"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+			"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
 			"dev": true
 		},
 		"events": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/events/-/events-3.2.0.tgz",
-			"integrity": "sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==",
+			"version": "3.3.0",
+			"resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+			"integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
 			"dev": true
 		},
 		"eventsource": {
-			"version": "1.0.7",
-			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
-			"integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.1.0.tgz",
+			"integrity": "sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==",
 			"dev": true,
 			"requires": {
-				"original": "^1.0.0"
+				"original": "1.0.2"
 			}
 		},
 		"evp_bytestokey": {
@@ -7154,14 +7525,14 @@
 			"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 			"dev": true,
 			"requires": {
-				"md5.js": "^1.3.4",
-				"safe-buffer": "^5.1.1"
+				"md5.js": "1.3.5",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"exec-sh": {
-			"version": "0.3.4",
-			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz",
-			"integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==",
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+			"integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
 			"dev": true
 		},
 		"execa": {
@@ -7170,13 +7541,13 @@
 			"integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
 			"dev": true,
 			"requires": {
-				"cross-spawn": "^6.0.0",
-				"get-stream": "^4.0.0",
-				"is-stream": "^1.1.0",
-				"npm-run-path": "^2.0.0",
-				"p-finally": "^1.0.0",
-				"signal-exit": "^3.0.0",
-				"strip-eof": "^1.0.0"
+				"cross-spawn": "6.0.5",
+				"get-stream": "4.1.0",
+				"is-stream": "1.1.0",
+				"npm-run-path": "2.0.2",
+				"p-finally": "1.0.0",
+				"signal-exit": "3.0.3",
+				"strip-eof": "1.0.0"
 			}
 		},
 		"exenv": {
@@ -7196,13 +7567,13 @@
 			"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
 			"dev": true,
 			"requires": {
-				"debug": "^2.3.3",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"posix-character-classes": "^0.1.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
+				"debug": "2.6.9",
+				"define-property": "0.2.5",
+				"extend-shallow": "2.0.1",
+				"posix-character-classes": "0.1.1",
+				"regex-not": "1.0.2",
+				"snapdragon": "0.8.2",
+				"to-regex": "3.0.2"
 			},
 			"dependencies": {
 				"debug": {
@@ -7220,7 +7591,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
+						"is-descriptor": "0.1.6"
 					}
 				},
 				"extend-shallow": {
@@ -7229,7 +7600,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"is-extendable": "0.1.1"
 					}
 				},
 				"ms": {
@@ -7246,12 +7617,12 @@
 			"integrity": "sha512-wvVAx8XIol3Z5m9zvZXiyZOQ+sRJqNTIm6sGjdWlaZIeupQGO3WbYI+15D/AmEwZywL6wtJkbAbJtzkOfBuR0Q==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"ansi-styles": "^3.2.0",
-				"jest-get-type": "^24.9.0",
-				"jest-matcher-utils": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-regex-util": "^24.9.0"
+				"@jest/types": "24.9.0",
+				"ansi-styles": "3.2.1",
+				"jest-get-type": "24.9.0",
+				"jest-matcher-utils": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-regex-util": "24.9.0"
 			}
 		},
 		"express": {
@@ -7260,38 +7631,44 @@
 			"integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
 			"dev": true,
 			"requires": {
-				"accepts": "~1.3.7",
+				"accepts": "1.3.7",
 				"array-flatten": "1.1.1",
 				"body-parser": "1.19.0",
 				"content-disposition": "0.5.3",
-				"content-type": "~1.0.4",
+				"content-type": "1.0.4",
 				"cookie": "0.4.0",
 				"cookie-signature": "1.0.6",
 				"debug": "2.6.9",
-				"depd": "~1.1.2",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
-				"finalhandler": "~1.1.2",
+				"depd": "1.1.2",
+				"encodeurl": "1.0.2",
+				"escape-html": "1.0.3",
+				"etag": "1.8.1",
+				"finalhandler": "1.1.2",
 				"fresh": "0.5.2",
 				"merge-descriptors": "1.0.1",
-				"methods": "~1.1.2",
-				"on-finished": "~2.3.0",
-				"parseurl": "~1.3.3",
+				"methods": "1.1.2",
+				"on-finished": "2.3.0",
+				"parseurl": "1.3.3",
 				"path-to-regexp": "0.1.7",
-				"proxy-addr": "~2.0.5",
+				"proxy-addr": "2.0.6",
 				"qs": "6.7.0",
-				"range-parser": "~1.2.1",
+				"range-parser": "1.2.1",
 				"safe-buffer": "5.1.2",
 				"send": "0.17.1",
 				"serve-static": "1.14.1",
 				"setprototypeof": "1.1.1",
-				"statuses": "~1.5.0",
-				"type-is": "~1.6.18",
+				"statuses": "1.5.0",
+				"type-is": "1.6.18",
 				"utils-merge": "1.0.1",
-				"vary": "~1.1.2"
+				"vary": "1.1.2"
 			},
 			"dependencies": {
+				"array-flatten": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+					"integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+					"dev": true
+				},
 				"debug": {
 					"version": "2.6.9",
 					"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -7327,13 +7704,13 @@
 			"integrity": "sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==",
 			"dev": true,
 			"requires": {
-				"type": "^2.0.0"
+				"type": "2.5.0"
 			},
 			"dependencies": {
 				"type": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-					"integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+					"version": "2.5.0",
+					"resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
+					"integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==",
 					"dev": true
 				}
 			}
@@ -7350,8 +7727,8 @@
 			"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
 			"dev": true,
 			"requires": {
-				"assign-symbols": "^1.0.0",
-				"is-extendable": "^1.0.1"
+				"assign-symbols": "1.0.0",
+				"is-extendable": "1.0.1"
 			},
 			"dependencies": {
 				"is-extendable": {
@@ -7360,7 +7737,7 @@
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"dev": true,
 					"requires": {
-						"is-plain-object": "^2.0.4"
+						"is-plain-object": "2.0.4"
 					}
 				}
 			}
@@ -7371,9 +7748,9 @@
 			"integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
 			"dev": true,
 			"requires": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
+				"chardet": "0.7.0",
+				"iconv-lite": "0.4.24",
+				"tmp": "0.0.33"
 			}
 		},
 		"extglob": {
@@ -7382,14 +7759,14 @@
 			"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
 			"dev": true,
 			"requires": {
-				"array-unique": "^0.3.2",
-				"define-property": "^1.0.0",
-				"expand-brackets": "^2.1.4",
-				"extend-shallow": "^2.0.1",
-				"fragment-cache": "^0.2.1",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
+				"array-unique": "0.3.2",
+				"define-property": "1.0.0",
+				"expand-brackets": "2.1.4",
+				"extend-shallow": "2.0.1",
+				"fragment-cache": "0.2.1",
+				"regex-not": "1.0.2",
+				"snapdragon": "0.8.2",
+				"to-regex": "3.0.2"
 			},
 			"dependencies": {
 				"define-property": {
@@ -7398,7 +7775,7 @@
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^1.0.0"
+						"is-descriptor": "1.0.2"
 					}
 				},
 				"extend-shallow": {
@@ -7407,7 +7784,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"is-extendable": "0.1.1"
 					}
 				},
 				"is-accessor-descriptor": {
@@ -7416,7 +7793,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-data-descriptor": {
@@ -7425,7 +7802,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-descriptor": {
@@ -7434,9 +7811,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-accessor-descriptor": "1.0.0",
+						"is-data-descriptor": "1.0.0",
+						"kind-of": "6.0.3"
 					}
 				}
 			}
@@ -7465,12 +7842,12 @@
 			"integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
 			"dev": true,
 			"requires": {
-				"@mrmlnc/readdir-enhanced": "^2.2.1",
-				"@nodelib/fs.stat": "^1.1.2",
-				"glob-parent": "^3.1.0",
-				"is-glob": "^4.0.0",
-				"merge2": "^1.2.3",
-				"micromatch": "^3.1.10"
+				"@mrmlnc/readdir-enhanced": "2.2.1",
+				"@nodelib/fs.stat": "1.1.3",
+				"glob-parent": "3.1.0",
+				"is-glob": "4.0.1",
+				"merge2": "1.4.1",
+				"micromatch": "3.1.10"
 			}
 		},
 		"fast-json-stable-stringify": {
@@ -7491,7 +7868,7 @@
 			"integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
 			"dev": true,
 			"requires": {
-				"websocket-driver": ">=0.5.1"
+				"websocket-driver": "0.6.5"
 			}
 		},
 		"fb-watchman": {
@@ -7508,13 +7885,13 @@
 			"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
 			"integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
 			"requires": {
-				"core-js": "^1.0.0",
-				"isomorphic-fetch": "^2.1.1",
-				"loose-envify": "^1.0.0",
-				"object-assign": "^4.1.0",
-				"promise": "^7.1.1",
-				"setimmediate": "^1.0.5",
-				"ua-parser-js": "^0.7.18"
+				"core-js": "1.2.7",
+				"isomorphic-fetch": "2.2.1",
+				"loose-envify": "1.4.0",
+				"object-assign": "4.1.1",
+				"promise": "7.3.1",
+				"setimmediate": "1.0.5",
+				"ua-parser-js": "0.7.21"
 			},
 			"dependencies": {
 				"core-js": {
@@ -7541,7 +7918,7 @@
 			"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
 			"dev": true,
 			"requires": {
-				"escape-string-regexp": "^1.0.5"
+				"escape-string-regexp": "1.0.5"
 			}
 		},
 		"file-entry-cache": {
@@ -7550,7 +7927,7 @@
 			"integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
 			"dev": true,
 			"requires": {
-				"flat-cache": "^2.0.1"
+				"flat-cache": "2.0.1"
 			}
 		},
 		"file-loader": {
@@ -7559,17 +7936,10 @@
 			"integrity": "sha512-aKrYPYjF1yG3oX0kWRrqrSMfgftm7oJW5M+m4owoldH5C51C0RkIwB++JbRvEW3IU6/ZG5n8UvEcdgwOt2UOWA==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "^1.2.3",
-				"schema-utils": "^2.5.0"
+				"loader-utils": "1.4.0",
+				"schema-utils": "2.7.1"
 			}
 		},
-		"file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-			"dev": true,
-			"optional": true
-		},
 		"filesize": {
 			"version": "6.0.1",
 			"resolved": "https://registry.npmjs.org/filesize/-/filesize-6.0.1.tgz",
@@ -7582,10 +7952,10 @@
 			"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
+				"extend-shallow": "2.0.1",
+				"is-number": "3.0.0",
+				"repeat-string": "1.6.1",
+				"to-regex-range": "2.1.1"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -7594,7 +7964,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"is-extendable": "0.1.1"
 					}
 				}
 			}
@@ -7606,12 +7976,12 @@
 			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"on-finished": "~2.3.0",
-				"parseurl": "~1.3.3",
-				"statuses": "~1.5.0",
-				"unpipe": "~1.0.0"
+				"encodeurl": "1.0.2",
+				"escape-html": "1.0.3",
+				"on-finished": "2.3.0",
+				"parseurl": "1.3.3",
+				"statuses": "1.5.0",
+				"unpipe": "1.0.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -7637,9 +8007,9 @@
 			"integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
 			"dev": true,
 			"requires": {
-				"commondir": "^1.0.1",
-				"make-dir": "^2.0.0",
-				"pkg-dir": "^3.0.0"
+				"commondir": "1.0.1",
+				"make-dir": "2.1.0",
+				"pkg-dir": "3.0.0"
 			}
 		},
 		"find-up": {
@@ -7648,7 +8018,7 @@
 			"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
 			"dev": true,
 			"requires": {
-				"locate-path": "^3.0.0"
+				"locate-path": "3.0.0"
 			}
 		},
 		"find-versions": {
@@ -7657,7 +8027,7 @@
 			"integrity": "sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww==",
 			"dev": true,
 			"requires": {
-				"semver-regex": "^2.0.0"
+				"semver-regex": "2.0.0"
 			}
 		},
 		"flag-icon-css": {
@@ -7676,7 +8046,7 @@
 			"integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
 			"dev": true,
 			"requires": {
-				"flatted": "^2.0.0",
+				"flatted": "2.0.2",
 				"rimraf": "2.6.3",
 				"write": "1.0.3"
 			},
@@ -7687,7 +8057,7 @@
 					"integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -7710,8 +8080,8 @@
 			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.3.6"
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -7720,13 +8090,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -7741,7 +8111,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -7763,7 +8133,7 @@
 			"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
 			"dev": true,
 			"requires": {
-				"for-in": "^1.0.1"
+				"for-in": "1.0.2"
 			}
 		},
 		"forever-agent": {
@@ -7778,115 +8148,14 @@
 			"integrity": "sha512-DuVkPNrM12jR41KM2e+N+styka0EgLkTnXmNcXdgOM37vtGeY+oCBK/Jx0hzSeEU6memFCtWb4htrHPMDfwwUQ==",
 			"dev": true,
 			"requires": {
-				"babel-code-frame": "^6.22.0",
-				"chalk": "^2.4.1",
-				"chokidar": "^3.3.0",
-				"micromatch": "^3.1.10",
-				"minimatch": "^3.0.4",
-				"semver": "^5.6.0",
-				"tapable": "^1.0.0",
-				"worker-rpc": "^0.1.0"
-			},
-			"dependencies": {
-				"anymatch": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-					"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-					"dev": true,
-					"requires": {
-						"normalize-path": "^3.0.0",
-						"picomatch": "^2.0.4"
-					}
-				},
-				"binary-extensions": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-					"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
-					"dev": true
-				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
-				"chokidar": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-					"integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
-					"dev": true,
-					"requires": {
-						"anymatch": "~3.1.1",
-						"braces": "~3.0.2",
-						"fsevents": "~2.1.2",
-						"glob-parent": "~5.1.0",
-						"is-binary-path": "~2.1.0",
-						"is-glob": "~4.0.1",
-						"normalize-path": "~3.0.0",
-						"readdirp": "~3.4.0"
-					}
-				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-					"dev": true,
-					"requires": {
-						"to-regex-range": "^5.0.1"
-					}
-				},
-				"fsevents": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-					"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-					"dev": true,
-					"optional": true
-				},
-				"glob-parent": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-					"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
-					"dev": true,
-					"requires": {
-						"is-glob": "^4.0.1"
-					}
-				},
-				"is-binary-path": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-					"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-					"dev": true,
-					"requires": {
-						"binary-extensions": "^2.0.0"
-					}
-				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true
-				},
-				"readdirp": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-					"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
-					"dev": true,
-					"requires": {
-						"picomatch": "^2.2.1"
-					}
-				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-					"dev": true,
-					"requires": {
-						"is-number": "^7.0.0"
-					}
-				}
+				"babel-code-frame": "6.26.0",
+				"chalk": "2.4.2",
+				"chokidar": "3.5.1",
+				"micromatch": "3.1.10",
+				"minimatch": "3.0.4",
+				"semver": "5.7.1",
+				"tapable": "1.1.3",
+				"worker-rpc": "0.1.1"
 			}
 		},
 		"form-data": {
@@ -7895,9 +8164,9 @@
 			"integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
 			"dev": true,
 			"requires": {
-				"asynckit": "^0.4.0",
-				"combined-stream": "^1.0.6",
-				"mime-types": "^2.1.12"
+				"asynckit": "0.4.0",
+				"combined-stream": "1.0.8",
+				"mime-types": "2.1.27"
 			}
 		},
 		"forwarded": {
@@ -7917,7 +8186,7 @@
 			"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
 			"dev": true,
 			"requires": {
-				"map-cache": "^0.2.2"
+				"map-cache": "0.2.2"
 			}
 		},
 		"fresh": {
@@ -7932,8 +8201,8 @@
 			"integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.0"
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -7942,13 +8211,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -7963,7 +8232,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -7974,9 +8243,9 @@
 			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.2.0",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
+				"graceful-fs": "4.2.4",
+				"jsonfile": "4.0.0",
+				"universalify": "0.1.2"
 			}
 		},
 		"fs-minipass": {
@@ -7985,7 +8254,7 @@
 			"integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
 			"dev": true,
 			"requires": {
-				"minipass": "^3.0.0"
+				"minipass": "3.1.3"
 			}
 		},
 		"fs-write-stream-atomic": {
@@ -7994,10 +8263,10 @@
 			"integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"iferr": "^0.1.5",
-				"imurmurhash": "^0.1.4",
-				"readable-stream": "1 || 2"
+				"graceful-fs": "4.2.4",
+				"iferr": "0.1.5",
+				"imurmurhash": "0.1.4",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -8006,13 +8275,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -8027,7 +8296,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -8038,15 +8307,11 @@
 			"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
 		},
 		"fsevents": {
-			"version": "1.2.13",
-			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
-			"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"bindings": "^1.5.0",
-				"nan": "^2.12.1"
-			}
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+			"integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+			"dev": true,
+			"optional": true
 		},
 		"fstream": {
 			"version": "1.0.12",
@@ -8054,10 +8319,10 @@
 			"integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"inherits": "~2.0.0",
-				"mkdirp": ">=0.5 0",
-				"rimraf": "2"
+				"graceful-fs": "4.2.4",
+				"inherits": "2.0.4",
+				"mkdirp": "0.5.5",
+				"rimraf": "2.7.1"
 			},
 			"dependencies": {
 				"rimraf": {
@@ -8066,7 +8331,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -8081,9 +8346,9 @@
 			"resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.2.tgz",
 			"integrity": "sha512-C8A+LlHBJjB2AdcRPorc5JvJ5VUoWlXdEHLOJdCI7kjHEtGTpHQUiqMvCIKUwIsGwZX2jZJy761AXsn356bJQg==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1",
-				"functions-have-names": "^1.2.0"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6",
+				"functions-have-names": "1.2.1"
 			}
 		},
 		"functional-red-black-tree": {
@@ -8103,14 +8368,14 @@
 			"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 			"dev": true,
 			"requires": {
-				"aproba": "^1.0.3",
-				"console-control-strings": "^1.0.0",
-				"has-unicode": "^2.0.0",
-				"object-assign": "^4.1.0",
-				"signal-exit": "^3.0.0",
-				"string-width": "^1.0.1",
-				"strip-ansi": "^3.0.1",
-				"wide-align": "^1.1.0"
+				"aproba": "1.2.0",
+				"console-control-strings": "1.1.0",
+				"has-unicode": "2.0.1",
+				"object-assign": "4.1.1",
+				"signal-exit": "3.0.3",
+				"string-width": "1.0.2",
+				"strip-ansi": "3.0.1",
+				"wide-align": "1.1.3"
 			}
 		},
 		"gaze": {
@@ -8119,13 +8384,13 @@
 			"integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==",
 			"dev": true,
 			"requires": {
-				"globule": "^1.0.0"
+				"globule": "1.3.2"
 			}
 		},
 		"gensync": {
-			"version": "1.0.0-beta.1",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-			"integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
 			"dev": true
 		},
 		"get-caller-file": {
@@ -8134,6 +8399,17 @@
 			"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
 			"dev": true
 		},
+		"get-intrinsic": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz",
+			"integrity": "sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==",
+			"dev": true,
+			"requires": {
+				"function-bind": "1.1.1",
+				"has": "1.0.3",
+				"has-symbols": "1.0.1"
+			}
+		},
 		"get-own-enumerable-property-symbols": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
@@ -8146,7 +8422,7 @@
 			"integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
 			"dev": true,
 			"requires": {
-				"pump": "^3.0.0"
+				"pump": "3.0.0"
 			}
 		},
 		"get-value": {
@@ -8161,7 +8437,7 @@
 			"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
 			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0"
+				"assert-plus": "1.0.0"
 			}
 		},
 		"glob": {
@@ -8169,12 +8445,12 @@
 			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
 			"integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
 			"requires": {
-				"fs.realpath": "^1.0.0",
-				"inflight": "^1.0.4",
-				"inherits": "2",
-				"minimatch": "^3.0.4",
-				"once": "^1.3.0",
-				"path-is-absolute": "^1.0.0"
+				"fs.realpath": "1.0.0",
+				"inflight": "1.0.6",
+				"inherits": "2.0.4",
+				"minimatch": "3.0.4",
+				"once": "1.4.0",
+				"path-is-absolute": "1.0.1"
 			}
 		},
 		"glob-parent": {
@@ -8183,8 +8459,8 @@
 			"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
 			"dev": true,
 			"requires": {
-				"is-glob": "^3.1.0",
-				"path-dirname": "^1.0.0"
+				"is-glob": "3.1.0",
+				"path-dirname": "1.0.2"
 			},
 			"dependencies": {
 				"is-glob": {
@@ -8193,7 +8469,7 @@
 					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"dev": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"is-extglob": "2.1.1"
 					}
 				}
 			}
@@ -8209,8 +8485,8 @@
 			"resolved": "https://registry.npmjs.org/global-cache/-/global-cache-1.2.1.tgz",
 			"integrity": "sha512-EOeUaup5DgWKlCMhA9YFqNRIlZwoxt731jCh47WBV9fQqHgXhr3Fa55hfgIUqilIcPsfdNKN7LHjrNY+Km40KA==",
 			"requires": {
-				"define-properties": "^1.1.2",
-				"is-symbol": "^1.0.1"
+				"define-properties": "1.1.3",
+				"is-symbol": "1.0.3"
 			}
 		},
 		"global-modules": {
@@ -8219,7 +8495,7 @@
 			"integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
 			"dev": true,
 			"requires": {
-				"global-prefix": "^3.0.0"
+				"global-prefix": "3.0.0"
 			}
 		},
 		"global-prefix": {
@@ -8228,9 +8504,9 @@
 			"integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
 			"dev": true,
 			"requires": {
-				"ini": "^1.3.5",
-				"kind-of": "^6.0.2",
-				"which": "^1.3.1"
+				"ini": "1.3.8",
+				"kind-of": "6.0.3",
+				"which": "1.3.1"
 			}
 		},
 		"globals": {
@@ -8240,22 +8516,30 @@
 			"dev": true
 		},
 		"globby": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-			"integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+			"version": "8.0.2",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
+			"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
 			"dev": true,
 			"requires": {
-				"array-union": "^1.0.1",
-				"glob": "^7.0.3",
-				"object-assign": "^4.0.1",
-				"pify": "^2.0.0",
-				"pinkie-promise": "^2.0.0"
+				"array-union": "1.0.2",
+				"dir-glob": "2.0.0",
+				"fast-glob": "2.2.7",
+				"glob": "7.1.6",
+				"ignore": "3.3.10",
+				"pify": "3.0.0",
+				"slash": "1.0.0"
 			},
 			"dependencies": {
-				"pify": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+				"ignore": {
+					"version": "3.3.10",
+					"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
+					"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
+					"dev": true
+				},
+				"slash": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
+					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
 					"dev": true
 				}
 			}
@@ -8266,9 +8550,9 @@
 			"integrity": "sha512-7IDTQTIu2xzXkT+6mlluidnWo+BypnbSoEVVQCGfzqnl5Ik8d3e1d4wycb8Rj9tWW+Z39uPWsdlquqiqPCd/pA==",
 			"dev": true,
 			"requires": {
-				"glob": "~7.1.1",
-				"lodash": "~4.17.10",
-				"minimatch": "~3.0.2"
+				"glob": "7.1.6",
+				"lodash": "4.17.19",
+				"minimatch": "3.0.4"
 			}
 		},
 		"graceful-fs": {
@@ -8288,8 +8572,8 @@
 			"integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
 			"dev": true,
 			"requires": {
-				"duplexer": "^0.1.1",
-				"pify": "^4.0.1"
+				"duplexer": "0.1.2",
+				"pify": "4.0.1"
 			},
 			"dependencies": {
 				"pify": {
@@ -8318,8 +8602,8 @@
 			"integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
 			"dev": true,
 			"requires": {
-				"ajv": "^6.5.5",
-				"har-schema": "^2.0.0"
+				"ajv": "6.12.3",
+				"har-schema": "2.0.0"
 			}
 		},
 		"hard-rejection": {
@@ -8339,7 +8623,7 @@
 			"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
 			"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
 			"requires": {
-				"function-bind": "^1.1.1"
+				"function-bind": "1.1.1"
 			}
 		},
 		"has-ansi": {
@@ -8348,9 +8632,15 @@
 			"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "^2.0.0"
+				"ansi-regex": "2.1.1"
 			}
 		},
+		"has-bigints": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.1.tgz",
+			"integrity": "sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==",
+			"dev": true
+		},
 		"has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -8362,7 +8652,7 @@
 			"integrity": "sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc=",
 			"dev": true,
 			"requires": {
-				"is-glob": "^3.0.0"
+				"is-glob": "3.1.0"
 			},
 			"dependencies": {
 				"is-glob": {
@@ -8371,7 +8661,7 @@
 					"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
 					"dev": true,
 					"requires": {
-						"is-extglob": "^2.1.0"
+						"is-extglob": "2.1.1"
 					}
 				}
 			}
@@ -8393,9 +8683,9 @@
 			"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
 			"dev": true,
 			"requires": {
-				"get-value": "^2.0.6",
-				"has-values": "^1.0.0",
-				"isobject": "^3.0.0"
+				"get-value": "2.0.6",
+				"has-values": "1.0.0",
+				"isobject": "3.0.1"
 			}
 		},
 		"has-values": {
@@ -8404,8 +8694,8 @@
 			"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
 			"dev": true,
 			"requires": {
-				"is-number": "^3.0.0",
-				"kind-of": "^4.0.0"
+				"is-number": "3.0.0",
+				"kind-of": "4.0.0"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -8414,7 +8704,7 @@
 					"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -8424,9 +8714,9 @@
 			"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
 			"integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
 			"requires": {
-				"inherits": "^2.0.4",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"inherits": "2.0.4",
+				"readable-stream": "3.6.0",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"hash.js": {
@@ -8435,8 +8725,8 @@
 			"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.3",
-				"minimalistic-assert": "^1.0.1"
+				"inherits": "2.0.4",
+				"minimalistic-assert": "1.0.1"
 			}
 		},
 		"he": {
@@ -8465,10 +8755,10 @@
 			"resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz",
 			"integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=",
 			"requires": {
-				"invariant": "^2.2.1",
-				"loose-envify": "^1.2.0",
-				"query-string": "^4.2.2",
-				"warning": "^3.0.0"
+				"invariant": "2.2.4",
+				"loose-envify": "1.4.0",
+				"query-string": "4.3.4",
+				"warning": "3.0.0"
 			},
 			"dependencies": {
 				"query-string": {
@@ -8476,8 +8766,8 @@
 					"resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
 					"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
 					"requires": {
-						"object-assign": "^4.1.0",
-						"strict-uri-encode": "^1.0.0"
+						"object-assign": "4.1.1",
+						"strict-uri-encode": "1.1.0"
 					}
 				},
 				"warning": {
@@ -8485,7 +8775,7 @@
 					"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
 					"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
 					"requires": {
-						"loose-envify": "^1.0.0"
+						"loose-envify": "1.4.0"
 					}
 				}
 			}
@@ -8496,9 +8786,9 @@
 			"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 			"dev": true,
 			"requires": {
-				"hash.js": "^1.0.3",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.1"
+				"hash.js": "1.1.7",
+				"minimalistic-assert": "1.0.1",
+				"minimalistic-crypto-utils": "1.0.1"
 			}
 		},
 		"hoist-non-react-statics": {
@@ -8506,7 +8796,7 @@
 			"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
 			"integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
 			"requires": {
-				"react-is": "^16.7.0"
+				"react-is": "16.13.1"
 			}
 		},
 		"hosted-git-info": {
@@ -8520,10 +8810,10 @@
 			"integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"obuf": "^1.0.0",
-				"readable-stream": "^2.0.1",
-				"wbuf": "^1.1.0"
+				"inherits": "2.0.4",
+				"obuf": "1.1.2",
+				"readable-stream": "2.3.7",
+				"wbuf": "1.7.3"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -8532,13 +8822,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -8553,7 +8843,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -8582,13 +8872,13 @@
 			"integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
 			"dev": true,
 			"requires": {
-				"whatwg-encoding": "^1.0.1"
+				"whatwg-encoding": "1.0.5"
 			}
 		},
 		"html-entities": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz",
-			"integrity": "sha512-rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.4.0.tgz",
+			"integrity": "sha512-8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==",
 			"dev": true
 		},
 		"html-escaper": {
@@ -8602,13 +8892,13 @@
 			"resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz",
 			"integrity": "sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==",
 			"requires": {
-				"camel-case": "^4.1.1",
-				"clean-css": "^4.2.3",
-				"commander": "^4.1.1",
-				"he": "^1.2.0",
-				"param-case": "^3.0.3",
-				"relateurl": "^0.2.7",
-				"terser": "^4.6.3"
+				"camel-case": "4.1.1",
+				"clean-css": "4.2.3",
+				"commander": "4.1.1",
+				"he": "1.2.0",
+				"param-case": "3.0.3",
+				"relateurl": "0.2.7",
+				"terser": "4.8.0"
 			},
 			"dependencies": {
 				"commander": {
@@ -8629,11 +8919,11 @@
 			"integrity": "sha512-4Xzepf0qWxf8CGg7/WQM5qBB2Lc/NFI7MhU59eUDTkuQp3skZczH4UA1d6oQyDEIoMDgERVhRyTdtUPZ5s5HBg==",
 			"dev": true,
 			"requires": {
-				"html-minifier-terser": "^5.0.1",
-				"loader-utils": "^1.2.3",
-				"lodash": "^4.17.15",
-				"pretty-error": "^2.1.1",
-				"tapable": "^1.1.3",
+				"html-minifier-terser": "5.1.1",
+				"loader-utils": "1.4.0",
+				"lodash": "4.17.19",
+				"pretty-error": "2.1.2",
+				"tapable": "1.1.3",
 				"util.promisify": "1.0.0"
 			},
 			"dependencies": {
@@ -8643,8 +8933,8 @@
 					"integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
 					"dev": true,
 					"requires": {
-						"define-properties": "^1.1.2",
-						"object.getownpropertydescriptors": "^2.0.3"
+						"define-properties": "1.1.3",
+						"object.getownpropertydescriptors": "2.1.2"
 					}
 				}
 			}
@@ -8655,12 +8945,12 @@
 			"integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
 			"dev": true,
 			"requires": {
-				"domelementtype": "^1.3.1",
-				"domhandler": "^2.3.0",
-				"domutils": "^1.5.1",
-				"entities": "^1.1.1",
-				"inherits": "^2.0.1",
-				"readable-stream": "^3.1.1"
+				"domelementtype": "1.3.1",
+				"domhandler": "2.4.2",
+				"domutils": "1.7.0",
+				"entities": "1.1.2",
+				"inherits": "2.0.4",
+				"readable-stream": "3.6.0"
 			},
 			"dependencies": {
 				"entities": {
@@ -8683,10 +8973,10 @@
 			"integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
 			"dev": true,
 			"requires": {
-				"depd": "~1.1.2",
+				"depd": "1.1.2",
 				"inherits": "2.0.3",
 				"setprototypeof": "1.1.1",
-				"statuses": ">= 1.5.0 < 2",
+				"statuses": "1.5.0",
 				"toidentifier": "1.0.0"
 			},
 			"dependencies": {
@@ -8704,9 +8994,21 @@
 			"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
 			"dev": true,
 			"requires": {
-				"eventemitter3": "^4.0.0",
-				"follow-redirects": "^1.0.0",
-				"requires-port": "^1.0.0"
+				"eventemitter3": "4.0.7",
+				"follow-redirects": "1.12.1",
+				"requires-port": "1.0.0"
+			}
+		},
+		"http-proxy-middleware": {
+			"version": "0.19.1",
+			"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+			"integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+			"dev": true,
+			"requires": {
+				"http-proxy": "1.18.1",
+				"is-glob": "4.0.1",
+				"lodash": "4.17.19",
+				"micromatch": "3.1.10"
 			}
 		},
 		"http-signature": {
@@ -8715,9 +9017,9 @@
 			"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
 			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0",
-				"jsprim": "^1.2.2",
-				"sshpk": "^1.7.0"
+				"assert-plus": "1.0.0",
+				"jsprim": "1.4.1",
+				"sshpk": "1.16.1"
 			}
 		},
 		"https-browserify": {
@@ -8738,16 +9040,16 @@
 			"integrity": "sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==",
 			"dev": true,
 			"requires": {
-				"chalk": "^4.0.0",
-				"ci-info": "^2.0.0",
-				"compare-versions": "^3.6.0",
-				"cosmiconfig": "^7.0.0",
-				"find-versions": "^3.2.0",
-				"opencollective-postinstall": "^2.0.2",
-				"pkg-dir": "^4.2.0",
-				"please-upgrade-node": "^3.2.0",
-				"slash": "^3.0.0",
-				"which-pm-runs": "^1.0.0"
+				"chalk": "4.1.0",
+				"ci-info": "2.0.0",
+				"compare-versions": "3.6.0",
+				"cosmiconfig": "7.0.0",
+				"find-versions": "3.2.0",
+				"opencollective-postinstall": "2.0.3",
+				"pkg-dir": "4.2.0",
+				"please-upgrade-node": "3.2.0",
+				"slash": "3.0.0",
+				"which-pm-runs": "1.0.0"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -8756,7 +9058,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"chalk": {
@@ -8765,8 +9067,8 @@
 					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
+						"ansi-styles": "4.3.0",
+						"supports-color": "7.2.0"
 					}
 				},
 				"color-convert": {
@@ -8775,7 +9077,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -8790,11 +9092,11 @@
 					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
 					"dev": true,
 					"requires": {
-						"@types/parse-json": "^4.0.0",
-						"import-fresh": "^3.2.1",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0",
-						"yaml": "^1.10.0"
+						"@types/parse-json": "4.0.0",
+						"import-fresh": "3.2.2",
+						"parse-json": "5.1.0",
+						"path-type": "4.0.0",
+						"yaml": "1.10.0"
 					}
 				},
 				"find-up": {
@@ -8803,8 +9105,8 @@
 					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 					"dev": true,
 					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
+						"locate-path": "5.0.0",
+						"path-exists": "4.0.0"
 					}
 				},
 				"has-flag": {
@@ -8819,8 +9121,8 @@
 					"integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
 					"dev": true,
 					"requires": {
-						"parent-module": "^1.0.0",
-						"resolve-from": "^4.0.0"
+						"parent-module": "1.0.1",
+						"resolve-from": "4.0.0"
 					}
 				},
 				"locate-path": {
@@ -8829,7 +9131,7 @@
 					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 					"dev": true,
 					"requires": {
-						"p-locate": "^4.1.0"
+						"p-locate": "4.1.0"
 					}
 				},
 				"p-locate": {
@@ -8838,7 +9140,7 @@
 					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 					"dev": true,
 					"requires": {
-						"p-limit": "^2.2.0"
+						"p-limit": "2.3.0"
 					}
 				},
 				"parse-json": {
@@ -8847,10 +9149,10 @@
 					"integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
 					"dev": true,
 					"requires": {
-						"@babel/code-frame": "^7.0.0",
-						"error-ex": "^1.3.1",
-						"json-parse-even-better-errors": "^2.3.0",
-						"lines-and-columns": "^1.1.6"
+						"@babel/code-frame": "7.10.4",
+						"error-ex": "1.3.2",
+						"json-parse-even-better-errors": "2.3.1",
+						"lines-and-columns": "1.1.6"
 					}
 				},
 				"path-exists": {
@@ -8871,7 +9173,7 @@
 					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^4.0.0"
+						"find-up": "4.1.0"
 					}
 				},
 				"resolve-from": {
@@ -8892,7 +9194,7 @@
 					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "4.0.0"
 					}
 				}
 			}
@@ -8908,7 +9210,7 @@
 			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
+				"safer-buffer": "2.1.2"
 			}
 		},
 		"icss-utils": {
@@ -8917,7 +9219,7 @@
 			"integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.14"
+				"postcss": "7.0.35"
 			}
 		},
 		"identity-obj-proxy": {
@@ -8926,7 +9228,7 @@
 			"integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=",
 			"dev": true,
 			"requires": {
-				"harmony-reflect": "^1.4.6"
+				"harmony-reflect": "1.6.1"
 			}
 		},
 		"ieee754": {
@@ -8963,7 +9265,7 @@
 			"integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
 			"dev": true,
 			"requires": {
-				"import-from": "^2.1.0"
+				"import-from": "2.1.0"
 			}
 		},
 		"import-fresh": {
@@ -8972,8 +9274,8 @@
 			"integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
 			"dev": true,
 			"requires": {
-				"caller-path": "^2.0.0",
-				"resolve-from": "^3.0.0"
+				"caller-path": "2.0.0",
+				"resolve-from": "3.0.0"
 			}
 		},
 		"import-from": {
@@ -8982,7 +9284,7 @@
 			"integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
 			"dev": true,
 			"requires": {
-				"resolve-from": "^3.0.0"
+				"resolve-from": "3.0.0"
 			}
 		},
 		"import-local": {
@@ -8991,8 +9293,8 @@
 			"integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
 			"dev": true,
 			"requires": {
-				"pkg-dir": "^3.0.0",
-				"resolve-cwd": "^2.0.0"
+				"pkg-dir": "3.0.0",
+				"resolve-cwd": "2.0.0"
 			}
 		},
 		"imurmurhash": {
@@ -9030,8 +9332,8 @@
 			"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 			"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 			"requires": {
-				"once": "^1.3.0",
-				"wrappy": "1"
+				"once": "1.4.0",
+				"wrappy": "1.0.2"
 			}
 		},
 		"inherits": {
@@ -9040,9 +9342,9 @@
 			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
 		},
 		"ini": {
-			"version": "1.3.5",
-			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+			"version": "1.3.8",
+			"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
 			"dev": true
 		},
 		"inquirer": {
@@ -9051,28 +9353,28 @@
 			"integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
 			"dev": true,
 			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^4.1.0",
-				"cli-cursor": "^3.1.0",
-				"cli-width": "^3.0.0",
-				"external-editor": "^3.0.3",
-				"figures": "^3.0.0",
-				"lodash": "^4.17.19",
+				"ansi-escapes": "4.3.2",
+				"chalk": "4.1.0",
+				"cli-cursor": "3.1.0",
+				"cli-width": "3.0.0",
+				"external-editor": "3.1.0",
+				"figures": "3.2.0",
+				"lodash": "4.17.19",
 				"mute-stream": "0.0.8",
-				"run-async": "^2.4.0",
-				"rxjs": "^6.6.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0",
-				"through": "^2.3.6"
+				"run-async": "2.4.1",
+				"rxjs": "6.6.0",
+				"string-width": "4.2.2",
+				"strip-ansi": "6.0.0",
+				"through": "2.3.8"
 			},
 			"dependencies": {
 				"ansi-escapes": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-					"integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+					"version": "4.3.2",
+					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+					"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 					"dev": true,
 					"requires": {
-						"type-fest": "^0.11.0"
+						"type-fest": "0.21.3"
 					}
 				},
 				"ansi-regex": {
@@ -9082,13 +9384,12 @@
 					"dev": true
 				},
 				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"chalk": {
@@ -9097,8 +9398,8 @@
 					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
+						"ansi-styles": "4.3.0",
+						"supports-color": "7.2.0"
 					}
 				},
 				"cli-cursor": {
@@ -9107,7 +9408,7 @@
 					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
 					"dev": true,
 					"requires": {
-						"restore-cursor": "^3.1.0"
+						"restore-cursor": "3.1.0"
 					}
 				},
 				"color-convert": {
@@ -9116,7 +9417,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -9131,15 +9432,6 @@
 					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
 					"dev": true
 				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
 				"has-flag": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -9164,7 +9456,7 @@
 					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 					"dev": true,
 					"requires": {
-						"mimic-fn": "^2.1.0"
+						"mimic-fn": "2.1.0"
 					}
 				},
 				"restore-cursor": {
@@ -9173,19 +9465,19 @@
 					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
 					"dev": true,
 					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
+						"onetime": "5.1.2",
+						"signal-exit": "3.0.3"
 					}
 				},
 				"string-width": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+					"version": "4.2.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+					"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.0"
+						"emoji-regex": "8.0.0",
+						"is-fullwidth-code-point": "3.0.0",
+						"strip-ansi": "6.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -9194,22 +9486,22 @@
 					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^5.0.0"
+						"ansi-regex": "5.0.0"
 					}
 				},
 				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "4.0.0"
 					}
 				},
 				"type-fest": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-					"integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+					"version": "0.21.3",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
 					"dev": true
 				}
 			}
@@ -9225,19 +9517,19 @@
 			"integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
 			"dev": true,
 			"requires": {
-				"default-gateway": "^4.2.0",
-				"ipaddr.js": "^1.9.0"
+				"default-gateway": "4.2.0",
+				"ipaddr.js": "1.9.1"
 			}
 		},
 		"internal-slot": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.2.tgz",
-			"integrity": "sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz",
+			"integrity": "sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==",
 			"dev": true,
 			"requires": {
-				"es-abstract": "^1.17.0-next.1",
-				"has": "^1.0.3",
-				"side-channel": "^1.0.2"
+				"get-intrinsic": "1.1.1",
+				"has": "1.0.3",
+				"side-channel": "1.0.4"
 			}
 		},
 		"invariant": {
@@ -9245,7 +9537,7 @@
 			"resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
 			"integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
 			"requires": {
-				"loose-envify": "^1.0.0"
+				"loose-envify": "1.4.0"
 			}
 		},
 		"invert-kv": {
@@ -9284,7 +9576,7 @@
 			"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
 			"dev": true,
 			"requires": {
-				"kind-of": "^3.0.2"
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -9293,7 +9585,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -9309,13 +9601,28 @@
 			"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
 			"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
 		},
-		"is-binary-path": {
+		"is-bigint": {
 			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-			"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+			"resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.1.tgz",
+			"integrity": "sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg==",
+			"dev": true
+		},
+		"is-binary-path": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+			"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+			"dev": true,
+			"requires": {
+				"binary-extensions": "2.2.0"
+			}
+		},
+		"is-boolean-object": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.0.tgz",
+			"integrity": "sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==",
 			"dev": true,
 			"requires": {
-				"binary-extensions": "^1.0.0"
+				"call-bind": "1.0.2"
 			}
 		},
 		"is-buffer": {
@@ -9335,7 +9642,7 @@
 			"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
 			"dev": true,
 			"requires": {
-				"ci-info": "^2.0.0"
+				"ci-info": "2.0.0"
 			}
 		},
 		"is-color-stop": {
@@ -9344,12 +9651,12 @@
 			"integrity": "sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=",
 			"dev": true,
 			"requires": {
-				"css-color-names": "^0.0.4",
-				"hex-color-regex": "^1.1.0",
-				"hsl-regex": "^1.0.0",
-				"hsla-regex": "^1.0.0",
-				"rgb-regex": "^1.0.1",
-				"rgba-regex": "^1.0.0"
+				"css-color-names": "0.0.4",
+				"hex-color-regex": "1.1.0",
+				"hsl-regex": "1.0.0",
+				"hsla-regex": "1.0.0",
+				"rgb-regex": "1.0.1",
+				"rgba-regex": "1.0.0"
 			}
 		},
 		"is-data-descriptor": {
@@ -9358,7 +9665,7 @@
 			"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
 			"dev": true,
 			"requires": {
-				"kind-of": "^3.0.2"
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -9367,7 +9674,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -9383,9 +9690,9 @@
 			"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
 			"dev": true,
 			"requires": {
-				"is-accessor-descriptor": "^0.1.6",
-				"is-data-descriptor": "^0.1.4",
-				"kind-of": "^5.0.0"
+				"is-accessor-descriptor": "0.1.6",
+				"is-data-descriptor": "0.1.4",
+				"kind-of": "5.1.0"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -9403,9 +9710,9 @@
 			"dev": true
 		},
 		"is-docker": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz",
-			"integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.0.tgz",
+			"integrity": "sha512-K4GwB4i/HzhAzwP/XSlspzRdFTI9N8OxJOyOU7Y5Rz+p+WBokXWVWblaJeBkggthmoSV0OoGTH5thJNvplpkvQ==",
 			"dev": true
 		},
 		"is-domain": {
@@ -9438,7 +9745,7 @@
 			"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 			"dev": true,
 			"requires": {
-				"number-is-nan": "^1.0.0"
+				"number-is-nan": "1.0.1"
 			}
 		},
 		"is-function": {
@@ -9458,16 +9765,22 @@
 			"integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
 			"dev": true,
 			"requires": {
-				"is-extglob": "^2.1.1"
+				"is-extglob": "2.1.1"
 			}
 		},
+		"is-negative-zero": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz",
+			"integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==",
+			"dev": true
+		},
 		"is-number": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
 			"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
 			"dev": true,
 			"requires": {
-				"kind-of": "^3.0.2"
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -9476,17 +9789,47 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
 		},
+		"is-number-object": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.4.tgz",
+			"integrity": "sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==",
+			"dev": true
+		},
 		"is-obj": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
 			"integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
 			"dev": true
 		},
+		"is-path-cwd": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+			"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+			"dev": true
+		},
+		"is-path-in-cwd": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+			"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+			"dev": true,
+			"requires": {
+				"is-path-inside": "2.1.0"
+			}
+		},
+		"is-path-inside": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+			"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+			"dev": true,
+			"requires": {
+				"path-is-inside": "1.0.2"
+			}
+		},
 		"is-plain-obj": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
@@ -9498,7 +9841,7 @@
 			"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
 			"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
 			"requires": {
-				"isobject": "^3.0.1"
+				"isobject": "3.0.1"
 			}
 		},
 		"is-promise": {
@@ -9511,7 +9854,7 @@
 			"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
 			"integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
 			"requires": {
-				"has-symbols": "^1.0.1"
+				"has-symbols": "1.0.1"
 			}
 		},
 		"is-regexp": {
@@ -9549,7 +9892,7 @@
 			"integrity": "sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==",
 			"dev": true,
 			"requires": {
-				"html-comment-regex": "^1.1.0"
+				"html-comment-regex": "1.1.2"
 			}
 		},
 		"is-symbol": {
@@ -9557,7 +9900,7 @@
 			"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
 			"integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
 			"requires": {
-				"has-symbols": "^1.0.1"
+				"has-symbols": "1.0.1"
 			}
 		},
 		"is-touch-device": {
@@ -9610,8 +9953,8 @@
 			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
 			"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
 			"requires": {
-				"node-fetch": "^1.0.1",
-				"whatwg-fetch": ">=0.10.0"
+				"node-fetch": "1.7.3",
+				"whatwg-fetch": "3.1.1"
 			}
 		},
 		"isstream": {
@@ -9632,13 +9975,13 @@
 			"integrity": "sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==",
 			"dev": true,
 			"requires": {
-				"@babel/generator": "^7.4.0",
-				"@babel/parser": "^7.4.3",
-				"@babel/template": "^7.4.0",
-				"@babel/traverse": "^7.4.3",
-				"@babel/types": "^7.4.0",
-				"istanbul-lib-coverage": "^2.0.5",
-				"semver": "^6.0.0"
+				"@babel/generator": "7.13.9",
+				"@babel/parser": "7.13.13",
+				"@babel/template": "7.12.13",
+				"@babel/traverse": "7.13.13",
+				"@babel/types": "7.13.14",
+				"istanbul-lib-coverage": "2.0.5",
+				"semver": "6.3.0"
 			},
 			"dependencies": {
 				"semver": {
@@ -9655,9 +9998,9 @@
 			"integrity": "sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==",
 			"dev": true,
 			"requires": {
-				"istanbul-lib-coverage": "^2.0.5",
-				"make-dir": "^2.1.0",
-				"supports-color": "^6.1.0"
+				"istanbul-lib-coverage": "2.0.5",
+				"make-dir": "2.1.0",
+				"supports-color": "6.1.0"
 			},
 			"dependencies": {
 				"supports-color": {
@@ -9666,7 +10009,7 @@
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
@@ -9677,20 +10020,20 @@
 			"integrity": "sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==",
 			"dev": true,
 			"requires": {
-				"debug": "^4.1.1",
-				"istanbul-lib-coverage": "^2.0.5",
-				"make-dir": "^2.1.0",
-				"rimraf": "^2.6.3",
-				"source-map": "^0.6.1"
+				"debug": "4.3.1",
+				"istanbul-lib-coverage": "2.0.5",
+				"make-dir": "2.1.0",
+				"rimraf": "2.7.1",
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				},
 				"rimraf": {
@@ -9699,7 +10042,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				},
 				"source-map": {
@@ -9716,7 +10059,7 @@
 			"integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==",
 			"dev": true,
 			"requires": {
-				"html-escaper": "^2.0.0"
+				"html-escaper": "2.0.2"
 			}
 		},
 		"jalaali-js": {
@@ -9735,8 +10078,8 @@
 			"integrity": "sha512-YvkBL1Zm7d2B1+h5fHEOdyjCG+sGMz4f8D86/0HiqJ6MB4MnDc8FgP5vdWsGnemOQro7lnYo8UakZ3+5A0jxGw==",
 			"dev": true,
 			"requires": {
-				"import-local": "^2.0.0",
-				"jest-cli": "^24.9.0"
+				"import-local": "2.0.0",
+				"jest-cli": "24.9.0"
 			},
 			"dependencies": {
 				"jest-cli": {
@@ -9745,19 +10088,19 @@
 					"integrity": "sha512-+VLRKyitT3BWoMeSUIHRxV/2g8y9gw91Jh5z2UmXZzkZKpbC08CSehVxgHUwTpy+HwGcns/tqafQDJW7imYvGg==",
 					"dev": true,
 					"requires": {
-						"@jest/core": "^24.9.0",
-						"@jest/test-result": "^24.9.0",
-						"@jest/types": "^24.9.0",
-						"chalk": "^2.0.1",
-						"exit": "^0.1.2",
-						"import-local": "^2.0.0",
-						"is-ci": "^2.0.0",
-						"jest-config": "^24.9.0",
-						"jest-util": "^24.9.0",
-						"jest-validate": "^24.9.0",
-						"prompts": "^2.0.1",
-						"realpath-native": "^1.1.0",
-						"yargs": "^13.3.0"
+						"@jest/core": "24.9.0",
+						"@jest/test-result": "24.9.0",
+						"@jest/types": "24.9.0",
+						"chalk": "2.4.2",
+						"exit": "0.1.2",
+						"import-local": "2.0.0",
+						"is-ci": "2.0.0",
+						"jest-config": "24.9.0",
+						"jest-util": "24.9.0",
+						"jest-validate": "24.9.0",
+						"prompts": "2.4.1",
+						"realpath-native": "1.1.0",
+						"yargs": "13.3.2"
 					}
 				}
 			}
@@ -9768,9 +10111,9 @@
 			"integrity": "sha512-6aTWpe2mHF0DhL28WjdkO8LyGjs3zItPET4bMSeXU6T3ub4FPMw+mcOcbdGXQOAfmLcxofD23/5Bl9Z4AkFwqg==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"execa": "^1.0.0",
-				"throat": "^4.0.0"
+				"@jest/types": "24.9.0",
+				"execa": "1.0.0",
+				"throat": "4.1.0"
 			}
 		},
 		"jest-config": {
@@ -9779,23 +10122,23 @@
 			"integrity": "sha512-RATtQJtVYQrp7fvWg6f5y3pEFj9I+H8sWw4aKxnDZ96mob5i5SD6ZEGWgMLXQ4LE8UurrjbdlLWdUeo+28QpfQ==",
 			"dev": true,
 			"requires": {
-				"@babel/core": "^7.1.0",
-				"@jest/test-sequencer": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"babel-jest": "^24.9.0",
-				"chalk": "^2.0.1",
-				"glob": "^7.1.1",
-				"jest-environment-jsdom": "^24.9.0",
-				"jest-environment-node": "^24.9.0",
-				"jest-get-type": "^24.9.0",
-				"jest-jasmine2": "^24.9.0",
-				"jest-regex-util": "^24.3.0",
-				"jest-resolve": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jest-validate": "^24.9.0",
-				"micromatch": "^3.1.10",
-				"pretty-format": "^24.9.0",
-				"realpath-native": "^1.1.0"
+				"@babel/core": "7.9.0",
+				"@jest/test-sequencer": "24.9.0",
+				"@jest/types": "24.9.0",
+				"babel-jest": "24.9.0",
+				"chalk": "2.4.2",
+				"glob": "7.1.6",
+				"jest-environment-jsdom": "24.9.0",
+				"jest-environment-node": "24.9.0",
+				"jest-get-type": "24.9.0",
+				"jest-jasmine2": "24.9.0",
+				"jest-regex-util": "24.9.0",
+				"jest-resolve": "24.9.0",
+				"jest-util": "24.9.0",
+				"jest-validate": "24.9.0",
+				"micromatch": "3.1.10",
+				"pretty-format": "24.9.0",
+				"realpath-native": "1.1.0"
 			}
 		},
 		"jest-diff": {
@@ -9804,10 +10147,10 @@
 			"integrity": "sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.0.1",
-				"diff-sequences": "^24.9.0",
-				"jest-get-type": "^24.9.0",
-				"pretty-format": "^24.9.0"
+				"chalk": "2.4.2",
+				"diff-sequences": "24.9.0",
+				"jest-get-type": "24.9.0",
+				"pretty-format": "24.9.0"
 			}
 		},
 		"jest-docblock": {
@@ -9816,7 +10159,7 @@
 			"integrity": "sha512-F1DjdpDMJMA1cN6He0FNYNZlo3yYmOtRUnktrT9Q37njYzC5WEaDdmbynIgy0L/IvXvvgsG8OsqhLPXTpfmZAA==",
 			"dev": true,
 			"requires": {
-				"detect-newline": "^2.1.0"
+				"detect-newline": "2.1.0"
 			}
 		},
 		"jest-each": {
@@ -9825,11 +10168,11 @@
 			"integrity": "sha512-ONi0R4BvW45cw8s2Lrx8YgbeXL1oCQ/wIDwmsM3CqM/nlblNCPmnC3IPQlMbRFZu3wKdQ2U8BqM6lh3LJ5Bsog==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"chalk": "^2.0.1",
-				"jest-get-type": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"pretty-format": "^24.9.0"
+				"@jest/types": "24.9.0",
+				"chalk": "2.4.2",
+				"jest-get-type": "24.9.0",
+				"jest-util": "24.9.0",
+				"pretty-format": "24.9.0"
 			}
 		},
 		"jest-environment-jsdom": {
@@ -9838,128 +10181,12 @@
 			"integrity": "sha512-Zv9FV9NBRzLuALXjvRijO2351DRQeLYXtpD4xNvfoVFw21IOKNhZAEUKcbiEtjTkm2GsJ3boMVgkaR7rN8qetA==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "^24.9.0",
-				"@jest/fake-timers": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"jest-mock": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jsdom": "^11.5.1"
-			},
-			"dependencies": {
-				"abab": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
-					"integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
-					"dev": true
-				},
-				"acorn": {
-					"version": "5.7.4",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
-					"integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
-					"dev": true
-				},
-				"acorn-globals": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-					"integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
-					"dev": true,
-					"requires": {
-						"acorn": "^6.0.1",
-						"acorn-walk": "^6.0.1"
-					},
-					"dependencies": {
-						"acorn": {
-							"version": "6.4.1",
-							"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-							"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
-							"dev": true
-						}
-					}
-				},
-				"cssstyle": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-					"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
-					"dev": true,
-					"requires": {
-						"cssom": "0.3.x"
-					}
-				},
-				"jsdom": {
-					"version": "11.12.0",
-					"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
-					"integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
-					"dev": true,
-					"requires": {
-						"abab": "^2.0.0",
-						"acorn": "^5.5.3",
-						"acorn-globals": "^4.1.0",
-						"array-equal": "^1.0.0",
-						"cssom": ">= 0.3.2 < 0.4.0",
-						"cssstyle": "^1.0.0",
-						"data-urls": "^1.0.0",
-						"domexception": "^1.0.1",
-						"escodegen": "^1.9.1",
-						"html-encoding-sniffer": "^1.0.2",
-						"left-pad": "^1.3.0",
-						"nwsapi": "^2.0.7",
-						"parse5": "4.0.0",
-						"pn": "^1.1.0",
-						"request": "^2.87.0",
-						"request-promise-native": "^1.0.5",
-						"sax": "^1.2.4",
-						"symbol-tree": "^3.2.2",
-						"tough-cookie": "^2.3.4",
-						"w3c-hr-time": "^1.0.1",
-						"webidl-conversions": "^4.0.2",
-						"whatwg-encoding": "^1.0.3",
-						"whatwg-mimetype": "^2.1.0",
-						"whatwg-url": "^6.4.1",
-						"ws": "^5.2.0",
-						"xml-name-validator": "^3.0.0"
-					}
-				},
-				"parse5": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
-					"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
-					"dev": true
-				},
-				"tr46": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-					"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.1.0"
-					}
-				},
-				"whatwg-url": {
-					"version": "6.5.0",
-					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
-					"integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
-					"dev": true,
-					"requires": {
-						"lodash.sortby": "^4.7.0",
-						"tr46": "^1.0.1",
-						"webidl-conversions": "^4.0.2"
-					}
-				},
-				"ws": {
-					"version": "5.2.2",
-					"resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
-					"integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
-					"dev": true,
-					"requires": {
-						"async-limiter": "~1.0.0"
-					}
-				},
-				"xml-name-validator": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-					"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-					"dev": true
-				}
+				"@jest/environment": "24.9.0",
+				"@jest/fake-timers": "24.9.0",
+				"@jest/types": "24.9.0",
+				"jest-mock": "24.9.0",
+				"jest-util": "24.9.0",
+				"jsdom": "11.12.0"
 			}
 		},
 		"jest-environment-jsdom-fourteen": {
@@ -9968,77 +10195,52 @@
 			"integrity": "sha512-DojMX1sY+at5Ep+O9yME34CdidZnO3/zfPh8UW+918C5fIZET5vCjfkegixmsi7AtdYfkr4bPlIzmWnlvQkP7Q==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "^24.3.0",
-				"@jest/fake-timers": "^24.3.0",
-				"@jest/types": "^24.3.0",
-				"jest-mock": "^24.0.0",
-				"jest-util": "^24.0.0",
-				"jsdom": "^14.1.0"
+				"@jest/environment": "24.9.0",
+				"@jest/fake-timers": "24.9.0",
+				"@jest/types": "24.9.0",
+				"jest-mock": "24.9.0",
+				"jest-util": "24.9.0",
+				"jsdom": "14.1.0"
 			},
 			"dependencies": {
-				"abab": {
-					"version": "2.0.4",
-					"resolved": "https://registry.npmjs.org/abab/-/abab-2.0.4.tgz",
-					"integrity": "sha512-Eu9ELJWCz/c1e9gTiCY+FceWxcqzjYEbqMgtndnuSqZSUCOL73TWNK2mHfIj4Cw2E/ongOp+JISVNCmovt2KYQ==",
-					"dev": true
-				},
 				"acorn": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-					"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+					"version": "6.4.2",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+					"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
 					"dev": true
 				},
-				"acorn-globals": {
-					"version": "4.3.4",
-					"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz",
-					"integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==",
-					"dev": true,
-					"requires": {
-						"acorn": "^6.0.1",
-						"acorn-walk": "^6.0.1"
-					}
-				},
-				"cssstyle": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz",
-					"integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==",
-					"dev": true,
-					"requires": {
-						"cssom": "0.3.x"
-					}
-				},
 				"jsdom": {
 					"version": "14.1.0",
 					"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-14.1.0.tgz",
 					"integrity": "sha512-O901mfJSuTdwU2w3Sn+74T+RnDVP+FuV5fH8tcPWyqrseRAb0s5xOtPgCFiPOtLcyK7CLIJwPyD83ZqQWvA5ng==",
 					"dev": true,
 					"requires": {
-						"abab": "^2.0.0",
-						"acorn": "^6.0.4",
-						"acorn-globals": "^4.3.0",
-						"array-equal": "^1.0.0",
-						"cssom": "^0.3.4",
-						"cssstyle": "^1.1.1",
-						"data-urls": "^1.1.0",
-						"domexception": "^1.0.1",
-						"escodegen": "^1.11.0",
-						"html-encoding-sniffer": "^1.0.2",
-						"nwsapi": "^2.1.3",
+						"abab": "2.0.5",
+						"acorn": "6.4.2",
+						"acorn-globals": "4.3.4",
+						"array-equal": "1.0.0",
+						"cssom": "0.3.8",
+						"cssstyle": "1.4.0",
+						"data-urls": "1.1.0",
+						"domexception": "1.0.1",
+						"escodegen": "1.14.3",
+						"html-encoding-sniffer": "1.0.2",
+						"nwsapi": "2.2.0",
 						"parse5": "5.1.0",
-						"pn": "^1.1.0",
-						"request": "^2.88.0",
-						"request-promise-native": "^1.0.5",
-						"saxes": "^3.1.9",
-						"symbol-tree": "^3.2.2",
-						"tough-cookie": "^2.5.0",
-						"w3c-hr-time": "^1.0.1",
-						"w3c-xmlserializer": "^1.1.2",
-						"webidl-conversions": "^4.0.2",
-						"whatwg-encoding": "^1.0.5",
-						"whatwg-mimetype": "^2.3.0",
-						"whatwg-url": "^7.0.0",
-						"ws": "^6.1.2",
-						"xml-name-validator": "^3.0.0"
+						"pn": "1.1.0",
+						"request": "2.88.2",
+						"request-promise-native": "1.0.9",
+						"saxes": "3.1.11",
+						"symbol-tree": "3.2.4",
+						"tough-cookie": "2.5.0",
+						"w3c-hr-time": "1.0.2",
+						"w3c-xmlserializer": "1.1.2",
+						"webidl-conversions": "4.0.2",
+						"whatwg-encoding": "1.0.5",
+						"whatwg-mimetype": "2.3.0",
+						"whatwg-url": "7.1.0",
+						"ws": "6.2.1",
+						"xml-name-validator": "3.0.0"
 					}
 				},
 				"parse5": {
@@ -10047,31 +10249,25 @@
 					"integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==",
 					"dev": true
 				},
-				"tr46": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
-					"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
-					"dev": true,
-					"requires": {
-						"punycode": "^2.1.0"
-					}
-				},
 				"whatwg-url": {
 					"version": "7.1.0",
 					"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",
 					"integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",
 					"dev": true,
 					"requires": {
-						"lodash.sortby": "^4.7.0",
-						"tr46": "^1.0.1",
-						"webidl-conversions": "^4.0.2"
+						"lodash.sortby": "4.7.0",
+						"tr46": "1.0.1",
+						"webidl-conversions": "4.0.2"
 					}
 				},
-				"xml-name-validator": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-					"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-					"dev": true
+				"ws": {
+					"version": "6.2.1",
+					"resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+					"dev": true,
+					"requires": {
+						"async-limiter": "1.0.1"
+					}
 				}
 			}
 		},
@@ -10081,11 +10277,11 @@
 			"integrity": "sha512-6d4V2f4nxzIzwendo27Tr0aFm+IXWa0XEUnaH6nU0FMaozxovt+sfRvh4J47wL1OvF83I3SSTu0XK+i4Bqe7uA==",
 			"dev": true,
 			"requires": {
-				"@jest/environment": "^24.9.0",
-				"@jest/fake-timers": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"jest-mock": "^24.9.0",
-				"jest-util": "^24.9.0"
+				"@jest/environment": "24.9.0",
+				"@jest/fake-timers": "24.9.0",
+				"@jest/types": "24.9.0",
+				"jest-mock": "24.9.0",
+				"jest-util": "24.9.0"
 			}
 		},
 		"jest-get-type": {
@@ -10100,18 +10296,30 @@
 			"integrity": "sha512-kfVFmsuWui2Sj1Rp1AJ4D9HqJwE4uwTlS/vO+eRUaMmd54BFpli2XhMQnPC2k4cHFVbB2Q2C+jtI1AGLgEnCjQ==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"anymatch": "^2.0.0",
-				"fb-watchman": "^2.0.0",
-				"fsevents": "^1.2.7",
-				"graceful-fs": "^4.1.15",
-				"invariant": "^2.2.4",
-				"jest-serializer": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jest-worker": "^24.9.0",
-				"micromatch": "^3.1.10",
-				"sane": "^4.0.3",
-				"walker": "^1.0.7"
+				"@jest/types": "24.9.0",
+				"anymatch": "2.0.0",
+				"fb-watchman": "2.0.1",
+				"fsevents": "1.2.13",
+				"graceful-fs": "4.2.4",
+				"invariant": "2.2.4",
+				"jest-serializer": "24.9.0",
+				"jest-util": "24.9.0",
+				"jest-worker": "24.9.0",
+				"micromatch": "3.1.10",
+				"sane": "4.1.0",
+				"walker": "1.0.7"
+			},
+			"dependencies": {
+				"fsevents": {
+					"version": "1.2.13",
+					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+					"dev": true,
+					"optional": true,
+					"requires": {
+						"nan": "2.14.1"
+					}
+				}
 			}
 		},
 		"jest-jasmine2": {
@@ -10120,22 +10328,22 @@
 			"integrity": "sha512-Cq7vkAgaYKp+PsX+2/JbTarrk0DmNhsEtqBXNwUHkdlbrTBLtMJINADf2mf5FkowNsq8evbPc07/qFO0AdKTzw==",
 			"dev": true,
 			"requires": {
-				"@babel/traverse": "^7.1.0",
-				"@jest/environment": "^24.9.0",
-				"@jest/test-result": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"chalk": "^2.0.1",
-				"co": "^4.6.0",
-				"expect": "^24.9.0",
-				"is-generator-fn": "^2.0.0",
-				"jest-each": "^24.9.0",
-				"jest-matcher-utils": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-runtime": "^24.9.0",
-				"jest-snapshot": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"pretty-format": "^24.9.0",
-				"throat": "^4.0.0"
+				"@babel/traverse": "7.13.13",
+				"@jest/environment": "24.9.0",
+				"@jest/test-result": "24.9.0",
+				"@jest/types": "24.9.0",
+				"chalk": "2.4.2",
+				"co": "4.6.0",
+				"expect": "24.9.0",
+				"is-generator-fn": "2.1.0",
+				"jest-each": "24.9.0",
+				"jest-matcher-utils": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-runtime": "24.9.0",
+				"jest-snapshot": "24.9.0",
+				"jest-util": "24.9.0",
+				"pretty-format": "24.9.0",
+				"throat": "4.1.0"
 			}
 		},
 		"jest-leak-detector": {
@@ -10144,8 +10352,8 @@
 			"integrity": "sha512-tYkFIDsiKTGwb2FG1w8hX9V0aUb2ot8zY/2nFg087dUageonw1zrLMP4W6zsRO59dPkTSKie+D4rhMuP9nRmrA==",
 			"dev": true,
 			"requires": {
-				"jest-get-type": "^24.9.0",
-				"pretty-format": "^24.9.0"
+				"jest-get-type": "24.9.0",
+				"pretty-format": "24.9.0"
 			}
 		},
 		"jest-matcher-utils": {
@@ -10154,10 +10362,10 @@
 			"integrity": "sha512-OZz2IXsu6eaiMAwe67c1T+5tUAtQyQx27/EMEkbFAGiw52tB9em+uGbzpcgYVpA8wl0hlxKPZxrly4CXU/GjHA==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.0.1",
-				"jest-diff": "^24.9.0",
-				"jest-get-type": "^24.9.0",
-				"pretty-format": "^24.9.0"
+				"chalk": "2.4.2",
+				"jest-diff": "24.9.0",
+				"jest-get-type": "24.9.0",
+				"pretty-format": "24.9.0"
 			}
 		},
 		"jest-message-util": {
@@ -10166,14 +10374,14 @@
 			"integrity": "sha512-oCj8FiZ3U0hTP4aSui87P4L4jC37BtQwUMqk+zk/b11FR19BJDeZsZAvIHutWnmtw7r85UmR3CEWZ0HWU2mAlw==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.0.0",
-				"@jest/test-result": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"@types/stack-utils": "^1.0.1",
-				"chalk": "^2.0.1",
-				"micromatch": "^3.1.10",
-				"slash": "^2.0.0",
-				"stack-utils": "^1.0.1"
+				"@babel/code-frame": "7.10.4",
+				"@jest/test-result": "24.9.0",
+				"@jest/types": "24.9.0",
+				"@types/stack-utils": "1.0.1",
+				"chalk": "2.4.2",
+				"micromatch": "3.1.10",
+				"slash": "2.0.0",
+				"stack-utils": "1.0.5"
 			}
 		},
 		"jest-mock": {
@@ -10182,7 +10390,7 @@
 			"integrity": "sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0"
+				"@jest/types": "24.9.0"
 			}
 		},
 		"jest-pnp-resolver": {
@@ -10203,11 +10411,11 @@
 			"integrity": "sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"browser-resolve": "^1.11.3",
-				"chalk": "^2.0.1",
-				"jest-pnp-resolver": "^1.2.1",
-				"realpath-native": "^1.1.0"
+				"@jest/types": "24.9.0",
+				"browser-resolve": "1.11.3",
+				"chalk": "2.4.2",
+				"jest-pnp-resolver": "1.2.2",
+				"realpath-native": "1.1.0"
 			}
 		},
 		"jest-resolve-dependencies": {
@@ -10216,9 +10424,9 @@
 			"integrity": "sha512-Fm7b6AlWnYhT0BXy4hXpactHIqER7erNgIsIozDXWl5dVm+k8XdGVe1oTg1JyaFnOxarMEbax3wyRJqGP2Pq+g==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"jest-regex-util": "^24.3.0",
-				"jest-snapshot": "^24.9.0"
+				"@jest/types": "24.9.0",
+				"jest-regex-util": "24.9.0",
+				"jest-snapshot": "24.9.0"
 			}
 		},
 		"jest-runner": {
@@ -10227,25 +10435,25 @@
 			"integrity": "sha512-KksJQyI3/0mhcfspnxxEOBueGrd5E4vV7ADQLT9ESaCzz02WnbdbKWIf5Mkaucoaj7obQckYPVX6JJhgUcoWWg==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "^24.7.1",
-				"@jest/environment": "^24.9.0",
-				"@jest/test-result": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"chalk": "^2.4.2",
-				"exit": "^0.1.2",
-				"graceful-fs": "^4.1.15",
-				"jest-config": "^24.9.0",
-				"jest-docblock": "^24.3.0",
-				"jest-haste-map": "^24.9.0",
-				"jest-jasmine2": "^24.9.0",
-				"jest-leak-detector": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-resolve": "^24.9.0",
-				"jest-runtime": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jest-worker": "^24.6.0",
-				"source-map-support": "^0.5.6",
-				"throat": "^4.0.0"
+				"@jest/console": "24.9.0",
+				"@jest/environment": "24.9.0",
+				"@jest/test-result": "24.9.0",
+				"@jest/types": "24.9.0",
+				"chalk": "2.4.2",
+				"exit": "0.1.2",
+				"graceful-fs": "4.2.4",
+				"jest-config": "24.9.0",
+				"jest-docblock": "24.9.0",
+				"jest-haste-map": "24.9.0",
+				"jest-jasmine2": "24.9.0",
+				"jest-leak-detector": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-resolve": "24.9.0",
+				"jest-runtime": "24.9.0",
+				"jest-util": "24.9.0",
+				"jest-worker": "24.9.0",
+				"source-map-support": "0.5.19",
+				"throat": "4.1.0"
 			}
 		},
 		"jest-runtime": {
@@ -10254,29 +10462,29 @@
 			"integrity": "sha512-8oNqgnmF3v2J6PVRM2Jfuj8oX3syKmaynlDMMKQ4iyzbQzIG6th5ub/lM2bCMTmoTKM3ykcUYI2Pw9xwNtjMnw==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "^24.7.1",
-				"@jest/environment": "^24.9.0",
-				"@jest/source-map": "^24.3.0",
-				"@jest/transform": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"@types/yargs": "^13.0.0",
-				"chalk": "^2.0.1",
-				"exit": "^0.1.2",
-				"glob": "^7.1.3",
-				"graceful-fs": "^4.1.15",
-				"jest-config": "^24.9.0",
-				"jest-haste-map": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-mock": "^24.9.0",
-				"jest-regex-util": "^24.3.0",
-				"jest-resolve": "^24.9.0",
-				"jest-snapshot": "^24.9.0",
-				"jest-util": "^24.9.0",
-				"jest-validate": "^24.9.0",
-				"realpath-native": "^1.1.0",
-				"slash": "^2.0.0",
-				"strip-bom": "^3.0.0",
-				"yargs": "^13.3.0"
+				"@jest/console": "24.9.0",
+				"@jest/environment": "24.9.0",
+				"@jest/source-map": "24.9.0",
+				"@jest/transform": "24.9.0",
+				"@jest/types": "24.9.0",
+				"@types/yargs": "13.0.11",
+				"chalk": "2.4.2",
+				"exit": "0.1.2",
+				"glob": "7.1.6",
+				"graceful-fs": "4.2.4",
+				"jest-config": "24.9.0",
+				"jest-haste-map": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-mock": "24.9.0",
+				"jest-regex-util": "24.9.0",
+				"jest-resolve": "24.9.0",
+				"jest-snapshot": "24.9.0",
+				"jest-util": "24.9.0",
+				"jest-validate": "24.9.0",
+				"realpath-native": "1.1.0",
+				"slash": "2.0.0",
+				"strip-bom": "3.0.0",
+				"yargs": "13.3.2"
 			},
 			"dependencies": {
 				"strip-bom": {
@@ -10299,19 +10507,19 @@
 			"integrity": "sha512-uI/rszGSs73xCM0l+up7O7a40o90cnrk429LOiK3aeTvfC0HHmldbd81/B7Ix81KSFe1lwkbl7GnBGG4UfuDew==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.0.0",
-				"@jest/types": "^24.9.0",
-				"chalk": "^2.0.1",
-				"expect": "^24.9.0",
-				"jest-diff": "^24.9.0",
-				"jest-get-type": "^24.9.0",
-				"jest-matcher-utils": "^24.9.0",
-				"jest-message-util": "^24.9.0",
-				"jest-resolve": "^24.9.0",
-				"mkdirp": "^0.5.1",
-				"natural-compare": "^1.4.0",
-				"pretty-format": "^24.9.0",
-				"semver": "^6.2.0"
+				"@babel/types": "7.13.14",
+				"@jest/types": "24.9.0",
+				"chalk": "2.4.2",
+				"expect": "24.9.0",
+				"jest-diff": "24.9.0",
+				"jest-get-type": "24.9.0",
+				"jest-matcher-utils": "24.9.0",
+				"jest-message-util": "24.9.0",
+				"jest-resolve": "24.9.0",
+				"mkdirp": "0.5.5",
+				"natural-compare": "1.4.0",
+				"pretty-format": "24.9.0",
+				"semver": "6.3.0"
 			},
 			"dependencies": {
 				"semver": {
@@ -10328,18 +10536,18 @@
 			"integrity": "sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==",
 			"dev": true,
 			"requires": {
-				"@jest/console": "^24.9.0",
-				"@jest/fake-timers": "^24.9.0",
-				"@jest/source-map": "^24.9.0",
-				"@jest/test-result": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"callsites": "^3.0.0",
-				"chalk": "^2.0.1",
-				"graceful-fs": "^4.1.15",
-				"is-ci": "^2.0.0",
-				"mkdirp": "^0.5.1",
-				"slash": "^2.0.0",
-				"source-map": "^0.6.0"
+				"@jest/console": "24.9.0",
+				"@jest/fake-timers": "24.9.0",
+				"@jest/source-map": "24.9.0",
+				"@jest/test-result": "24.9.0",
+				"@jest/types": "24.9.0",
+				"callsites": "3.1.0",
+				"chalk": "2.4.2",
+				"graceful-fs": "4.2.4",
+				"is-ci": "2.0.0",
+				"mkdirp": "0.5.5",
+				"slash": "2.0.0",
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"callsites": {
@@ -10362,12 +10570,12 @@
 			"integrity": "sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"camelcase": "^5.3.1",
-				"chalk": "^2.0.1",
-				"jest-get-type": "^24.9.0",
-				"leven": "^3.1.0",
-				"pretty-format": "^24.9.0"
+				"@jest/types": "24.9.0",
+				"camelcase": "5.3.1",
+				"chalk": "2.4.2",
+				"jest-get-type": "24.9.0",
+				"leven": "3.1.0",
+				"pretty-format": "24.9.0"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -10384,22 +10592,22 @@
 			"integrity": "sha512-f7VpLebTdaXs81rg/oj4Vg/ObZy2QtGzAmGLNsqUS5G5KtSN68tFcIsbvNODfNyQxU78g7D8x77o3bgfBTR+2Q==",
 			"dev": true,
 			"requires": {
-				"ansi-escapes": "^4.2.1",
-				"chalk": "^2.4.1",
-				"jest-regex-util": "^24.9.0",
-				"jest-watcher": "^24.3.0",
-				"slash": "^3.0.0",
-				"string-length": "^3.1.0",
-				"strip-ansi": "^5.0.0"
+				"ansi-escapes": "4.3.2",
+				"chalk": "2.4.2",
+				"jest-regex-util": "24.9.0",
+				"jest-watcher": "24.9.0",
+				"slash": "3.0.0",
+				"string-length": "3.1.0",
+				"strip-ansi": "5.2.0"
 			},
 			"dependencies": {
 				"ansi-escapes": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-					"integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+					"version": "4.3.2",
+					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+					"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 					"dev": true,
 					"requires": {
-						"type-fest": "^0.11.0"
+						"type-fest": "0.21.3"
 					}
 				},
 				"ansi-regex": {
@@ -10420,8 +10628,8 @@
 					"integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==",
 					"dev": true,
 					"requires": {
-						"astral-regex": "^1.0.0",
-						"strip-ansi": "^5.2.0"
+						"astral-regex": "1.0.0",
+						"strip-ansi": "5.2.0"
 					}
 				},
 				"strip-ansi": {
@@ -10430,13 +10638,13 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					}
 				},
 				"type-fest": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-					"integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+					"version": "0.21.3",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
 					"dev": true
 				}
 			}
@@ -10447,13 +10655,13 @@
 			"integrity": "sha512-+/fLOfKPXXYJDYlks62/4R4GoT+GU1tYZed99JSCOsmzkkF7727RqKrjNAxtfO4YpGv11wybgRvCjR73lK2GZw==",
 			"dev": true,
 			"requires": {
-				"@jest/test-result": "^24.9.0",
-				"@jest/types": "^24.9.0",
-				"@types/yargs": "^13.0.0",
-				"ansi-escapes": "^3.0.0",
-				"chalk": "^2.0.1",
-				"jest-util": "^24.9.0",
-				"string-length": "^2.0.0"
+				"@jest/test-result": "24.9.0",
+				"@jest/types": "24.9.0",
+				"@types/yargs": "13.0.11",
+				"ansi-escapes": "3.2.0",
+				"chalk": "2.4.2",
+				"jest-util": "24.9.0",
+				"string-length": "2.0.0"
 			}
 		},
 		"jest-worker": {
@@ -10462,8 +10670,8 @@
 			"integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
 			"dev": true,
 			"requires": {
-				"merge-stream": "^2.0.0",
-				"supports-color": "^6.1.0"
+				"merge-stream": "2.0.0",
+				"supports-color": "6.1.0"
 			},
 			"dependencies": {
 				"supports-color": {
@@ -10472,7 +10680,7 @@
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
@@ -10494,13 +10702,13 @@
 			"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
 		},
 		"js-yaml": {
-			"version": "3.14.0",
-			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz",
-			"integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==",
+			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
 			"requires": {
-				"argparse": "^1.0.7",
-				"esprima": "^4.0.0"
+				"argparse": "1.0.10",
+				"esprima": "4.0.1"
 			}
 		},
 		"jsbn": {
@@ -10509,6 +10717,48 @@
 			"integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
 			"dev": true
 		},
+		"jsdom": {
+			"version": "11.12.0",
+			"resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.12.0.tgz",
+			"integrity": "sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==",
+			"dev": true,
+			"requires": {
+				"abab": "2.0.5",
+				"acorn": "5.7.4",
+				"acorn-globals": "4.3.4",
+				"array-equal": "1.0.0",
+				"cssom": "0.3.8",
+				"cssstyle": "1.4.0",
+				"data-urls": "1.1.0",
+				"domexception": "1.0.1",
+				"escodegen": "1.14.3",
+				"html-encoding-sniffer": "1.0.2",
+				"left-pad": "1.3.0",
+				"nwsapi": "2.2.0",
+				"parse5": "4.0.0",
+				"pn": "1.1.0",
+				"request": "2.88.2",
+				"request-promise-native": "1.0.9",
+				"sax": "1.2.4",
+				"symbol-tree": "3.2.4",
+				"tough-cookie": "2.5.0",
+				"w3c-hr-time": "1.0.2",
+				"webidl-conversions": "4.0.2",
+				"whatwg-encoding": "1.0.5",
+				"whatwg-mimetype": "2.3.0",
+				"whatwg-url": "6.5.0",
+				"ws": "5.2.2",
+				"xml-name-validator": "3.0.0"
+			},
+			"dependencies": {
+				"acorn": {
+					"version": "5.7.4",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+					"integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==",
+					"dev": true
+				}
+			}
+		},
 		"jsesc": {
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
@@ -10544,7 +10794,7 @@
 			"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
 			"dev": true,
 			"requires": {
-				"jsonify": "~0.0.0"
+				"jsonify": "0.0.0"
 			}
 		},
 		"json-stable-stringify-without-jsonify": {
@@ -10563,7 +10813,7 @@
 			"resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
 			"integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
 			"requires": {
-				"string-convert": "^0.2.0"
+				"string-convert": "0.2.1"
 			}
 		},
 		"json3": {
@@ -10573,12 +10823,12 @@
 			"dev": true
 		},
 		"json5": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-			"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
 			"dev": true,
 			"requires": {
-				"minimist": "^1.2.5"
+				"minimist": "1.2.5"
 			}
 		},
 		"jsonfile": {
@@ -10587,7 +10837,7 @@
 			"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.6"
+				"graceful-fs": "4.2.4"
 			}
 		},
 		"jsonify": {
@@ -10614,8 +10864,8 @@
 			"integrity": "sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w==",
 			"dev": true,
 			"requires": {
-				"array-includes": "^3.1.1",
-				"object.assign": "^4.1.0"
+				"array-includes": "3.1.3",
+				"object.assign": "4.1.0"
 			}
 		},
 		"junk": {
@@ -10658,8 +10908,8 @@
 			"integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==",
 			"dev": true,
 			"requires": {
-				"lodash": "^4.17.5",
-				"webpack-sources": "^1.1.0"
+				"lodash": "4.17.19",
+				"webpack-sources": "1.4.3"
 			}
 		},
 		"lazy-cache": {
@@ -10674,7 +10924,7 @@
 			"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
 			"dev": true,
 			"requires": {
-				"invert-kv": "^1.0.0"
+				"invert-kv": "1.0.0"
 			}
 		},
 		"left-pad": {
@@ -10695,7 +10945,7 @@
 			"integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
 			"dev": true,
 			"requires": {
-				"leven": "^3.1.0"
+				"leven": "3.1.0"
 			}
 		},
 		"levn": {
@@ -10704,8 +10954,8 @@
 			"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
 			"dev": true,
 			"requires": {
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2"
+				"prelude-ls": "1.1.2",
+				"type-check": "0.3.2"
 			}
 		},
 		"line-height": {
@@ -10713,7 +10963,7 @@
 			"resolved": "https://registry.npmjs.org/line-height/-/line-height-0.3.1.tgz",
 			"integrity": "sha1-SxIF7d4YKHKl76PI9iCzGHqcVMk=",
 			"requires": {
-				"computed-style": "~0.1.3"
+				"computed-style": "0.1.4"
 			}
 		},
 		"lines-and-columns": {
@@ -10727,7 +10977,7 @@
 			"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz",
 			"integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==",
 			"requires": {
-				"uc.micro": "^1.0.1"
+				"uc.micro": "1.0.6"
 			}
 		},
 		"lint-staged": {
@@ -10736,21 +10986,21 @@
 			"integrity": "sha512-fTkTGFtwFIJJzn/PbUO3RXyEBHIhbfYBE7+rJyLcOXabViaO/h6OslgeK6zpeUtzkDrzkgyAYDTLAwx6JzDTHw==",
 			"dev": true,
 			"requires": {
-				"chalk": "^4.1.0",
-				"cli-truncate": "^2.1.0",
-				"commander": "^6.2.0",
-				"cosmiconfig": "^7.0.0",
-				"debug": "^4.2.0",
-				"dedent": "^0.7.0",
-				"enquirer": "^2.3.6",
-				"execa": "^4.1.0",
-				"listr2": "^3.2.2",
-				"log-symbols": "^4.0.0",
-				"micromatch": "^4.0.2",
-				"normalize-path": "^3.0.0",
-				"please-upgrade-node": "^3.2.0",
+				"chalk": "4.1.0",
+				"cli-truncate": "2.1.0",
+				"commander": "6.2.0",
+				"cosmiconfig": "7.0.0",
+				"debug": "4.2.0",
+				"dedent": "0.7.0",
+				"enquirer": "2.3.6",
+				"execa": "4.1.0",
+				"listr2": "3.2.2",
+				"log-symbols": "4.0.0",
+				"micromatch": "4.0.2",
+				"normalize-path": "3.0.0",
+				"please-upgrade-node": "3.2.0",
 				"string-argv": "0.3.1",
-				"stringify-object": "^3.3.0"
+				"stringify-object": "3.3.0"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -10759,7 +11009,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"braces": {
@@ -10768,7 +11018,7 @@
 					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
 					"dev": true,
 					"requires": {
-						"fill-range": "^7.0.1"
+						"fill-range": "7.0.1"
 					}
 				},
 				"chalk": {
@@ -10777,8 +11027,8 @@
 					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
+						"ansi-styles": "4.3.0",
+						"supports-color": "7.2.0"
 					}
 				},
 				"color-convert": {
@@ -10787,7 +11037,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -10808,11 +11058,11 @@
 					"integrity": "sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==",
 					"dev": true,
 					"requires": {
-						"@types/parse-json": "^4.0.0",
-						"import-fresh": "^3.2.1",
-						"parse-json": "^5.0.0",
-						"path-type": "^4.0.0",
-						"yaml": "^1.10.0"
+						"@types/parse-json": "4.0.0",
+						"import-fresh": "3.2.2",
+						"parse-json": "5.1.0",
+						"path-type": "4.0.0",
+						"yaml": "1.10.0"
 					}
 				},
 				"cross-spawn": {
@@ -10821,9 +11071,9 @@
 					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 					"dev": true,
 					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
+						"path-key": "3.1.1",
+						"shebang-command": "2.0.0",
+						"which": "2.0.2"
 					}
 				},
 				"debug": {
@@ -10841,15 +11091,15 @@
 					"integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
 					"dev": true,
 					"requires": {
-						"cross-spawn": "^7.0.0",
-						"get-stream": "^5.0.0",
-						"human-signals": "^1.1.1",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.0",
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2",
-						"strip-final-newline": "^2.0.0"
+						"cross-spawn": "7.0.3",
+						"get-stream": "5.2.0",
+						"human-signals": "1.1.1",
+						"is-stream": "2.0.0",
+						"merge-stream": "2.0.0",
+						"npm-run-path": "4.0.1",
+						"onetime": "5.1.2",
+						"signal-exit": "3.0.3",
+						"strip-final-newline": "2.0.0"
 					}
 				},
 				"fill-range": {
@@ -10858,7 +11108,7 @@
 					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 					"dev": true,
 					"requires": {
-						"to-regex-range": "^5.0.1"
+						"to-regex-range": "5.0.1"
 					}
 				},
 				"get-stream": {
@@ -10867,7 +11117,7 @@
 					"integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
 					"dev": true,
 					"requires": {
-						"pump": "^3.0.0"
+						"pump": "3.0.0"
 					}
 				},
 				"has-flag": {
@@ -10882,8 +11132,8 @@
 					"integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==",
 					"dev": true,
 					"requires": {
-						"parent-module": "^1.0.0",
-						"resolve-from": "^4.0.0"
+						"parent-module": "1.0.1",
+						"resolve-from": "4.0.0"
 					}
 				},
 				"is-number": {
@@ -10904,8 +11154,8 @@
 					"integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==",
 					"dev": true,
 					"requires": {
-						"braces": "^3.0.1",
-						"picomatch": "^2.0.5"
+						"braces": "3.0.2",
+						"picomatch": "2.2.2"
 					}
 				},
 				"mimic-fn": {
@@ -10920,7 +11170,7 @@
 					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
 					"dev": true,
 					"requires": {
-						"path-key": "^3.0.0"
+						"path-key": "3.1.1"
 					}
 				},
 				"onetime": {
@@ -10929,7 +11179,7 @@
 					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 					"dev": true,
 					"requires": {
-						"mimic-fn": "^2.1.0"
+						"mimic-fn": "2.1.0"
 					}
 				},
 				"parse-json": {
@@ -10938,10 +11188,10 @@
 					"integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==",
 					"dev": true,
 					"requires": {
-						"@babel/code-frame": "^7.0.0",
-						"error-ex": "^1.3.1",
-						"json-parse-even-better-errors": "^2.3.0",
-						"lines-and-columns": "^1.1.6"
+						"@babel/code-frame": "7.10.4",
+						"error-ex": "1.3.2",
+						"json-parse-even-better-errors": "2.3.1",
+						"lines-and-columns": "1.1.6"
 					}
 				},
 				"path-key": {
@@ -10968,7 +11218,7 @@
 					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 					"dev": true,
 					"requires": {
-						"shebang-regex": "^3.0.0"
+						"shebang-regex": "3.0.0"
 					}
 				},
 				"shebang-regex": {
@@ -10983,7 +11233,7 @@
 					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "4.0.0"
 					}
 				},
 				"to-regex-range": {
@@ -10992,7 +11242,7 @@
 					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 					"dev": true,
 					"requires": {
-						"is-number": "^7.0.0"
+						"is-number": "7.0.0"
 					}
 				},
 				"which": {
@@ -11001,7 +11251,7 @@
 					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 					"dev": true,
 					"requires": {
-						"isexe": "^2.0.0"
+						"isexe": "2.0.0"
 					}
 				}
 			}
@@ -11012,14 +11262,14 @@
 			"integrity": "sha512-AajqcZEUikF2ioph6PfH3dIuxJclhr3i3kHgTOP0xeXdWQohrvJAAmqVcV43/GI987HFY/vzT73jYXoa4esDHg==",
 			"dev": true,
 			"requires": {
-				"chalk": "^4.1.0",
-				"cli-truncate": "^2.1.0",
-				"figures": "^3.2.0",
-				"indent-string": "^4.0.0",
-				"log-update": "^4.0.0",
-				"p-map": "^4.0.0",
-				"rxjs": "^6.6.3",
-				"through": "^2.3.8"
+				"chalk": "4.1.0",
+				"cli-truncate": "2.1.0",
+				"figures": "3.2.0",
+				"indent-string": "4.0.0",
+				"log-update": "4.0.0",
+				"p-map": "4.0.0",
+				"rxjs": "6.6.3",
+				"through": "2.3.8"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -11028,7 +11278,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"chalk": {
@@ -11037,8 +11287,8 @@
 					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
+						"ansi-styles": "4.3.0",
+						"supports-color": "7.2.0"
 					}
 				},
 				"color-convert": {
@@ -11047,7 +11297,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -11068,7 +11318,7 @@
 					"integrity": "sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==",
 					"dev": true,
 					"requires": {
-						"tslib": "^1.9.0"
+						"tslib": "1.13.0"
 					}
 				},
 				"supports-color": {
@@ -11077,7 +11327,7 @@
 					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "4.0.0"
 					}
 				}
 			}
@@ -11088,11 +11338,11 @@
 			"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"parse-json": "^2.2.0",
-				"pify": "^2.0.0",
-				"pinkie-promise": "^2.0.0",
-				"strip-bom": "^2.0.0"
+				"graceful-fs": "4.2.4",
+				"parse-json": "2.2.0",
+				"pify": "2.3.0",
+				"pinkie-promise": "2.0.1",
+				"strip-bom": "2.0.0"
 			},
 			"dependencies": {
 				"parse-json": {
@@ -11101,7 +11351,7 @@
 					"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
 					"dev": true,
 					"requires": {
-						"error-ex": "^1.2.0"
+						"error-ex": "1.3.2"
 					}
 				},
 				"pify": {
@@ -11118,8 +11368,8 @@
 			"integrity": "sha512-ldcgZpjNJj71n+2Mf6yetz+c9bM4xpKtNds4LbqXzU/PTdeAX0g3ytnU1AJMEcTk2Lex4Smpe3Q/eCTsvUBxbA==",
 			"dev": true,
 			"requires": {
-				"find-cache-dir": "^0.1.1",
-				"mkdirp": "^0.5.1"
+				"find-cache-dir": "0.1.1",
+				"mkdirp": "0.5.5"
 			},
 			"dependencies": {
 				"find-cache-dir": {
@@ -11128,9 +11378,9 @@
 					"integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
 					"dev": true,
 					"requires": {
-						"commondir": "^1.0.1",
-						"mkdirp": "^0.5.1",
-						"pkg-dir": "^1.0.0"
+						"commondir": "1.0.1",
+						"mkdirp": "0.5.5",
+						"pkg-dir": "1.0.0"
 					}
 				},
 				"find-up": {
@@ -11139,8 +11389,8 @@
 					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
 					"dev": true,
 					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"path-exists": "2.1.0",
+						"pinkie-promise": "2.0.1"
 					}
 				},
 				"path-exists": {
@@ -11149,7 +11399,7 @@
 					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
 					"dev": true,
 					"requires": {
-						"pinkie-promise": "^2.0.0"
+						"pinkie-promise": "2.0.1"
 					}
 				},
 				"pkg-dir": {
@@ -11158,7 +11408,7 @@
 					"integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
 					"dev": true,
 					"requires": {
-						"find-up": "^1.0.0"
+						"find-up": "1.1.2"
 					}
 				}
 			}
@@ -11175,9 +11425,9 @@
 			"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
 			"dev": true,
 			"requires": {
-				"big.js": "^5.2.2",
-				"emojis-list": "^3.0.0",
-				"json5": "^1.0.1"
+				"big.js": "5.2.2",
+				"emojis-list": "3.0.0",
+				"json5": "1.0.1"
 			},
 			"dependencies": {
 				"json5": {
@@ -11186,7 +11436,7 @@
 					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
 					"dev": true,
 					"requires": {
-						"minimist": "^1.2.0"
+						"minimist": "1.2.5"
 					}
 				}
 			}
@@ -11197,8 +11447,8 @@
 			"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
 			"dev": true,
 			"requires": {
-				"p-locate": "^3.0.0",
-				"path-exists": "^3.0.0"
+				"p-locate": "3.0.0",
+				"path-exists": "3.0.0"
 			}
 		},
 		"lodash": {
@@ -11260,8 +11510,8 @@
 			"integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
 			"dev": true,
 			"requires": {
-				"lodash._reinterpolate": "^3.0.0",
-				"lodash.templatesettings": "^4.0.0"
+				"lodash._reinterpolate": "3.0.0",
+				"lodash.templatesettings": "4.2.0"
 			}
 		},
 		"lodash.templatesettings": {
@@ -11270,7 +11520,7 @@
 			"integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
 			"dev": true,
 			"requires": {
-				"lodash._reinterpolate": "^3.0.0"
+				"lodash._reinterpolate": "3.0.0"
 			}
 		},
 		"lodash.uniq": {
@@ -11290,7 +11540,7 @@
 			"integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
 			"dev": true,
 			"requires": {
-				"chalk": "^4.0.0"
+				"chalk": "4.1.0"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -11299,7 +11549,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"chalk": {
@@ -11308,8 +11558,8 @@
 					"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
+						"ansi-styles": "4.3.0",
+						"supports-color": "7.2.0"
 					}
 				},
 				"color-convert": {
@@ -11318,7 +11568,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -11339,7 +11589,7 @@
 					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "4.0.0"
 					}
 				}
 			}
@@ -11350,10 +11600,10 @@
 			"integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
 			"dev": true,
 			"requires": {
-				"ansi-escapes": "^4.3.0",
-				"cli-cursor": "^3.1.0",
-				"slice-ansi": "^4.0.0",
-				"wrap-ansi": "^6.2.0"
+				"ansi-escapes": "4.3.1",
+				"cli-cursor": "3.1.0",
+				"slice-ansi": "4.0.0",
+				"wrap-ansi": "6.2.0"
 			},
 			"dependencies": {
 				"ansi-escapes": {
@@ -11362,7 +11612,7 @@
 					"integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
 					"dev": true,
 					"requires": {
-						"type-fest": "^0.11.0"
+						"type-fest": "0.11.0"
 					}
 				},
 				"ansi-styles": {
@@ -11371,7 +11621,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"astral-regex": {
@@ -11386,7 +11636,7 @@
 					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
 					"dev": true,
 					"requires": {
-						"restore-cursor": "^3.1.0"
+						"restore-cursor": "3.1.0"
 					}
 				},
 				"color-convert": {
@@ -11395,7 +11645,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -11422,7 +11672,7 @@
 					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 					"dev": true,
 					"requires": {
-						"mimic-fn": "^2.1.0"
+						"mimic-fn": "2.1.0"
 					}
 				},
 				"restore-cursor": {
@@ -11431,8 +11681,8 @@
 					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
 					"dev": true,
 					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
+						"onetime": "5.1.2",
+						"signal-exit": "3.0.3"
 					}
 				},
 				"slice-ansi": {
@@ -11441,9 +11691,9 @@
 					"integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.0.0",
-						"astral-regex": "^2.0.0",
-						"is-fullwidth-code-point": "^3.0.0"
+						"ansi-styles": "4.3.0",
+						"astral-regex": "2.0.0",
+						"is-fullwidth-code-point": "3.0.0"
 					}
 				},
 				"type-fest": {
@@ -11455,9 +11705,9 @@
 			}
 		},
 		"loglevel": {
-			"version": "1.6.8",
-			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz",
-			"integrity": "sha512-bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA==",
+			"version": "1.7.1",
+			"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz",
+			"integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==",
 			"dev": true
 		},
 		"loose-envify": {
@@ -11465,7 +11715,7 @@
 			"resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
 			"integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
 			"requires": {
-				"js-tokens": "^3.0.0 || ^4.0.0"
+				"js-tokens": "4.0.0"
 			}
 		},
 		"loud-rejection": {
@@ -11474,8 +11724,8 @@
 			"integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
 			"dev": true,
 			"requires": {
-				"currently-unhandled": "^0.4.1",
-				"signal-exit": "^3.0.0"
+				"currently-unhandled": "0.4.1",
+				"signal-exit": "3.0.3"
 			}
 		},
 		"lower-case": {
@@ -11483,7 +11733,7 @@
 			"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.1.tgz",
 			"integrity": "sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==",
 			"requires": {
-				"tslib": "^1.10.0"
+				"tslib": "1.13.0"
 			}
 		},
 		"lru-cache": {
@@ -11492,8 +11742,8 @@
 			"integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
 			"dev": true,
 			"requires": {
-				"pseudomap": "^1.0.2",
-				"yallist": "^2.1.2"
+				"pseudomap": "1.0.2",
+				"yallist": "2.1.2"
 			}
 		},
 		"make-dir": {
@@ -11502,8 +11752,8 @@
 			"integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
 			"dev": true,
 			"requires": {
-				"pify": "^4.0.1",
-				"semver": "^5.6.0"
+				"pify": "4.0.1",
+				"semver": "5.7.1"
 			},
 			"dependencies": {
 				"pify": {
@@ -11520,7 +11770,7 @@
 			"integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=",
 			"dev": true,
 			"requires": {
-				"tmpl": "1.0.x"
+				"tmpl": "1.0.4"
 			}
 		},
 		"mamacro": {
@@ -11547,7 +11797,7 @@
 			"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
 			"dev": true,
 			"requires": {
-				"object-visit": "^1.0.0"
+				"object-visit": "1.0.1"
 			}
 		},
 		"mathjs": {
@@ -11570,9 +11820,9 @@
 			"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
 			"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.1.2"
+				"hash-base": "3.1.0",
+				"inherits": "2.0.4",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"mdn-data": {
@@ -11593,8 +11843,8 @@
 			"integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
 			"dev": true,
 			"requires": {
-				"errno": "^0.1.3",
-				"readable-stream": "^2.0.1"
+				"errno": "0.1.8",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -11603,13 +11853,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -11624,7 +11874,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -11640,27 +11890,27 @@
 			"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
 			"dev": true,
 			"requires": {
-				"camelcase-keys": "^2.0.0",
-				"decamelize": "^1.1.2",
-				"loud-rejection": "^1.0.0",
-				"map-obj": "^1.0.1",
-				"minimist": "^1.1.3",
-				"normalize-package-data": "^2.3.4",
-				"object-assign": "^4.0.1",
-				"read-pkg-up": "^1.0.1",
-				"redent": "^1.0.0",
-				"trim-newlines": "^1.0.0"
+				"camelcase-keys": "2.1.0",
+				"decamelize": "1.2.0",
+				"loud-rejection": "1.6.0",
+				"map-obj": "1.0.1",
+				"minimist": "1.2.5",
+				"normalize-package-data": "2.5.0",
+				"object-assign": "4.1.1",
+				"read-pkg-up": "1.0.1",
+				"redent": "1.0.0",
+				"trim-newlines": "1.0.0"
 			}
 		},
 		"merge-deep": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.2.tgz",
-			"integrity": "sha512-T7qC8kg4Zoti1cFd8Cr0M+qaZfOwjlPDEdZIIPPB2JZctjaPM4fX+i7HOId69tAti2fvO6X5ldfYUONDODsrkA==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/merge-deep/-/merge-deep-3.0.3.tgz",
+			"integrity": "sha512-qtmzAS6t6grwEkNrunqTBdn0qKwFgNWvlxUbAV8es9M7Ot1EbyApytCnvE0jALPa46ZpKDUo527kKiaWplmlFA==",
 			"dev": true,
 			"requires": {
-				"arr-union": "^3.1.0",
-				"clone-deep": "^0.2.4",
-				"kind-of": "^3.0.2"
+				"arr-union": "3.1.0",
+				"clone-deep": "0.2.4",
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -11669,7 +11919,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -11710,19 +11960,19 @@
 			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
 			"dev": true,
 			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
+				"arr-diff": "4.0.0",
+				"array-unique": "0.3.2",
+				"braces": "2.3.2",
+				"define-property": "2.0.2",
+				"extend-shallow": "3.0.2",
+				"extglob": "2.0.4",
+				"fragment-cache": "0.2.1",
+				"kind-of": "6.0.3",
+				"nanomatch": "1.2.13",
+				"object.pick": "1.3.0",
+				"regex-not": "1.0.2",
+				"snapdragon": "0.8.2",
+				"to-regex": "3.0.2"
 			}
 		},
 		"miller-rabin": {
@@ -11731,22 +11981,22 @@
 			"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.0.0",
-				"brorand": "^1.0.1"
+				"bn.js": "4.12.0",
+				"brorand": "1.1.0"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
 		},
 		"mime": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-			"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+			"version": "2.5.2",
+			"resolved": "https://registry.npmjs.org/mime/-/mime-2.5.2.tgz",
+			"integrity": "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==",
 			"dev": true
 		},
 		"mime-db": {
@@ -11782,10 +12032,10 @@
 			"integrity": "sha512-lp3GeY7ygcgAmVIcRPBVhIkf8Us7FZjA+ILpal44qLdSu11wmjKQ3d9k15lfD7pO4esu9eUIAW7qiYIBppv40A==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "^1.1.0",
+				"loader-utils": "1.4.0",
 				"normalize-url": "1.9.1",
-				"schema-utils": "^1.0.0",
-				"webpack-sources": "^1.1.0"
+				"schema-utils": "1.0.0",
+				"webpack-sources": "1.4.3"
 			},
 			"dependencies": {
 				"schema-utils": {
@@ -11794,9 +12044,9 @@
 					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
+						"ajv": "6.12.3",
+						"ajv-errors": "1.0.1",
+						"ajv-keywords": "3.5.2"
 					}
 				}
 			}
@@ -11806,8 +12056,8 @@
 			"resolved": "https://registry.npmjs.org/mini-store/-/mini-store-3.0.6.tgz",
 			"integrity": "sha512-YzffKHbYsMQGUWQRKdsearR79QsMzzJcDDmZKlJBqt5JNkqpyJHYlK6gP61O36X+sLf76sO9G6mhKBe83gIZIQ==",
 			"requires": {
-				"hoist-non-react-statics": "^3.3.2",
-				"shallowequal": "^1.0.2"
+				"hoist-non-react-statics": "3.3.2",
+				"shallowequal": "1.1.0"
 			}
 		},
 		"minify": {
@@ -11815,12 +12065,12 @@
 			"resolved": "https://registry.npmjs.org/minify/-/minify-6.0.1.tgz",
 			"integrity": "sha512-JMG5VruvghXZ1VnPCffnpESUzrhNPTT/uNogew9CmPdd3zmohSEt8/HhPxpR7CiXnBYWExW2gGoagZxTy9rnLg==",
 			"requires": {
-				"clean-css": "^4.1.6",
-				"css-b64-images": "~0.2.5",
-				"debug": "^4.1.0",
-				"html-minifier-terser": "^5.1.1",
-				"terser": "^5.3.2",
-				"try-to-catch": "^3.0.0"
+				"clean-css": "4.2.3",
+				"css-b64-images": "0.2.5",
+				"debug": "4.3.1",
+				"html-minifier-terser": "5.1.1",
+				"terser": "5.6.1",
+				"try-to-catch": "3.0.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -11841,9 +12091,9 @@
 					"resolved": "https://registry.npmjs.org/terser/-/terser-5.6.1.tgz",
 					"integrity": "sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==",
 					"requires": {
-						"commander": "^2.20.0",
-						"source-map": "~0.7.2",
-						"source-map-support": "~0.5.19"
+						"commander": "2.20.3",
+						"source-map": "0.7.3",
+						"source-map-support": "0.5.19"
 					}
 				}
 			}
@@ -11865,7 +12115,7 @@
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
 			"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 			"requires": {
-				"brace-expansion": "^1.1.7"
+				"brace-expansion": "1.1.11"
 			}
 		},
 		"minimist": {
@@ -11880,9 +12130,9 @@
 			"integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
 			"dev": true,
 			"requires": {
-				"arrify": "^1.0.1",
-				"is-plain-obj": "^1.1.0",
-				"kind-of": "^6.0.3"
+				"arrify": "1.0.1",
+				"is-plain-obj": "1.1.0",
+				"kind-of": "6.0.3"
 			}
 		},
 		"minipass": {
@@ -11891,7 +12141,7 @@
 			"integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
 			"dev": true,
 			"requires": {
-				"yallist": "^4.0.0"
+				"yallist": "4.0.0"
 			},
 			"dependencies": {
 				"yallist": {
@@ -11908,7 +12158,7 @@
 			"integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
 			"dev": true,
 			"requires": {
-				"minipass": "^3.0.0"
+				"minipass": "3.1.3"
 			}
 		},
 		"minipass-flush": {
@@ -11917,7 +12167,7 @@
 			"integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
 			"dev": true,
 			"requires": {
-				"minipass": "^3.0.0"
+				"minipass": "3.1.3"
 			}
 		},
 		"minipass-pipeline": {
@@ -11926,7 +12176,7 @@
 			"integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
 			"dev": true,
 			"requires": {
-				"minipass": "^3.0.0"
+				"minipass": "3.1.3"
 			}
 		},
 		"mississippi": {
@@ -11935,16 +12185,16 @@
 			"integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
 			"dev": true,
 			"requires": {
-				"concat-stream": "^1.5.0",
-				"duplexify": "^3.4.2",
-				"end-of-stream": "^1.1.0",
-				"flush-write-stream": "^1.0.0",
-				"from2": "^2.1.0",
-				"parallel-transform": "^1.1.0",
-				"pump": "^3.0.0",
-				"pumpify": "^1.3.3",
-				"stream-each": "^1.1.0",
-				"through2": "^2.0.0"
+				"concat-stream": "1.6.2",
+				"duplexify": "3.7.1",
+				"end-of-stream": "1.4.4",
+				"flush-write-stream": "1.1.1",
+				"from2": "2.3.0",
+				"parallel-transform": "1.2.0",
+				"pump": "3.0.0",
+				"pumpify": "1.5.1",
+				"stream-each": "1.2.3",
+				"through2": "2.0.5"
 			}
 		},
 		"mixin-deep": {
@@ -11953,8 +12203,8 @@
 			"integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
 			"dev": true,
 			"requires": {
-				"for-in": "^1.0.2",
-				"is-extendable": "^1.0.1"
+				"for-in": "1.0.2",
+				"is-extendable": "1.0.1"
 			},
 			"dependencies": {
 				"is-extendable": {
@@ -11963,7 +12213,7 @@
 					"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
 					"dev": true,
 					"requires": {
-						"is-plain-object": "^2.0.4"
+						"is-plain-object": "2.0.4"
 					}
 				}
 			}
@@ -11974,8 +12224,8 @@
 			"integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=",
 			"dev": true,
 			"requires": {
-				"for-in": "^0.1.3",
-				"is-extendable": "^0.1.1"
+				"for-in": "0.1.8",
+				"is-extendable": "0.1.1"
 			},
 			"dependencies": {
 				"for-in": {
@@ -11992,7 +12242,7 @@
 			"integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
 			"dev": true,
 			"requires": {
-				"minimist": "^1.2.5"
+				"minimist": "1.2.5"
 			}
 		},
 		"mobile-detect": {
@@ -12010,9 +12260,9 @@
 			"resolved": "https://registry.npmjs.org/moment-jalaali/-/moment-jalaali-0.7.2.tgz",
 			"integrity": "sha512-CO9FG+vuuhzcyboqmocubwmVj0d0Z1QvnU1uNUzuO9ZyyMT7oJAAj1oGC1JvN9PA5GcAhDcrEQkGWim1lfRYYQ==",
 			"requires": {
-				"jalaali-js": "^1.0.0",
-				"moment": "^2.18.1",
-				"rimraf": "^2.6.1"
+				"jalaali-js": "1.1.0",
+				"moment": "2.24.0",
+				"rimraf": "2.7.1"
 			},
 			"dependencies": {
 				"rimraf": {
@@ -12020,7 +12270,7 @@
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -12030,7 +12280,7 @@
 			"resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.21.tgz",
 			"integrity": "sha512-j96bAh4otsgj3lKydm3K7kdtA3iKf2m6MY2iSYCzCm5a1zmHo1g+aK3068dDEeocLZQIS9kU8bsdQHLqEvgW0A==",
 			"requires": {
-				"moment": ">= 2.9.0"
+				"moment": "2.24.0"
 			}
 		},
 		"moniker": {
@@ -12045,12 +12295,12 @@
 			"integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
 			"dev": true,
 			"requires": {
-				"aproba": "^1.1.1",
-				"copy-concurrently": "^1.0.0",
-				"fs-write-stream-atomic": "^1.0.8",
-				"mkdirp": "^0.5.1",
-				"rimraf": "^2.5.4",
-				"run-queue": "^1.0.3"
+				"aproba": "1.2.0",
+				"copy-concurrently": "1.0.5",
+				"fs-write-stream-atomic": "1.0.10",
+				"mkdirp": "0.5.5",
+				"rimraf": "2.7.1",
+				"run-queue": "1.0.3"
 			},
 			"dependencies": {
 				"rimraf": {
@@ -12059,7 +12309,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -12075,8 +12325,8 @@
 			"integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
 			"dev": true,
 			"requires": {
-				"dns-packet": "^1.3.1",
-				"thunky": "^1.0.2"
+				"dns-packet": "1.3.1",
+				"thunky": "1.1.0"
 			}
 		},
 		"multicast-dns-service-types": {
@@ -12090,15 +12340,15 @@
 			"resolved": "https://registry.npmjs.org/multicoin-address-validator/-/multicoin-address-validator-0.4.16.tgz",
 			"integrity": "sha512-734i3dFtiFdTAg0zOU/2NXGNbDbYcv9gf5Oolqu4M8NAJVVh7mDKNvO/4lut+WLaYWBG7LffmbFdnLrhdqKKKQ==",
 			"requires": {
-				"base-x": "^3.0.8",
-				"browserify-bignum": "^1.3.0-2",
-				"bundle": "^2.1.0",
-				"cbor-js": "^0.1.0",
-				"crc": "^3.8.0",
-				"js-sha512": "^0.8.0",
-				"jssha": "^2.4.2",
-				"lodash.isequal": "^4.5.0",
-				"minify": "^6.0.1"
+				"base-x": "3.0.8",
+				"browserify-bignum": "1.3.0-2",
+				"bundle": "2.1.0",
+				"cbor-js": "0.1.0",
+				"crc": "3.8.0",
+				"js-sha512": "0.8.0",
+				"jssha": "2.4.2",
+				"lodash.isequal": "4.5.0",
+				"minify": "6.0.1"
 			},
 			"dependencies": {
 				"jssha": {
@@ -12126,17 +12376,17 @@
 			"integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
 			"dev": true,
 			"requires": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"fragment-cache": "^0.2.1",
-				"is-windows": "^1.0.2",
-				"kind-of": "^6.0.2",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.1"
+				"arr-diff": "4.0.0",
+				"array-unique": "0.3.2",
+				"define-property": "2.0.2",
+				"extend-shallow": "3.0.2",
+				"fragment-cache": "0.2.1",
+				"is-windows": "1.0.2",
+				"kind-of": "6.0.3",
+				"object.pick": "1.3.0",
+				"regex-not": "1.0.2",
+				"snapdragon": "0.8.2",
+				"to-regex": "3.0.2"
 			}
 		},
 		"natural-compare": {
@@ -12191,8 +12441,8 @@
 			"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.3.tgz",
 			"integrity": "sha512-ehY/mVQCf9BL0gKfsJBvFJen+1V//U+0HQMPrWct40ixE4jnv0bfvxDbWtAHL9EcaPEOJHVVYKoQn1TlZUB8Tw==",
 			"requires": {
-				"lower-case": "^2.0.1",
-				"tslib": "^1.10.0"
+				"lower-case": "2.0.1",
+				"tslib": "1.13.0"
 			}
 		},
 		"node-fetch": {
@@ -12200,14 +12450,14 @@
 			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
 			"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
 			"requires": {
-				"encoding": "^0.1.11",
-				"is-stream": "^1.0.1"
+				"encoding": "0.1.12",
+				"is-stream": "1.1.0"
 			}
 		},
 		"node-forge": {
-			"version": "0.9.0",
-			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
-			"integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+			"version": "0.10.0",
+			"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
+			"integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==",
 			"dev": true
 		},
 		"node-gyp": {
@@ -12216,18 +12466,18 @@
 			"integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==",
 			"dev": true,
 			"requires": {
-				"fstream": "^1.0.0",
-				"glob": "^7.0.3",
-				"graceful-fs": "^4.1.2",
-				"mkdirp": "^0.5.0",
-				"nopt": "2 || 3",
-				"npmlog": "0 || 1 || 2 || 3 || 4",
-				"osenv": "0",
-				"request": "^2.87.0",
-				"rimraf": "2",
-				"semver": "~5.3.0",
-				"tar": "^2.0.0",
-				"which": "1"
+				"fstream": "1.0.12",
+				"glob": "7.1.6",
+				"graceful-fs": "4.2.4",
+				"mkdirp": "0.5.5",
+				"nopt": "3.0.6",
+				"npmlog": "4.1.2",
+				"osenv": "0.1.5",
+				"request": "2.88.2",
+				"rimraf": "2.7.1",
+				"semver": "5.3.0",
+				"tar": "2.2.2",
+				"which": "1.3.1"
 			},
 			"dependencies": {
 				"rimraf": {
@@ -12236,7 +12486,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				},
 				"semver": {
@@ -12259,29 +12509,29 @@
 			"integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
 			"dev": true,
 			"requires": {
-				"assert": "^1.1.1",
-				"browserify-zlib": "^0.2.0",
-				"buffer": "^4.3.0",
-				"console-browserify": "^1.1.0",
-				"constants-browserify": "^1.0.0",
-				"crypto-browserify": "^3.11.0",
-				"domain-browser": "^1.1.1",
-				"events": "^3.0.0",
-				"https-browserify": "^1.0.0",
-				"os-browserify": "^0.3.0",
+				"assert": "1.4.1",
+				"browserify-zlib": "0.2.0",
+				"buffer": "4.9.2",
+				"console-browserify": "1.2.0",
+				"constants-browserify": "1.0.0",
+				"crypto-browserify": "3.12.0",
+				"domain-browser": "1.2.0",
+				"events": "3.3.0",
+				"https-browserify": "1.0.0",
+				"os-browserify": "0.3.0",
 				"path-browserify": "0.0.1",
-				"process": "^0.11.10",
-				"punycode": "^1.2.4",
-				"querystring-es3": "^0.2.0",
-				"readable-stream": "^2.3.3",
-				"stream-browserify": "^2.0.1",
-				"stream-http": "^2.7.2",
-				"string_decoder": "^1.0.0",
-				"timers-browserify": "^2.0.4",
+				"process": "0.11.10",
+				"punycode": "1.4.1",
+				"querystring-es3": "0.2.1",
+				"readable-stream": "2.3.7",
+				"stream-browserify": "2.0.2",
+				"stream-http": "2.8.3",
+				"string_decoder": "1.3.0",
+				"timers-browserify": "2.0.12",
 				"tty-browserify": "0.0.0",
-				"url": "^0.11.0",
-				"util": "^0.11.0",
-				"vm-browserify": "^1.0.1"
+				"url": "0.11.0",
+				"util": "0.11.1",
+				"vm-browserify": "1.1.2"
 			},
 			"dependencies": {
 				"buffer": {
@@ -12290,9 +12540,9 @@
 					"integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
 					"dev": true,
 					"requires": {
-						"base64-js": "^1.0.2",
-						"ieee754": "^1.1.4",
-						"isarray": "^1.0.0"
+						"base64-js": "1.3.1",
+						"ieee754": "1.1.13",
+						"isarray": "1.0.0"
 					}
 				},
 				"punycode": {
@@ -12307,13 +12557,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					},
 					"dependencies": {
 						"string_decoder": {
@@ -12322,7 +12572,7 @@
 							"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 							"dev": true,
 							"requires": {
-								"safe-buffer": "~5.1.0"
+								"safe-buffer": "5.1.2"
 							}
 						}
 					}
@@ -12359,22 +12609,22 @@
 			"dev": true
 		},
 		"node-notifier": {
-			"version": "5.4.3",
-			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-			"integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
+			"version": "5.4.5",
+			"resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.5.tgz",
+			"integrity": "sha512-tVbHs7DyTLtzOiN78izLA85zRqB9NvEXkAf014Vx3jtSvn/xBl6bR8ZYifj+dFcFrKI21huSQgJZ6ZtL3B4HfQ==",
 			"dev": true,
 			"requires": {
-				"growly": "^1.3.0",
-				"is-wsl": "^1.1.0",
-				"semver": "^5.5.0",
-				"shellwords": "^0.1.1",
-				"which": "^1.3.0"
+				"growly": "1.3.0",
+				"is-wsl": "1.1.0",
+				"semver": "5.7.1",
+				"shellwords": "0.1.1",
+				"which": "1.3.1"
 			}
 		},
 		"node-releases": {
-			"version": "1.1.60",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.60.tgz",
-			"integrity": "sha512-gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA==",
+			"version": "1.1.71",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+			"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
 			"dev": true
 		},
 		"node-sass": {
@@ -12383,23 +12633,23 @@
 			"integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
 			"dev": true,
 			"requires": {
-				"async-foreach": "^0.1.3",
-				"chalk": "^1.1.1",
-				"cross-spawn": "^3.0.0",
-				"gaze": "^1.0.0",
-				"get-stdin": "^4.0.1",
-				"glob": "^7.0.3",
-				"in-publish": "^2.0.0",
-				"lodash": "^4.17.15",
-				"meow": "^3.7.0",
-				"mkdirp": "^0.5.1",
-				"nan": "^2.13.2",
-				"node-gyp": "^3.8.0",
-				"npmlog": "^4.0.0",
-				"request": "^2.88.0",
+				"async-foreach": "0.1.3",
+				"chalk": "1.1.3",
+				"cross-spawn": "3.0.1",
+				"gaze": "1.1.3",
+				"get-stdin": "4.0.1",
+				"glob": "7.1.6",
+				"in-publish": "2.0.1",
+				"lodash": "4.17.19",
+				"meow": "3.7.0",
+				"mkdirp": "0.5.5",
+				"nan": "2.14.1",
+				"node-gyp": "3.8.0",
+				"npmlog": "4.1.2",
+				"request": "2.88.2",
 				"sass-graph": "2.2.5",
-				"stdout-stream": "^1.4.0",
-				"true-case-path": "^1.0.2"
+				"stdout-stream": "1.4.1",
+				"true-case-path": "1.0.3"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -12414,11 +12664,11 @@
 					"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^2.2.1",
-						"escape-string-regexp": "^1.0.2",
-						"has-ansi": "^2.0.0",
-						"strip-ansi": "^3.0.0",
-						"supports-color": "^2.0.0"
+						"ansi-styles": "2.2.1",
+						"escape-string-regexp": "1.0.5",
+						"has-ansi": "2.0.0",
+						"strip-ansi": "3.0.1",
+						"supports-color": "2.0.0"
 					}
 				},
 				"cross-spawn": {
@@ -12427,8 +12677,8 @@
 					"integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=",
 					"dev": true,
 					"requires": {
-						"lru-cache": "^4.0.1",
-						"which": "^1.2.9"
+						"lru-cache": "4.1.5",
+						"which": "1.3.1"
 					}
 				},
 				"get-stdin": {
@@ -12443,10 +12693,10 @@
 					"integrity": "sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.0.0",
-						"lodash": "^4.0.0",
-						"scss-tokenizer": "^0.2.3",
-						"yargs": "^13.3.2"
+						"glob": "7.1.6",
+						"lodash": "4.17.19",
+						"scss-tokenizer": "0.2.3",
+						"yargs": "13.3.2"
 					}
 				},
 				"supports-color": {
@@ -12463,14 +12713,14 @@
 			"integrity": "sha512-Ss7PbeKd1OmJGzWVObBjoYeqgVIi0S0w7b9Ryx+cC2+c2UwU2VL4ODxLJoXC8LBzMJNmKHlCHQ1gRRNXQRTLjQ==",
 			"dev": true,
 			"requires": {
-				"async-foreach": "^0.1.3",
-				"chokidar": "^3.4.0",
-				"get-stdin": "^4.0.1",
-				"glob": "^7.0.3",
-				"meow": "^3.7.0",
-				"node-sass": "^4.14.1",
-				"sass-graph": "^2.2.4",
-				"stdout-stream": "^1.4.0"
+				"async-foreach": "0.1.3",
+				"chokidar": "3.4.3",
+				"get-stdin": "4.0.1",
+				"glob": "7.1.6",
+				"meow": "3.7.0",
+				"node-sass": "4.14.1",
+				"sass-graph": "2.2.6",
+				"stdout-stream": "1.4.1"
 			},
 			"dependencies": {
 				"anymatch": {
@@ -12479,8 +12729,8 @@
 					"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
 					"dev": true,
 					"requires": {
-						"normalize-path": "^3.0.0",
-						"picomatch": "^2.0.4"
+						"normalize-path": "3.0.0",
+						"picomatch": "2.2.2"
 					}
 				},
 				"binary-extensions": {
@@ -12495,7 +12745,7 @@
 					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
 					"dev": true,
 					"requires": {
-						"fill-range": "^7.0.1"
+						"fill-range": "7.0.1"
 					}
 				},
 				"chokidar": {
@@ -12504,14 +12754,14 @@
 					"integrity": "sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ==",
 					"dev": true,
 					"requires": {
-						"anymatch": "~3.1.1",
-						"braces": "~3.0.2",
-						"fsevents": "~2.1.2",
-						"glob-parent": "~5.1.0",
-						"is-binary-path": "~2.1.0",
-						"is-glob": "~4.0.1",
-						"normalize-path": "~3.0.0",
-						"readdirp": "~3.5.0"
+						"anymatch": "3.1.1",
+						"braces": "3.0.2",
+						"fsevents": "2.1.3",
+						"glob-parent": "5.1.1",
+						"is-binary-path": "2.1.0",
+						"is-glob": "4.0.1",
+						"normalize-path": "3.0.0",
+						"readdirp": "3.5.0"
 					}
 				},
 				"fill-range": {
@@ -12520,7 +12770,7 @@
 					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
 					"dev": true,
 					"requires": {
-						"to-regex-range": "^5.0.1"
+						"to-regex-range": "5.0.1"
 					}
 				},
 				"fsevents": {
@@ -12542,7 +12792,7 @@
 					"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
 					"dev": true,
 					"requires": {
-						"is-glob": "^4.0.1"
+						"is-glob": "4.0.1"
 					}
 				},
 				"is-binary-path": {
@@ -12551,7 +12801,7 @@
 					"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
 					"dev": true,
 					"requires": {
-						"binary-extensions": "^2.0.0"
+						"binary-extensions": "2.1.0"
 					}
 				},
 				"is-number": {
@@ -12566,7 +12816,7 @@
 					"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
 					"dev": true,
 					"requires": {
-						"picomatch": "^2.2.1"
+						"picomatch": "2.2.2"
 					}
 				},
 				"to-regex-range": {
@@ -12575,7 +12825,7 @@
 					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
 					"dev": true,
 					"requires": {
-						"is-number": "^7.0.0"
+						"is-number": "7.0.0"
 					}
 				}
 			}
@@ -12586,7 +12836,7 @@
 			"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
 			"dev": true,
 			"requires": {
-				"abbrev": "1"
+				"abbrev": "1.1.1"
 			}
 		},
 		"normalize-package-data": {
@@ -12594,10 +12844,10 @@
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
 			"integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
 			"requires": {
-				"hosted-git-info": "^2.1.4",
-				"resolve": "^1.10.0",
-				"semver": "2 || 3 || 4 || 5",
-				"validate-npm-package-license": "^3.0.1"
+				"hosted-git-info": "2.8.8",
+				"resolve": "1.17.0",
+				"semver": "5.7.1",
+				"validate-npm-package-license": "3.0.4"
 			}
 		},
 		"normalize-path": {
@@ -12618,10 +12868,10 @@
 			"integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=",
 			"dev": true,
 			"requires": {
-				"object-assign": "^4.0.1",
-				"prepend-http": "^1.0.0",
-				"query-string": "^4.1.0",
-				"sort-keys": "^1.0.0"
+				"object-assign": "4.1.1",
+				"prepend-http": "1.0.4",
+				"query-string": "4.3.4",
+				"sort-keys": "1.1.2"
 			},
 			"dependencies": {
 				"query-string": {
@@ -12630,8 +12880,8 @@
 					"integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
 					"dev": true,
 					"requires": {
-						"object-assign": "^4.1.0",
-						"strict-uri-encode": "^1.0.0"
+						"object-assign": "4.1.1",
+						"strict-uri-encode": "1.1.0"
 					}
 				}
 			}
@@ -12646,15 +12896,15 @@
 			"resolved": "https://registry.npmjs.org/npm-run-all/-/npm-run-all-4.1.5.tgz",
 			"integrity": "sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==",
 			"requires": {
-				"ansi-styles": "^3.2.1",
-				"chalk": "^2.4.1",
-				"cross-spawn": "^6.0.5",
-				"memorystream": "^0.3.1",
-				"minimatch": "^3.0.4",
-				"pidtree": "^0.3.0",
-				"read-pkg": "^3.0.0",
-				"shell-quote": "^1.6.1",
-				"string.prototype.padend": "^3.0.0"
+				"ansi-styles": "3.2.1",
+				"chalk": "2.4.2",
+				"cross-spawn": "6.0.5",
+				"memorystream": "0.3.1",
+				"minimatch": "3.0.4",
+				"pidtree": "0.3.1",
+				"read-pkg": "3.0.0",
+				"shell-quote": "1.7.2",
+				"string.prototype.padend": "3.1.0"
 			},
 			"dependencies": {
 				"load-json-file": {
@@ -12662,10 +12912,10 @@
 					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
 					"integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^4.0.0",
-						"pify": "^3.0.0",
-						"strip-bom": "^3.0.0"
+						"graceful-fs": "4.2.4",
+						"parse-json": "4.0.0",
+						"pify": "3.0.0",
+						"strip-bom": "3.0.0"
 					}
 				},
 				"path-type": {
@@ -12673,7 +12923,7 @@
 					"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
 					"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
 					"requires": {
-						"pify": "^3.0.0"
+						"pify": "3.0.0"
 					}
 				},
 				"read-pkg": {
@@ -12681,9 +12931,9 @@
 					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
 					"integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
 					"requires": {
-						"load-json-file": "^4.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^3.0.0"
+						"load-json-file": "4.0.0",
+						"normalize-package-data": "2.5.0",
+						"path-type": "3.0.0"
 					}
 				},
 				"strip-bom": {
@@ -12699,7 +12949,7 @@
 			"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
 			"dev": true,
 			"requires": {
-				"path-key": "^2.0.0"
+				"path-key": "2.0.1"
 			}
 		},
 		"npmlog": {
@@ -12708,10 +12958,10 @@
 			"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 			"dev": true,
 			"requires": {
-				"are-we-there-yet": "~1.1.2",
-				"console-control-strings": "~1.1.0",
-				"gauge": "~2.7.3",
-				"set-blocking": "~2.0.0"
+				"are-we-there-yet": "1.1.5",
+				"console-control-strings": "1.1.0",
+				"gauge": "2.7.4",
+				"set-blocking": "2.0.0"
 			}
 		},
 		"nth-check": {
@@ -12720,7 +12970,7 @@
 			"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
 			"dev": true,
 			"requires": {
-				"boolbase": "~1.0.0"
+				"boolbase": "1.0.0"
 			}
 		},
 		"num2fraction": {
@@ -12763,9 +13013,9 @@
 			"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
 			"dev": true,
 			"requires": {
-				"copy-descriptor": "^0.1.0",
-				"define-property": "^0.2.5",
-				"kind-of": "^3.0.3"
+				"copy-descriptor": "0.1.1",
+				"define-property": "0.2.5",
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"define-property": {
@@ -12774,7 +13024,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
+						"is-descriptor": "0.1.6"
 					}
 				},
 				"kind-of": {
@@ -12783,15 +13033,15 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
 		},
 		"object-hash": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.0.3.tgz",
-			"integrity": "sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/object-hash/-/object-hash-2.1.1.tgz",
+			"integrity": "sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==",
 			"dev": true
 		},
 		"object-inspect": {
@@ -12804,8 +13054,8 @@
 			"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz",
 			"integrity": "sha512-5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"object-keys": {
@@ -12825,7 +13075,7 @@
 			"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
 			"dev": true,
 			"requires": {
-				"isobject": "^3.0.0"
+				"isobject": "3.0.1"
 			}
 		},
 		"object.assign": {
@@ -12833,10 +13083,10 @@
 			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
 			"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
 			"requires": {
-				"define-properties": "^1.1.2",
-				"function-bind": "^1.1.1",
-				"has-symbols": "^1.0.0",
-				"object-keys": "^1.0.11"
+				"define-properties": "1.1.3",
+				"function-bind": "1.1.1",
+				"has-symbols": "1.0.1",
+				"object-keys": "1.1.1"
 			}
 		},
 		"object.entries": {
@@ -12844,31 +13094,204 @@
 			"resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.2.tgz",
 			"integrity": "sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5",
-				"has": "^1.0.3"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6",
+				"has": "1.0.3"
 			}
 		},
 		"object.fromentries": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.2.tgz",
-			"integrity": "sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.4.tgz",
+			"integrity": "sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==",
 			"dev": true,
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1",
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3"
+				"call-bind": "1.0.2",
+				"define-properties": "1.1.3",
+				"es-abstract": "1.18.0",
+				"has": "1.0.3"
+			},
+			"dependencies": {
+				"es-abstract": {
+					"version": "1.18.0",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+					"integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"es-to-primitive": "1.2.1",
+						"function-bind": "1.1.1",
+						"get-intrinsic": "1.1.1",
+						"has": "1.0.3",
+						"has-symbols": "1.0.2",
+						"is-callable": "1.2.3",
+						"is-negative-zero": "2.0.1",
+						"is-regex": "1.1.2",
+						"is-string": "1.0.5",
+						"object-inspect": "1.9.0",
+						"object-keys": "1.1.1",
+						"object.assign": "4.1.2",
+						"string.prototype.trimend": "1.0.4",
+						"string.prototype.trimstart": "1.0.4",
+						"unbox-primitive": "1.0.1"
+					}
+				},
+				"has-symbols": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+					"dev": true
+				},
+				"is-callable": {
+					"version": "1.2.3",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"dev": true
+				},
+				"is-regex": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+					"integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"has-symbols": "1.0.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.9.0",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+					"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+					"dev": true
+				},
+				"object.assign": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+					"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3",
+						"has-symbols": "1.0.2",
+						"object-keys": "1.1.1"
+					}
+				},
+				"string.prototype.trimend": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+					"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				},
+				"string.prototype.trimstart": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+					"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				}
 			}
 		},
 		"object.getownpropertydescriptors": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-			"integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.2.tgz",
+			"integrity": "sha512-WtxeKSzfBjlzL+F9b7M7hewDzMwy+C8NRssHd1YrNlzHzIDrXcXiNOMrezdAEM4UXixgV+vvnyBeN7Rygl2ttQ==",
 			"dev": true,
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1"
+				"call-bind": "1.0.2",
+				"define-properties": "1.1.3",
+				"es-abstract": "1.18.0"
+			},
+			"dependencies": {
+				"es-abstract": {
+					"version": "1.18.0",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+					"integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"es-to-primitive": "1.2.1",
+						"function-bind": "1.1.1",
+						"get-intrinsic": "1.1.1",
+						"has": "1.0.3",
+						"has-symbols": "1.0.2",
+						"is-callable": "1.2.3",
+						"is-negative-zero": "2.0.1",
+						"is-regex": "1.1.2",
+						"is-string": "1.0.5",
+						"object-inspect": "1.9.0",
+						"object-keys": "1.1.1",
+						"object.assign": "4.1.2",
+						"string.prototype.trimend": "1.0.4",
+						"string.prototype.trimstart": "1.0.4",
+						"unbox-primitive": "1.0.1"
+					}
+				},
+				"has-symbols": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+					"dev": true
+				},
+				"is-callable": {
+					"version": "1.2.3",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"dev": true
+				},
+				"is-regex": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+					"integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"has-symbols": "1.0.2"
+					}
+				},
+				"object-inspect": {
+					"version": "1.9.0",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+					"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+					"dev": true
+				},
+				"object.assign": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+					"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3",
+						"has-symbols": "1.0.2",
+						"object-keys": "1.1.1"
+					}
+				},
+				"string.prototype.trimend": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+					"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				},
+				"string.prototype.trimstart": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+					"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				}
 			}
 		},
 		"object.pick": {
@@ -12877,7 +13300,7 @@
 			"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
 			"dev": true,
 			"requires": {
-				"isobject": "^3.0.1"
+				"isobject": "3.0.1"
 			}
 		},
 		"object.values": {
@@ -12885,10 +13308,10 @@
 			"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
 			"integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1",
-				"function-bind": "^1.1.1",
-				"has": "^1.0.3"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6",
+				"function-bind": "1.1.1",
+				"has": "1.0.3"
 			}
 		},
 		"obuf": {
@@ -12902,7 +13325,7 @@
 			"resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
 			"integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
 			"requires": {
-				"babel-runtime": "^6.23.0"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"on-finished": {
@@ -12925,7 +13348,7 @@
 			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 			"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 			"requires": {
-				"wrappy": "1"
+				"wrappy": "1.0.2"
 			}
 		},
 		"onetime": {
@@ -12934,17 +13357,17 @@
 			"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
 			"dev": true,
 			"requires": {
-				"mimic-fn": "^1.0.0"
+				"mimic-fn": "1.2.0"
 			}
 		},
 		"open": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/open/-/open-7.1.0.tgz",
-			"integrity": "sha512-lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA==",
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+			"integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
 			"dev": true,
 			"requires": {
-				"is-docker": "^2.0.0",
-				"is-wsl": "^2.1.1"
+				"is-docker": "2.2.0",
+				"is-wsl": "2.2.0"
 			},
 			"dependencies": {
 				"is-wsl": {
@@ -12953,7 +13376,7 @@
 					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
 					"dev": true,
 					"requires": {
-						"is-docker": "^2.0.0"
+						"is-docker": "2.2.0"
 					}
 				}
 			}
@@ -12970,7 +13393,7 @@
 			"integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
 			"dev": true,
 			"requires": {
-				"is-wsl": "^1.1.0"
+				"is-wsl": "1.1.0"
 			}
 		},
 		"optimize-css-assets-webpack-plugin": {
@@ -12979,8 +13402,8 @@
 			"integrity": "sha512-q9fbvCRS6EYtUKKSwI87qm2IxlyJK5b4dygW1rKUBT6mMDhdG5e5bZT63v6tnJR9F9FB/H5a0HTmtw+laUBxKA==",
 			"dev": true,
 			"requires": {
-				"cssnano": "^4.1.10",
-				"last-call-webpack-plugin": "^3.0.0"
+				"cssnano": "4.1.10",
+				"last-call-webpack-plugin": "3.0.0"
 			}
 		},
 		"optionator": {
@@ -12989,12 +13412,12 @@
 			"integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
 			"dev": true,
 			"requires": {
-				"deep-is": "~0.1.3",
-				"fast-levenshtein": "~2.0.6",
-				"levn": "~0.3.0",
-				"prelude-ls": "~1.1.2",
-				"type-check": "~0.3.2",
-				"word-wrap": "~1.2.3"
+				"deep-is": "0.1.3",
+				"fast-levenshtein": "2.0.6",
+				"levn": "0.3.0",
+				"prelude-ls": "1.1.2",
+				"type-check": "0.3.2",
+				"word-wrap": "1.2.3"
 			}
 		},
 		"original": {
@@ -13003,7 +13426,7 @@
 			"integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
 			"dev": true,
 			"requires": {
-				"url-parse": "^1.4.3"
+				"url-parse": "1.5.1"
 			}
 		},
 		"os-browserify": {
@@ -13024,7 +13447,7 @@
 			"integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
 			"dev": true,
 			"requires": {
-				"lcid": "^1.0.0"
+				"lcid": "1.0.0"
 			}
 		},
 		"os-tmpdir": {
@@ -13039,8 +13462,8 @@
 			"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 			"dev": true,
 			"requires": {
-				"os-homedir": "^1.0.0",
-				"os-tmpdir": "^1.0.0"
+				"os-homedir": "1.0.2",
+				"os-tmpdir": "1.0.2"
 			}
 		},
 		"p-all": {
@@ -13049,7 +13472,7 @@
 			"integrity": "sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==",
 			"dev": true,
 			"requires": {
-				"p-map": "^2.0.0"
+				"p-map": "2.1.0"
 			},
 			"dependencies": {
 				"p-map": {
@@ -13066,7 +13489,7 @@
 			"integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=",
 			"dev": true,
 			"requires": {
-				"p-reduce": "^1.0.0"
+				"p-reduce": "1.0.0"
 			}
 		},
 		"p-event": {
@@ -13075,7 +13498,7 @@
 			"integrity": "sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==",
 			"dev": true,
 			"requires": {
-				"p-timeout": "^3.1.0"
+				"p-timeout": "3.2.0"
 			}
 		},
 		"p-filter": {
@@ -13084,7 +13507,7 @@
 			"integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
 			"dev": true,
 			"requires": {
-				"p-map": "^2.0.0"
+				"p-map": "2.1.0"
 			},
 			"dependencies": {
 				"p-map": {
@@ -13107,7 +13530,7 @@
 			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
 			"requires": {
-				"p-try": "^2.0.0"
+				"p-try": "2.2.0"
 			}
 		},
 		"p-locate": {
@@ -13116,7 +13539,7 @@
 			"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
 			"dev": true,
 			"requires": {
-				"p-limit": "^2.0.0"
+				"p-limit": "2.3.0"
 			}
 		},
 		"p-map": {
@@ -13125,7 +13548,7 @@
 			"integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
 			"dev": true,
 			"requires": {
-				"aggregate-error": "^3.0.0"
+				"aggregate-error": "3.0.1"
 			}
 		},
 		"p-reduce": {
@@ -13140,7 +13563,7 @@
 			"integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
 			"dev": true,
 			"requires": {
-				"retry": "^0.12.0"
+				"retry": "0.12.0"
 			}
 		},
 		"p-timeout": {
@@ -13149,7 +13572,7 @@
 			"integrity": "sha512-rhIwUycgwwKcP9yTOOFK/AKsAopjjCakVqLHePO3CC6Mir1Z99xT+R63jZxAT5lFZLa2inS5h+ZS2GvR99/FBg==",
 			"dev": true,
 			"requires": {
-				"p-finally": "^1.0.0"
+				"p-finally": "1.0.0"
 			}
 		},
 		"p-try": {
@@ -13170,9 +13593,9 @@
 			"integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
 			"dev": true,
 			"requires": {
-				"cyclist": "^1.0.1",
-				"inherits": "^2.0.3",
-				"readable-stream": "^2.1.5"
+				"cyclist": "1.0.1",
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -13181,13 +13604,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -13202,7 +13625,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -13212,8 +13635,8 @@
 			"resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.3.tgz",
 			"integrity": "sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==",
 			"requires": {
-				"dot-case": "^3.0.3",
-				"tslib": "^1.10.0"
+				"dot-case": "3.0.3",
+				"tslib": "1.13.0"
 			}
 		},
 		"parent-module": {
@@ -13222,7 +13645,7 @@
 			"integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
 			"dev": true,
 			"requires": {
-				"callsites": "^3.0.0"
+				"callsites": "3.1.0"
 			},
 			"dependencies": {
 				"callsites": {
@@ -13239,11 +13662,11 @@
 			"integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
 			"dev": true,
 			"requires": {
-				"asn1.js": "^5.2.0",
-				"browserify-aes": "^1.0.0",
-				"evp_bytestokey": "^1.0.0",
-				"pbkdf2": "^3.0.3",
-				"safe-buffer": "^5.1.1"
+				"asn1.js": "5.4.1",
+				"browserify-aes": "1.2.0",
+				"evp_bytestokey": "1.0.3",
+				"pbkdf2": "3.1.1",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"parse-json": {
@@ -13251,10 +13674,16 @@
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
 			"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
 			"requires": {
-				"error-ex": "^1.3.1",
-				"json-parse-better-errors": "^1.0.1"
+				"error-ex": "1.3.2",
+				"json-parse-better-errors": "1.0.2"
 			}
 		},
+		"parse5": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz",
+			"integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==",
+			"dev": true
+		},
 		"parseurl": {
 			"version": "1.3.3",
 			"resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
@@ -13266,8 +13695,8 @@
 			"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.1.tgz",
 			"integrity": "sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==",
 			"requires": {
-				"no-case": "^3.0.3",
-				"tslib": "^1.10.0"
+				"no-case": "3.0.3",
+				"tslib": "1.13.0"
 			}
 		},
 		"pascalcase": {
@@ -13327,9 +13756,9 @@
 			"integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.2",
-				"pify": "^2.0.0",
-				"pinkie-promise": "^2.0.0"
+				"graceful-fs": "4.2.4",
+				"pify": "2.3.0",
+				"pinkie-promise": "2.0.1"
 			},
 			"dependencies": {
 				"pify": {
@@ -13346,11 +13775,11 @@
 			"integrity": "sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==",
 			"dev": true,
 			"requires": {
-				"create-hash": "^1.1.2",
-				"create-hmac": "^1.1.4",
-				"ripemd160": "^2.0.1",
-				"safe-buffer": "^5.0.1",
-				"sha.js": "^2.4.8"
+				"create-hash": "1.2.0",
+				"create-hmac": "1.1.7",
+				"ripemd160": "2.0.2",
+				"safe-buffer": "5.2.1",
+				"sha.js": "2.4.11"
 			}
 		},
 		"performance-now": {
@@ -13386,7 +13815,7 @@
 			"integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
 			"dev": true,
 			"requires": {
-				"pinkie": "^2.0.0"
+				"pinkie": "2.0.4"
 			}
 		},
 		"pirates": {
@@ -13395,7 +13824,7 @@
 			"integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==",
 			"dev": true,
 			"requires": {
-				"node-modules-regexp": "^1.0.0"
+				"node-modules-regexp": "1.0.0"
 			}
 		},
 		"pkg-dir": {
@@ -13404,7 +13833,7 @@
 			"integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
 			"dev": true,
 			"requires": {
-				"find-up": "^3.0.0"
+				"find-up": "3.0.0"
 			}
 		},
 		"pkg-up": {
@@ -13413,7 +13842,7 @@
 			"integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
 			"dev": true,
 			"requires": {
-				"find-up": "^3.0.0"
+				"find-up": "3.0.0"
 			}
 		},
 		"pkginfo": {
@@ -13428,7 +13857,7 @@
 			"integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
 			"dev": true,
 			"requires": {
-				"semver-compare": "^1.0.0"
+				"semver-compare": "1.0.0"
 			}
 		},
 		"pn": {
@@ -13443,7 +13872,7 @@
 			"integrity": "sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==",
 			"dev": true,
 			"requires": {
-				"ts-pnp": "^1.1.6"
+				"ts-pnp": "1.1.6"
 			}
 		},
 		"portfinder": {
@@ -13452,9 +13881,9 @@
 			"integrity": "sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==",
 			"dev": true,
 			"requires": {
-				"async": "^2.6.2",
-				"debug": "^3.1.1",
-				"mkdirp": "^0.5.5"
+				"async": "2.6.3",
+				"debug": "3.2.6",
+				"mkdirp": "0.5.5"
 			}
 		},
 		"posix-character-classes": {
@@ -13464,14 +13893,14 @@
 			"dev": true
 		},
 		"postcss": {
-			"version": "7.0.32",
-			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
-			"integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
+			"version": "7.0.35",
+			"resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz",
+			"integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.4.2",
-				"source-map": "^0.6.1",
-				"supports-color": "^6.1.0"
+				"chalk": "2.4.2",
+				"source-map": "0.6.1",
+				"supports-color": "6.1.0"
 			},
 			"dependencies": {
 				"source-map": {
@@ -13486,7 +13915,7 @@
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
@@ -13497,8 +13926,8 @@
 			"integrity": "sha512-clkFxk/9pcdb4Vkn0hAHq3YnxBQ2p0CGD1dy24jN+reBck+EWxMbxSUqN4Yj7t0w8csl87K6p0gxBe1utkJsYA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-selector-parser": "^6.0.2"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "6.0.4"
 			}
 		},
 		"postcss-browser-comments": {
@@ -13507,18 +13936,18 @@
 			"integrity": "sha512-qfVjLfq7HFd2e0HW4s1dvU8X080OZdG46fFbIBFjW7US7YPDcWfRvdElvwMJr2LI6hMmD+7LnH2HcmXTs+uOig==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-calc": {
-			"version": "7.0.3",
-			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz",
-			"integrity": "sha512-IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA==",
+			"version": "7.0.5",
+			"resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.5.tgz",
+			"integrity": "sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.27",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.0.2"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "6.0.4",
+				"postcss-value-parser": "4.1.0"
 			},
 			"dependencies": {
 				"postcss-value-parser": {
@@ -13535,8 +13964,8 @@
 			"integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-color-gray": {
@@ -13545,9 +13974,9 @@
 			"integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
 			"dev": true,
 			"requires": {
-				"@csstools/convert-colors": "^1.4.0",
-				"postcss": "^7.0.5",
-				"postcss-values-parser": "^2.0.0"
+				"@csstools/convert-colors": "1.4.0",
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-color-hex-alpha": {
@@ -13556,8 +13985,8 @@
 			"integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.14",
-				"postcss-values-parser": "^2.0.1"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-color-mod-function": {
@@ -13566,9 +13995,9 @@
 			"integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
 			"dev": true,
 			"requires": {
-				"@csstools/convert-colors": "^1.4.0",
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"@csstools/convert-colors": "1.4.0",
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-color-rebeccapurple": {
@@ -13577,8 +14006,8 @@
 			"integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-colormin": {
@@ -13587,11 +14016,11 @@
 			"integrity": "sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.0.0",
-				"color": "^3.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"browserslist": "4.16.3",
+				"color": "3.1.3",
+				"has": "1.0.3",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-convert-values": {
@@ -13600,8 +14029,8 @@
 			"integrity": "sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-custom-media": {
@@ -13610,7 +14039,7 @@
 			"integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.14"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-custom-properties": {
@@ -13619,8 +14048,8 @@
 			"integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.17",
-				"postcss-values-parser": "^2.0.1"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-custom-selectors": {
@@ -13629,8 +14058,8 @@
 			"integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-selector-parser": "^5.0.0-rc.3"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "5.0.0"
 			},
 			"dependencies": {
 				"cssesc": {
@@ -13645,9 +14074,9 @@
 					"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
 					"dev": true,
 					"requires": {
-						"cssesc": "^2.0.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"cssesc": "2.0.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -13658,8 +14087,8 @@
 			"integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-selector-parser": "^5.0.0-rc.3"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "5.0.0"
 			},
 			"dependencies": {
 				"cssesc": {
@@ -13674,9 +14103,9 @@
 					"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
 					"dev": true,
 					"requires": {
-						"cssesc": "^2.0.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"cssesc": "2.0.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -13687,7 +14116,7 @@
 			"integrity": "sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-discard-duplicates": {
@@ -13696,7 +14125,7 @@
 			"integrity": "sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-discard-empty": {
@@ -13705,7 +14134,7 @@
 			"integrity": "sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-discard-overridden": {
@@ -13714,7 +14143,7 @@
 			"integrity": "sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-double-position-gradients": {
@@ -13723,8 +14152,8 @@
 			"integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.5",
-				"postcss-values-parser": "^2.0.0"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-env-function": {
@@ -13733,8 +14162,8 @@
 			"integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-flexbugs-fixes": {
@@ -13743,7 +14172,7 @@
 			"integrity": "sha512-jr1LHxQvStNNAHlgco6PzY308zvLklh7SJVYuWUwyUQncofaAlD2l+P/gxKHOdqWKe7xJSkVLFF/2Tp+JqMSZA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-focus-visible": {
@@ -13752,7 +14181,7 @@
 			"integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-focus-within": {
@@ -13761,16 +14190,16 @@
 			"integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-font-variant": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
-			"integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.1.tgz",
+			"integrity": "sha512-I3ADQSTNtLTTd8uxZhtSOrTCQ9G4qUVKPjHiDk0bV75QSxXjVWiJVJ2VLdspGUi9fbW9BcjKJoRvxAH1pckqmA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-gap-properties": {
@@ -13779,7 +14208,7 @@
 			"integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-image-set-function": {
@@ -13788,8 +14217,8 @@
 			"integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-initial": {
@@ -13798,8 +14227,8 @@
 			"integrity": "sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==",
 			"dev": true,
 			"requires": {
-				"lodash.template": "^4.5.0",
-				"postcss": "^7.0.2"
+				"lodash.template": "4.5.0",
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-lab-function": {
@@ -13808,19 +14237,19 @@
 			"integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
 			"dev": true,
 			"requires": {
-				"@csstools/convert-colors": "^1.4.0",
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"@csstools/convert-colors": "1.4.0",
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-load-config": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
-			"integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.2.tgz",
+			"integrity": "sha512-/rDeGV6vMUo3mwJZmeHfEDvwnTKKqQ0S7OHUi/kJvvtx3aWtyWG2/0ZWnzCt2keEclwN6Tf0DST2v9kITdOKYw==",
 			"dev": true,
 			"requires": {
-				"cosmiconfig": "^5.0.0",
-				"import-cwd": "^2.0.0"
+				"cosmiconfig": "5.2.1",
+				"import-cwd": "2.1.0"
 			}
 		},
 		"postcss-loader": {
@@ -13829,10 +14258,10 @@
 			"integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "^1.1.0",
-				"postcss": "^7.0.0",
-				"postcss-load-config": "^2.0.0",
-				"schema-utils": "^1.0.0"
+				"loader-utils": "1.4.0",
+				"postcss": "7.0.35",
+				"postcss-load-config": "2.1.2",
+				"schema-utils": "1.0.0"
 			},
 			"dependencies": {
 				"schema-utils": {
@@ -13841,9 +14270,9 @@
 					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
+						"ajv": "6.12.3",
+						"ajv-errors": "1.0.1",
+						"ajv-keywords": "3.5.2"
 					}
 				}
 			}
@@ -13854,7 +14283,7 @@
 			"integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-media-minmax": {
@@ -13863,7 +14292,7 @@
 			"integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-merge-longhand": {
@@ -13873,9 +14302,9 @@
 			"dev": true,
 			"requires": {
 				"css-color-names": "0.0.4",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"stylehacks": "^4.0.0"
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1",
+				"stylehacks": "4.0.3"
 			}
 		},
 		"postcss-merge-rules": {
@@ -13884,12 +14313,12 @@
 			"integrity": "sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-api": "^3.0.0",
-				"cssnano-util-same-parent": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0",
-				"vendors": "^1.0.0"
+				"browserslist": "4.16.3",
+				"caniuse-api": "3.0.0",
+				"cssnano-util-same-parent": "4.0.1",
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "3.1.2",
+				"vendors": "1.0.4"
 			},
 			"dependencies": {
 				"postcss-selector-parser": {
@@ -13898,9 +14327,9 @@
 					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
 					"dev": true,
 					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"dot-prop": "5.3.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -13911,8 +14340,8 @@
 			"integrity": "sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-minify-gradients": {
@@ -13921,10 +14350,10 @@
 			"integrity": "sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"is-color-stop": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-arguments": "4.0.0",
+				"is-color-stop": "1.1.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-minify-params": {
@@ -13933,12 +14362,12 @@
 			"integrity": "sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==",
 			"dev": true,
 			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"browserslist": "^4.0.0",
-				"cssnano-util-get-arguments": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"uniqs": "^2.0.0"
+				"alphanum-sort": "1.0.2",
+				"browserslist": "4.16.3",
+				"cssnano-util-get-arguments": "4.0.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1",
+				"uniqs": "2.0.0"
 			}
 		},
 		"postcss-minify-selectors": {
@@ -13947,10 +14376,10 @@
 			"integrity": "sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==",
 			"dev": true,
 			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0"
+				"alphanum-sort": "1.0.2",
+				"has": "1.0.3",
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "3.1.2"
 			},
 			"dependencies": {
 				"postcss-selector-parser": {
@@ -13959,9 +14388,9 @@
 					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
 					"dev": true,
 					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"dot-prop": "5.3.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -13972,7 +14401,7 @@
 			"integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.5"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-modules-local-by-default": {
@@ -13981,10 +14410,10 @@
 			"integrity": "sha512-e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw==",
 			"dev": true,
 			"requires": {
-				"icss-utils": "^4.1.1",
-				"postcss": "^7.0.32",
-				"postcss-selector-parser": "^6.0.2",
-				"postcss-value-parser": "^4.1.0"
+				"icss-utils": "4.1.1",
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "6.0.4",
+				"postcss-value-parser": "4.1.0"
 			},
 			"dependencies": {
 				"postcss-value-parser": {
@@ -14001,8 +14430,8 @@
 			"integrity": "sha512-YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.6",
-				"postcss-selector-parser": "^6.0.0"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "6.0.4"
 			}
 		},
 		"postcss-modules-values": {
@@ -14011,8 +14440,8 @@
 			"integrity": "sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==",
 			"dev": true,
 			"requires": {
-				"icss-utils": "^4.0.0",
-				"postcss": "^7.0.6"
+				"icss-utils": "4.1.1",
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-nesting": {
@@ -14021,7 +14450,7 @@
 			"integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-normalize": {
@@ -14030,11 +14459,11 @@
 			"integrity": "sha512-rt9JMS/m9FHIRroDDBGSMsyW1c0fkvOJPy62ggxSHUldJO7B195TqFMqIf+lY5ezpDcYOV4j86aUp3/XbxzCCQ==",
 			"dev": true,
 			"requires": {
-				"@csstools/normalize.css": "^10.1.0",
-				"browserslist": "^4.6.2",
-				"postcss": "^7.0.17",
-				"postcss-browser-comments": "^3.0.0",
-				"sanitize.css": "^10.0.0"
+				"@csstools/normalize.css": "10.1.0",
+				"browserslist": "4.16.3",
+				"postcss": "7.0.35",
+				"postcss-browser-comments": "3.0.0",
+				"sanitize.css": "10.0.0"
 			}
 		},
 		"postcss-normalize-charset": {
@@ -14043,7 +14472,7 @@
 			"integrity": "sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-normalize-display-values": {
@@ -14052,9 +14481,9 @@
 			"integrity": "sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-match": "4.0.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-normalize-positions": {
@@ -14063,10 +14492,10 @@
 			"integrity": "sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-arguments": "4.0.0",
+				"has": "1.0.3",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-normalize-repeat-style": {
@@ -14075,10 +14504,10 @@
 			"integrity": "sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-arguments": "4.0.0",
+				"cssnano-util-get-match": "4.0.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-normalize-string": {
@@ -14087,9 +14516,9 @@
 			"integrity": "sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==",
 			"dev": true,
 			"requires": {
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"has": "1.0.3",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-normalize-timing-functions": {
@@ -14098,9 +14527,9 @@
 			"integrity": "sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-match": "4.0.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-normalize-unicode": {
@@ -14109,9 +14538,9 @@
 			"integrity": "sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"browserslist": "4.16.3",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-normalize-url": {
@@ -14120,10 +14549,10 @@
 			"integrity": "sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==",
 			"dev": true,
 			"requires": {
-				"is-absolute-url": "^2.0.0",
-				"normalize-url": "^3.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"is-absolute-url": "2.1.0",
+				"normalize-url": "3.3.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			},
 			"dependencies": {
 				"normalize-url": {
@@ -14140,8 +14569,8 @@
 			"integrity": "sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-ordered-values": {
@@ -14150,9 +14579,9 @@
 			"integrity": "sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-arguments": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-arguments": "4.0.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-overflow-shorthand": {
@@ -14161,7 +14590,7 @@
 			"integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-page-break": {
@@ -14170,7 +14599,7 @@
 			"integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-place": {
@@ -14179,8 +14608,8 @@
 			"integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-values-parser": "^2.0.0"
+				"postcss": "7.0.35",
+				"postcss-values-parser": "2.0.1"
 			}
 		},
 		"postcss-preset-env": {
@@ -14189,43 +14618,43 @@
 			"integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
 			"dev": true,
 			"requires": {
-				"autoprefixer": "^9.6.1",
-				"browserslist": "^4.6.4",
-				"caniuse-lite": "^1.0.30000981",
-				"css-blank-pseudo": "^0.1.4",
-				"css-has-pseudo": "^0.10.0",
-				"css-prefers-color-scheme": "^3.1.1",
-				"cssdb": "^4.4.0",
-				"postcss": "^7.0.17",
-				"postcss-attribute-case-insensitive": "^4.0.1",
-				"postcss-color-functional-notation": "^2.0.1",
-				"postcss-color-gray": "^5.0.0",
-				"postcss-color-hex-alpha": "^5.0.3",
-				"postcss-color-mod-function": "^3.0.3",
-				"postcss-color-rebeccapurple": "^4.0.1",
-				"postcss-custom-media": "^7.0.8",
-				"postcss-custom-properties": "^8.0.11",
-				"postcss-custom-selectors": "^5.1.2",
-				"postcss-dir-pseudo-class": "^5.0.0",
-				"postcss-double-position-gradients": "^1.0.0",
-				"postcss-env-function": "^2.0.2",
-				"postcss-focus-visible": "^4.0.0",
-				"postcss-focus-within": "^3.0.0",
-				"postcss-font-variant": "^4.0.0",
-				"postcss-gap-properties": "^2.0.0",
-				"postcss-image-set-function": "^3.0.1",
-				"postcss-initial": "^3.0.0",
-				"postcss-lab-function": "^2.0.1",
-				"postcss-logical": "^3.0.0",
-				"postcss-media-minmax": "^4.0.0",
-				"postcss-nesting": "^7.0.0",
-				"postcss-overflow-shorthand": "^2.0.0",
-				"postcss-page-break": "^2.0.0",
-				"postcss-place": "^4.0.1",
-				"postcss-pseudo-class-any-link": "^6.0.0",
-				"postcss-replace-overflow-wrap": "^3.0.0",
-				"postcss-selector-matches": "^4.0.0",
-				"postcss-selector-not": "^4.0.0"
+				"autoprefixer": "9.8.6",
+				"browserslist": "4.16.3",
+				"caniuse-lite": "1.0.30001207",
+				"css-blank-pseudo": "0.1.4",
+				"css-has-pseudo": "0.10.0",
+				"css-prefers-color-scheme": "3.1.1",
+				"cssdb": "4.4.0",
+				"postcss": "7.0.35",
+				"postcss-attribute-case-insensitive": "4.0.2",
+				"postcss-color-functional-notation": "2.0.1",
+				"postcss-color-gray": "5.0.0",
+				"postcss-color-hex-alpha": "5.0.3",
+				"postcss-color-mod-function": "3.0.3",
+				"postcss-color-rebeccapurple": "4.0.1",
+				"postcss-custom-media": "7.0.8",
+				"postcss-custom-properties": "8.0.11",
+				"postcss-custom-selectors": "5.1.2",
+				"postcss-dir-pseudo-class": "5.0.0",
+				"postcss-double-position-gradients": "1.0.0",
+				"postcss-env-function": "2.0.2",
+				"postcss-focus-visible": "4.0.0",
+				"postcss-focus-within": "3.0.0",
+				"postcss-font-variant": "4.0.1",
+				"postcss-gap-properties": "2.0.0",
+				"postcss-image-set-function": "3.0.1",
+				"postcss-initial": "3.0.2",
+				"postcss-lab-function": "2.0.1",
+				"postcss-logical": "3.0.0",
+				"postcss-media-minmax": "4.0.0",
+				"postcss-nesting": "7.0.1",
+				"postcss-overflow-shorthand": "2.0.0",
+				"postcss-page-break": "2.0.0",
+				"postcss-place": "4.0.1",
+				"postcss-pseudo-class-any-link": "6.0.0",
+				"postcss-replace-overflow-wrap": "3.0.0",
+				"postcss-selector-matches": "4.0.0",
+				"postcss-selector-not": "4.0.1"
 			}
 		},
 		"postcss-pseudo-class-any-link": {
@@ -14234,8 +14663,8 @@
 			"integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2",
-				"postcss-selector-parser": "^5.0.0-rc.3"
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "5.0.0"
 			},
 			"dependencies": {
 				"cssesc": {
@@ -14250,9 +14679,9 @@
 					"integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
 					"dev": true,
 					"requires": {
-						"cssesc": "^2.0.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"cssesc": "2.0.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -14263,10 +14692,10 @@
 			"integrity": "sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.0.0",
-				"caniuse-api": "^3.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0"
+				"browserslist": "4.16.3",
+				"caniuse-api": "3.0.0",
+				"has": "1.0.3",
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-reduce-transforms": {
@@ -14275,10 +14704,10 @@
 			"integrity": "sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==",
 			"dev": true,
 			"requires": {
-				"cssnano-util-get-match": "^4.0.0",
-				"has": "^1.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0"
+				"cssnano-util-get-match": "4.0.0",
+				"has": "1.0.3",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1"
 			}
 		},
 		"postcss-replace-overflow-wrap": {
@@ -14287,7 +14716,7 @@
 			"integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.2"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-safe-parser": {
@@ -14296,7 +14725,7 @@
 			"integrity": "sha512-xZsFA3uX8MO3yAda03QrG3/Eg1LN3EPfjjf07vke/46HERLZyHrTsQ9E1r1w1W//fWEhtYNndo2hQplN2cVpCQ==",
 			"dev": true,
 			"requires": {
-				"postcss": "^7.0.0"
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-selector-matches": {
@@ -14305,29 +14734,30 @@
 			"integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
 			"dev": true,
 			"requires": {
-				"balanced-match": "^1.0.0",
-				"postcss": "^7.0.2"
+				"balanced-match": "1.0.0",
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-selector-not": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz",
-			"integrity": "sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.1.tgz",
+			"integrity": "sha512-YolvBgInEK5/79C+bdFMyzqTg6pkYqDbzZIST/PDMqa/o3qtXenD05apBG2jLgT0/BQ77d4U2UK12jWpilqMAQ==",
 			"dev": true,
 			"requires": {
-				"balanced-match": "^1.0.0",
-				"postcss": "^7.0.2"
+				"balanced-match": "1.0.0",
+				"postcss": "7.0.35"
 			}
 		},
 		"postcss-selector-parser": {
-			"version": "6.0.2",
-			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
-			"integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+			"version": "6.0.4",
+			"resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz",
+			"integrity": "sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==",
 			"dev": true,
 			"requires": {
-				"cssesc": "^3.0.0",
-				"indexes-of": "^1.0.1",
-				"uniq": "^1.0.1"
+				"cssesc": "3.0.0",
+				"indexes-of": "1.0.1",
+				"uniq": "1.0.1",
+				"util-deprecate": "1.0.2"
 			}
 		},
 		"postcss-svgo": {
@@ -14336,10 +14766,10 @@
 			"integrity": "sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==",
 			"dev": true,
 			"requires": {
-				"is-svg": "^3.0.0",
-				"postcss": "^7.0.0",
-				"postcss-value-parser": "^3.0.0",
-				"svgo": "^1.0.0"
+				"is-svg": "3.0.0",
+				"postcss": "7.0.35",
+				"postcss-value-parser": "3.3.1",
+				"svgo": "1.3.2"
 			}
 		},
 		"postcss-unique-selectors": {
@@ -14348,9 +14778,9 @@
 			"integrity": "sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==",
 			"dev": true,
 			"requires": {
-				"alphanum-sort": "^1.0.0",
-				"postcss": "^7.0.0",
-				"uniqs": "^2.0.0"
+				"alphanum-sort": "1.0.2",
+				"postcss": "7.0.35",
+				"uniqs": "2.0.0"
 			}
 		},
 		"postcss-value-parser": {
@@ -14364,9 +14794,9 @@
 			"integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
 			"dev": true,
 			"requires": {
-				"flatten": "^1.0.2",
-				"indexes-of": "^1.0.1",
-				"uniq": "^1.0.1"
+				"flatten": "1.0.3",
+				"indexes-of": "1.0.1",
+				"uniq": "1.0.1"
 			}
 		},
 		"prefix-style": {
@@ -14393,19 +14823,27 @@
 			"dev": true
 		},
 		"pretty-bytes": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz",
-			"integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==",
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+			"integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
 			"dev": true
 		},
 		"pretty-error": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz",
-			"integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=",
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz",
+			"integrity": "sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==",
 			"dev": true,
 			"requires": {
-				"renderkid": "^2.0.1",
-				"utila": "~0.4"
+				"lodash": "4.17.21",
+				"renderkid": "2.0.5"
+			},
+			"dependencies": {
+				"lodash": {
+					"version": "4.17.21",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+					"dev": true
+				}
 			}
 		},
 		"pretty-format": {
@@ -14414,10 +14852,10 @@
 			"integrity": "sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==",
 			"dev": true,
 			"requires": {
-				"@jest/types": "^24.9.0",
-				"ansi-regex": "^4.0.0",
-				"ansi-styles": "^3.2.0",
-				"react-is": "^16.8.4"
+				"@jest/types": "24.9.0",
+				"ansi-regex": "4.1.0",
+				"ansi-styles": "3.2.1",
+				"react-is": "16.13.1"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -14451,7 +14889,7 @@
 			"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
 			"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
 			"requires": {
-				"asap": "~2.0.3"
+				"asap": "2.0.6"
 			}
 		},
 		"promise-inflight": {
@@ -14466,21 +14904,21 @@
 			"integrity": "sha1-V3VPZPVD/XsIRXB8gY7OYY8F/9w=",
 			"dev": true,
 			"requires": {
-				"pkginfo": "0.x.x",
-				"read": "1.0.x",
-				"revalidator": "0.1.x",
-				"utile": "0.2.x",
-				"winston": "0.8.x"
+				"pkginfo": "0.4.1",
+				"read": "1.0.5",
+				"revalidator": "0.1.8",
+				"utile": "0.2.1",
+				"winston": "0.8.3"
 			}
 		},
 		"prompts": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-			"integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+			"version": "2.4.1",
+			"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.1.tgz",
+			"integrity": "sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==",
 			"dev": true,
 			"requires": {
-				"kleur": "^3.0.3",
-				"sisteransi": "^1.0.4"
+				"kleur": "3.0.3",
+				"sisteransi": "1.0.5"
 			}
 		},
 		"prop-types": {
@@ -14488,9 +14926,9 @@
 			"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
 			"integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
 			"requires": {
-				"loose-envify": "^1.4.0",
-				"object-assign": "^4.1.1",
-				"react-is": "^16.8.1"
+				"loose-envify": "1.4.0",
+				"object-assign": "4.1.1",
+				"react-is": "16.13.1"
 			}
 		},
 		"prop-types-exact": {
@@ -14498,9 +14936,9 @@
 			"resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
 			"integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
 			"requires": {
-				"has": "^1.0.3",
-				"object.assign": "^4.1.0",
-				"reflect.ownkeys": "^0.2.0"
+				"has": "1.0.3",
+				"object.assign": "4.1.0",
+				"reflect.ownkeys": "0.2.0"
 			}
 		},
 		"proxy-addr": {
@@ -14509,7 +14947,7 @@
 			"integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
 			"dev": true,
 			"requires": {
-				"forwarded": "~0.1.2",
+				"forwarded": "0.1.2",
 				"ipaddr.js": "1.9.1"
 			}
 		},
@@ -14537,18 +14975,18 @@
 			"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.1.0",
-				"browserify-rsa": "^4.0.0",
-				"create-hash": "^1.1.0",
-				"parse-asn1": "^5.0.0",
-				"randombytes": "^2.0.1",
-				"safe-buffer": "^5.1.2"
+				"bn.js": "4.12.0",
+				"browserify-rsa": "4.1.0",
+				"create-hash": "1.2.0",
+				"parse-asn1": "5.1.6",
+				"randombytes": "2.1.0",
+				"safe-buffer": "5.2.1"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
@@ -14559,8 +14997,8 @@
 			"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
 			"dev": true,
 			"requires": {
-				"end-of-stream": "^1.1.0",
-				"once": "^1.3.1"
+				"end-of-stream": "1.4.4",
+				"once": "1.4.0"
 			}
 		},
 		"pumpify": {
@@ -14569,9 +15007,9 @@
 			"integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
 			"dev": true,
 			"requires": {
-				"duplexify": "^3.6.0",
-				"inherits": "^2.0.3",
-				"pump": "^2.0.0"
+				"duplexify": "3.7.1",
+				"inherits": "2.0.4",
+				"pump": "2.0.1"
 			},
 			"dependencies": {
 				"pump": {
@@ -14580,8 +15018,8 @@
 					"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
 					"dev": true,
 					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
+						"end-of-stream": "1.4.4",
+						"once": "1.4.0"
 					}
 				}
 			}
@@ -14608,7 +15046,7 @@
 			"resolved": "https://registry.npmjs.org/qrcode.react/-/qrcode.react-0.9.3.tgz",
 			"integrity": "sha512-gGd30Ez7cmrKxyN2M3nueaNLk/f9J7NDRgaD5fVgxGpPLsYGWMn9UQ+XnDpv95cfszTQTdaf4QGLNMf3xU0hmw==",
 			"requires": {
-				"prop-types": "^15.6.0",
+				"prop-types": "15.7.2",
 				"qr.js": "0.0.0"
 			}
 		},
@@ -14623,9 +15061,9 @@
 			"resolved": "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz",
 			"integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==",
 			"requires": {
-				"decode-uri-component": "^0.2.0",
-				"object-assign": "^4.1.0",
-				"strict-uri-encode": "^1.0.0"
+				"decode-uri-component": "0.2.0",
+				"object-assign": "4.1.1",
+				"strict-uri-encode": "1.1.0"
 			}
 		},
 		"querystring": {
@@ -14657,7 +15095,7 @@
 			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
 			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
 			"requires": {
-				"performance-now": "^2.1.0"
+				"performance-now": "2.1.0"
 			}
 		},
 		"randombytes": {
@@ -14666,7 +15104,7 @@
 			"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "^5.1.0"
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"randomfill": {
@@ -14675,8 +15113,8 @@
 			"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 			"dev": true,
 			"requires": {
-				"randombytes": "^2.0.5",
-				"safe-buffer": "^5.1.0"
+				"randombytes": "2.1.0",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"range-parser": {
@@ -14695,6 +15133,14 @@
 				"http-errors": "1.7.2",
 				"iconv-lite": "0.4.24",
 				"unpipe": "1.0.0"
+			},
+			"dependencies": {
+				"bytes": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+					"integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+					"dev": true
+				}
 			}
 		},
 		"rc-align": {
@@ -14702,10 +15148,10 @@
 			"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-2.4.5.tgz",
 			"integrity": "sha512-nv9wYUYdfyfK+qskThf4BQUSIadeI/dCsfaMZfNEoxm9HwOIioQ+LyqmMK6jWHAZQgOzMLaqawhuBXlF63vgjw==",
 			"requires": {
-				"babel-runtime": "^6.26.0",
-				"dom-align": "^1.7.0",
-				"prop-types": "^15.5.8",
-				"rc-util": "^4.0.4"
+				"babel-runtime": "6.26.0",
+				"dom-align": "1.12.0",
+				"prop-types": "15.7.2",
+				"rc-util": "4.21.1"
 			}
 		},
 		"rc-animate": {
@@ -14713,13 +15159,13 @@
 			"resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz",
 			"integrity": "sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.6",
-				"css-animation": "^1.3.2",
-				"prop-types": "15.x",
-				"raf": "^3.4.0",
-				"rc-util": "^4.15.3",
-				"react-lifecycles-compat": "^3.0.4"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"css-animation": "1.6.1",
+				"prop-types": "15.7.2",
+				"raf": "3.4.1",
+				"rc-util": "4.21.1",
+				"react-lifecycles-compat": "3.0.4"
 			}
 		},
 		"rc-cascader": {
@@ -14727,10 +15173,10 @@
 			"resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-1.3.0.tgz",
 			"integrity": "sha512-wayuMo/dSZixvdpiRFZB4Q6A3omKRXQcJ3CxN02+PNiTEcRnK2KDqKUzrx7GwgMsyH5tz90lUZ91lLaEPNFv0A==",
 			"requires": {
-				"array-tree-filter": "^2.1.0",
-				"rc-trigger": "^4.0.0",
-				"rc-util": "^5.0.1",
-				"warning": "^4.0.1"
+				"array-tree-filter": "2.1.0",
+				"rc-trigger": "4.4.2",
+				"rc-util": "5.2.1",
+				"warning": "4.0.3"
 			},
 			"dependencies": {
 				"rc-align": {
@@ -14738,11 +15184,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -14750,12 +15196,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -14763,8 +15209,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -14774,8 +15220,8 @@
 			"resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.3.1.tgz",
 			"integrity": "sha512-i290/iTqmZ0WtI2UPIryqT9rW6O99+an4KeZIyZDH3r+Jbb6YdddaWNdzq7g5m9zaNhJvgjf//wJtC4fvve2Tg==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6"
 			}
 		},
 		"rc-collapse": {
@@ -14783,11 +15229,11 @@
 			"resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-2.0.0.tgz",
 			"integrity": "sha512-R5+Ge1uzwK9G1wZPRPhqQsed4FXTDmU0BKzsqfNBtZdk/wd+yey8ZutmJmSozYc5hQwjPkCvJHV7gOIRZKIlJg==",
 			"requires": {
-				"@ant-design/css-animation": "^1.7.2",
-				"classnames": "2.x",
-				"rc-animate": "3.x",
-				"react-is": "^16.7.0",
-				"shallowequal": "^1.1.0"
+				"@ant-design/css-animation": "1.7.3",
+				"classnames": "2.2.6",
+				"rc-animate": "3.1.0",
+				"react-is": "16.13.1",
+				"shallowequal": "1.1.0"
 			},
 			"dependencies": {
 				"rc-animate": {
@@ -14795,10 +15241,10 @@
 					"resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.0.tgz",
 					"integrity": "sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==",
 					"requires": {
-						"@ant-design/css-animation": "^1.7.2",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.0",
-						"rc-util": "^5.0.1"
+						"@ant-design/css-animation": "1.7.3",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -14806,8 +15252,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -14817,11 +15263,11 @@
 			"resolved": "https://registry.npmjs.org/rc-color-picker/-/rc-color-picker-1.2.6.tgz",
 			"integrity": "sha512-AaC9Pg7qCHSy5M4eVbqDIaNb2FC4SEw82GOHB2C4R/+vF2FVa/r5XA+Igg5+zLPmAvBLhz9tL4MAfkRA8yWNJw==",
 			"requires": {
-				"classnames": "^2.2.5",
-				"prop-types": "^15.5.8",
-				"rc-trigger": "1.x",
-				"rc-util": "^4.0.2",
-				"tinycolor2": "^1.4.1"
+				"classnames": "2.2.6",
+				"prop-types": "15.7.2",
+				"rc-trigger": "1.11.5",
+				"rc-util": "4.21.1",
+				"tinycolor2": "1.4.1"
 			},
 			"dependencies": {
 				"rc-trigger": {
@@ -14829,12 +15275,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-1.11.5.tgz",
 					"integrity": "sha512-MBuUPw1nFzA4K7jQOwb7uvFaZFjXGd00EofUYiZ+l/fgKVq8wnLC0lkv36kwqM7vfKyftRo2sh7cWVpdPuNnnw==",
 					"requires": {
-						"babel-runtime": "6.x",
-						"create-react-class": "15.x",
-						"prop-types": "15.x",
-						"rc-align": "2.x",
-						"rc-animate": "2.x",
-						"rc-util": "4.x"
+						"babel-runtime": "6.26.0",
+						"create-react-class": "15.6.3",
+						"prop-types": "15.7.2",
+						"rc-align": "2.4.5",
+						"rc-animate": "2.11.1",
+						"rc-util": "4.21.1"
 					}
 				}
 			}
@@ -14844,8 +15290,8 @@
 			"resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-8.1.1.tgz",
 			"integrity": "sha512-ToyHiMlV94z8LfnmeKoVvu04Pd9+HdwwSHhY2a8IWeYGA5Cjk1WyIZvS+njCsm8rSMM4NqPqFkMZA0N/Iw0NrQ==",
 			"requires": {
-				"rc-animate": "3.x",
-				"rc-util": "^5.0.1"
+				"rc-animate": "3.1.0",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-animate": {
@@ -14853,10 +15299,10 @@
 					"resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.0.tgz",
 					"integrity": "sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==",
 					"requires": {
-						"@ant-design/css-animation": "^1.7.2",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.0",
-						"rc-util": "^5.0.1"
+						"@ant-design/css-animation": "1.7.3",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -14864,8 +15310,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -14875,9 +15321,9 @@
 			"resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-4.1.0.tgz",
 			"integrity": "sha512-kjeQFngPjdzAFahNIV0EvEBoIKMOnvUsAxpkSPELoD/1DuR4nLafom5ryma+TIxGwkFJ92W6yjsMi1U9aiOTeQ==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.6",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -14885,8 +15331,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -14896,9 +15342,9 @@
 			"resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-3.1.2.tgz",
 			"integrity": "sha512-s2W5jqvjTid5DxotGO5FlTBaQWeB+Bu7McQgjB8Ot3Wbl72AIKwLf11+lgbV4mA2vWC1H8DKyn6SW9TKLTi0xg==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.6",
-				"rc-trigger": "^4.0.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-trigger": "4.4.2"
 			},
 			"dependencies": {
 				"rc-align": {
@@ -14906,11 +15352,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -14918,12 +15364,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -14931,8 +15377,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -14942,13 +15388,13 @@
 			"resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz",
 			"integrity": "sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==",
 			"requires": {
-				"babel-runtime": "^6.26.0",
-				"classnames": "^2.2.5",
-				"draft-js": "^0.10.0",
-				"immutable": "^3.7.4",
-				"lodash": "^4.16.5",
-				"prop-types": "^15.5.8",
-				"setimmediate": "^1.0.5"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"draft-js": "0.10.5",
+				"immutable": "3.7.6",
+				"lodash": "4.17.19",
+				"prop-types": "15.7.2",
+				"setimmediate": "1.0.5"
 			},
 			"dependencies": {
 				"draft-js": {
@@ -14956,9 +15402,9 @@
 					"resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
 					"integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
 					"requires": {
-						"fbjs": "^0.8.15",
-						"immutable": "~3.7.4",
-						"object-assign": "^4.1.0"
+						"fbjs": "0.8.17",
+						"immutable": "3.7.6",
+						"object-assign": "4.1.1"
 					}
 				}
 			}
@@ -14968,14 +15414,14 @@
 			"resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz",
 			"integrity": "sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==",
 			"requires": {
-				"babel-runtime": "^6.23.0",
-				"classnames": "^2.2.5",
-				"dom-scroll-into-view": "^1.2.0",
-				"draft-js": "~0.10.0",
-				"immutable": "~3.7.4",
-				"prop-types": "^15.5.8",
-				"rc-animate": "^2.3.0",
-				"rc-editor-core": "~0.8.3"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"dom-scroll-into-view": "1.2.1",
+				"draft-js": "0.10.5",
+				"immutable": "3.7.6",
+				"prop-types": "15.7.2",
+				"rc-animate": "2.11.1",
+				"rc-editor-core": "0.8.10"
 			},
 			"dependencies": {
 				"draft-js": {
@@ -14983,9 +15429,9 @@
 					"resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
 					"integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
 					"requires": {
-						"fbjs": "^0.8.15",
-						"immutable": "~3.7.4",
-						"object-assign": "^4.1.0"
+						"fbjs": "0.8.17",
+						"immutable": "3.7.6",
+						"object-assign": "4.1.1"
 					}
 				}
 			}
@@ -14995,9 +15441,9 @@
 			"resolved": "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.10.1.tgz",
 			"integrity": "sha512-aosTtNTqLYX2jsG5GyCv7axe+b57XH73T7TmmrX/cmhemhtFjvNE6RkRkmtP9VOJnZg5YGC5HfK172cnJ1Ij7Q==",
 			"requires": {
-				"@babel/runtime": "^7.8.4",
-				"async-validator": "^3.0.3",
-				"rc-util": "^5.0.0"
+				"@babel/runtime": "7.10.4",
+				"async-validator": "3.4.0",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"async-validator": {
@@ -15010,8 +15456,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15021,14 +15467,14 @@
 			"resolved": "https://registry.npmjs.org/rc-form/-/rc-form-2.4.11.tgz",
 			"integrity": "sha512-8BL+FNlFLTOY/A5X6tU35GQJLSIpsmqpwn/tFAYQTczXc4dMJ33ggtH248Cum8+LS0jLTsJKG2L4Qp+1CkY+sA==",
 			"requires": {
-				"async-validator": "~1.11.3",
-				"babel-runtime": "6.x",
-				"create-react-class": "^15.5.3",
-				"dom-scroll-into-view": "1.x",
-				"hoist-non-react-statics": "^3.3.0",
-				"lodash": "^4.17.4",
-				"rc-util": "^4.15.3",
-				"warning": "^4.0.3"
+				"async-validator": "1.11.5",
+				"babel-runtime": "6.26.0",
+				"create-react-class": "15.6.3",
+				"dom-scroll-into-view": "1.2.1",
+				"hoist-non-react-statics": "3.3.2",
+				"lodash": "4.17.19",
+				"rc-util": "4.21.1",
+				"warning": "4.0.3"
 			}
 		},
 		"rc-gesture": {
@@ -15036,7 +15482,7 @@
 			"resolved": "https://registry.npmjs.org/rc-gesture/-/rc-gesture-0.0.22.tgz",
 			"integrity": "sha512-6G6qrCE0MUTXyjh/powj91XkjRjoFL4HiJLPU5lALXHvGX+/efcUjGYUrHrrw0mwQdmrmg4POqnY/bibns+G3g==",
 			"requires": {
-				"babel-runtime": "6.x"
+				"babel-runtime": "6.26.0"
 			}
 		},
 		"rc-image": {
@@ -15044,11 +15490,11 @@
 			"resolved": "https://registry.npmjs.org/rc-image/-/rc-image-3.0.4.tgz",
 			"integrity": "sha512-XPcggtKffW4k2ktOxzcu4N4RXnQwN7yrdiS0rRXK4r55SHb8BG7qQUmA0VnvKF7o+bPXUP18A3y+OI35hr8CLQ==",
 			"requires": {
-				"@ant-design/icons": "^4.2.2",
-				"@babel/runtime": "^7.11.2",
-				"classnames": "^2.2.6",
-				"rc-dialog": "^8.3.2",
-				"rc-util": "^5.0.6"
+				"@ant-design/icons": "4.2.2",
+				"@babel/runtime": "7.11.2",
+				"classnames": "2.2.6",
+				"rc-dialog": "8.3.3",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"@babel/runtime": {
@@ -15056,7 +15502,7 @@
 					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
 					"integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
 					"requires": {
-						"regenerator-runtime": "^0.13.4"
+						"regenerator-runtime": "0.13.7"
 					}
 				},
 				"rc-animate": {
@@ -15064,10 +15510,10 @@
 					"resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.0.tgz",
 					"integrity": "sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==",
 					"requires": {
-						"@ant-design/css-animation": "^1.7.2",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.0",
-						"rc-util": "^5.0.1"
+						"@ant-design/css-animation": "1.7.3",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-dialog": {
@@ -15075,9 +15521,9 @@
 					"resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-8.3.3.tgz",
 					"integrity": "sha512-EEc9PoyZ+5lLdoT+b8p39628qQngULF/+Id1Sw/LNE26+P/fjEdbTisAanCZyrguhjPI5ougAkEr3drlQAW/ZA==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"rc-animate": "3.x",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.11.2",
+						"rc-animate": "3.1.0",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15085,8 +15531,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				},
 				"regenerator-runtime": {
@@ -15101,9 +15547,9 @@
 			"resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-6.0.0.tgz",
 			"integrity": "sha512-vbe+g7HvR/joknSnvLkBTi9N9I+LsV4kljfuog8WNiS7OAF3aEN0QcHSOQ4+xk6+Hx9P1tU63z2+TyEx8W/j2Q==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.5",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15111,8 +15557,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15122,12 +15568,12 @@
 			"resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-1.4.2.tgz",
 			"integrity": "sha512-wSmHRF9kFwrbj59mR+u4yVr0KtcrfPw53PYOVizYxYeDfmwaCcSgk29F8OjlDy5jVqUaMhHX5nIiYCePu5Aytg==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.6",
-				"rc-menu": "^8.0.1",
-				"rc-textarea": "^0.3.0",
-				"rc-trigger": "^4.3.0",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-menu": "8.5.3",
+				"rc-textarea": "0.3.0",
+				"rc-trigger": "4.4.2",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-align": {
@@ -15135,11 +15581,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -15147,12 +15593,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15160,8 +15606,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15171,15 +15617,15 @@
 			"resolved": "https://registry.npmjs.org/rc-menu/-/rc-menu-8.5.3.tgz",
 			"integrity": "sha512-OLdN+jwhabgyRZDvWYjYpO7RP7wLybhNuAulgGqx1oUPBJrtgVlG/X4HtPb7nypRx/n+eicj6H8CtbCs0L4m/Q==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "2.x",
-				"mini-store": "^3.0.1",
-				"omit.js": "^2.0.0",
-				"rc-motion": "^1.0.1",
-				"rc-trigger": "^4.4.0",
-				"rc-util": "^5.0.1",
-				"resize-observer-polyfill": "^1.5.0",
-				"shallowequal": "^1.1.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"mini-store": "3.0.6",
+				"omit.js": "2.0.2",
+				"rc-motion": "1.1.2",
+				"rc-trigger": "4.4.2",
+				"rc-util": "5.2.1",
+				"resize-observer-polyfill": "1.5.1",
+				"shallowequal": "1.1.0"
 			},
 			"dependencies": {
 				"omit.js": {
@@ -15192,11 +15638,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -15204,12 +15650,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15217,8 +15663,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15228,10 +15674,10 @@
 			"resolved": "https://registry.npmjs.org/rc-motion/-/rc-motion-1.1.2.tgz",
 			"integrity": "sha512-YC/E7SSWKBFakYg4PENhSRWD4ZLDqkI7FKmutJcrMewZ91/ZIWfoZSDvPaBdKO0hsFrrzWepFhXQIq0FNnCMWA==",
 			"requires": {
-				"@babel/runtime": "^7.11.1",
-				"classnames": "^2.2.1",
-				"raf": "^3.4.1",
-				"rc-util": "^5.0.6"
+				"@babel/runtime": "7.11.2",
+				"classnames": "2.2.6",
+				"raf": "3.4.1",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"@babel/runtime": {
@@ -15239,7 +15685,7 @@
 					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz",
 					"integrity": "sha512-TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw==",
 					"requires": {
-						"regenerator-runtime": "^0.13.4"
+						"regenerator-runtime": "0.13.7"
 					}
 				},
 				"rc-util": {
@@ -15247,8 +15693,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				},
 				"regenerator-runtime": {
@@ -15263,10 +15709,10 @@
 			"resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-4.4.0.tgz",
 			"integrity": "sha512-IDeNAFGVeOsy1tv4zNVqMAXB9tianR80ewQbtObaAQfjwAjWfONdqdyjFkEU6nc6UQhSUYA5OcTGb7kwwbnh0g==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "2.x",
-				"rc-animate": "3.x",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-animate": "3.1.0",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-animate": {
@@ -15274,10 +15720,10 @@
 					"resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.1.0.tgz",
 					"integrity": "sha512-8FsM+3B1H+0AyTyGggY6JyVldHTs1CyYT8CfTmG/nGHHXlecvSLeICJhcKgRLjUiQlctNnRtB1rwz79cvBVmrw==",
 					"requires": {
-						"@ant-design/css-animation": "^1.7.2",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.0",
-						"rc-util": "^5.0.1"
+						"@ant-design/css-animation": "1.7.3",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15285,8 +15731,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15296,8 +15742,8 @@
 			"resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-3.0.3.tgz",
 			"integrity": "sha512-xm6LsiSOAWlxferiL5e0jcun1B9vbvYzcIkqpYZR7YvC5ZrcU9KKihb+DZe3DY+oUc49xhX2qGS4D66ITHqekQ==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6"
 			}
 		},
 		"rc-picker": {
@@ -15305,14 +15751,14 @@
 			"resolved": "https://registry.npmjs.org/rc-picker/-/rc-picker-2.0.9.tgz",
 			"integrity": "sha512-fLVYQYUv+gV9Nr5TXsf//3if7mKaGT/h3roONNSrw3KN86To/ppbfFgvJfzkfdO7zyfY8TpOVhdgYPATehEolg==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.1",
-				"date-fns": "^2.15.0",
-				"dayjs": "^1.8.30",
-				"moment": "^2.24.0",
-				"rc-trigger": "^4.0.0",
-				"rc-util": "^5.0.1",
-				"shallowequal": "^1.1.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"date-fns": "2.16.1",
+				"dayjs": "1.8.35",
+				"moment": "2.24.0",
+				"rc-trigger": "4.4.2",
+				"rc-util": "5.2.1",
+				"shallowequal": "1.1.0"
 			},
 			"dependencies": {
 				"date-fns": {
@@ -15325,11 +15771,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -15337,12 +15783,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15350,8 +15796,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15361,7 +15807,7 @@
 			"resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-3.0.0.tgz",
 			"integrity": "sha512-dQv1KU3o6Vay604FMYMF4S0x4GNXAgXf1tbQ1QoxeIeQt4d5fUeB7Ri82YPu+G+aRvH/AtxYAlEcnxyVZ1/4Hw==",
 			"requires": {
-				"classnames": "^2.2.6"
+				"classnames": "2.2.6"
 			}
 		},
 		"rc-rate": {
@@ -15369,9 +15815,9 @@
 			"resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.8.2.tgz",
 			"integrity": "sha512-f9T/D+ZwWQrWHkpidpQbnXpnVMGMC4eSRAkwuu88a8Qv1C/9LNc4AErazoh8tpnZBFqq19F3j0Glv+sDgkfEig==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.5",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15379,8 +15825,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15390,10 +15836,10 @@
 			"resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-0.2.5.tgz",
 			"integrity": "sha512-cc4sOI722MVoCkGf/ZZybDVsjxvnH0giyDdA7wBJLTiMSFJ0eyxBMnr0JLYoClxftjnr75Xzl/VUB3HDrAx04Q==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.1",
-				"rc-util": "^5.0.0",
-				"resize-observer-polyfill": "^1.5.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-util": "5.2.1",
+				"resize-observer-polyfill": "1.5.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15401,8 +15847,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15412,13 +15858,13 @@
 			"resolved": "https://registry.npmjs.org/rc-select/-/rc-select-11.1.7.tgz",
 			"integrity": "sha512-HZozKGhFbLDI995OUKQW2uZ2ZcGyzNhWN6gTQqpW5/Z0rae1zftpgkI1yxZ79LukOc8lO2NKlDDKCGH/SJH2Cg==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "2.x",
-				"rc-motion": "^1.0.1",
-				"rc-trigger": "^4.3.0",
-				"rc-util": "^5.0.1",
-				"rc-virtual-list": "^3.0.3",
-				"warning": "^4.0.3"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-motion": "1.1.2",
+				"rc-trigger": "4.4.2",
+				"rc-util": "5.2.1",
+				"rc-virtual-list": "3.0.12",
+				"warning": "4.0.3"
 			},
 			"dependencies": {
 				"rc-align": {
@@ -15426,11 +15872,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -15438,12 +15884,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15451,8 +15897,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15462,11 +15908,11 @@
 			"resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-9.3.1.tgz",
 			"integrity": "sha512-c52PWPyrfJWh28K6dixAm0906L3/4MUIxqrNQA4TLnC/Z+cBNycWJUZoJerpwSOE1HdM3XDwixCsmtFc/7aWlQ==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.5",
-				"rc-tooltip": "^4.0.0",
-				"rc-util": "^5.0.0",
-				"shallowequal": "^1.1.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-tooltip": "4.2.2",
+				"rc-util": "5.2.1",
+				"shallowequal": "1.1.0"
 			},
 			"dependencies": {
 				"rc-align": {
@@ -15474,11 +15920,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-tooltip": {
@@ -15486,7 +15932,7 @@
 					"resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-4.2.2.tgz",
 					"integrity": "sha512-mAs+gAngUyHVA6HdFXsELoJOHgfjAACLLc8SGtnVhovJdyqs5ZGSL9p5i+ApNaVpwjswqShw7L4DRtMl7cXCQg==",
 					"requires": {
-						"rc-trigger": "^4.2.1"
+						"rc-trigger": "4.4.2"
 					}
 				},
 				"rc-trigger": {
@@ -15494,12 +15940,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15507,8 +15953,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15518,9 +15964,9 @@
 			"resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-4.1.2.tgz",
 			"integrity": "sha512-kTPiojPtJi12Y7whRqlydRgJXQ1u9JlvGchI6xDrmOMZVpCTLpfc/18iu+aHCtCZaSnM2ENU/9lfm/naWVFcRw==",
 			"requires": {
-				"@babel/runtime": "^7.10.2",
-				"classnames": "^2.2.3",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15528,8 +15974,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15539,10 +15985,10 @@
 			"resolved": "https://registry.npmjs.org/rc-swipeout/-/rc-swipeout-2.0.11.tgz",
 			"integrity": "sha512-d37Lgn4RX4OOQyuA2BFo0rGlUwrmZk5q83srH3ixJ1Y1jidr2GKjgJDbNeGUVZPNfYBL91Elu6+xfVGftWf4Lg==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "2.x",
-				"rc-gesture": "~0.0.22",
-				"react-native-swipeout": "^2.2.2"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"rc-gesture": "0.0.22",
+				"react-native-swipeout": "2.3.6"
 			}
 		},
 		"rc-switch": {
@@ -15550,9 +15996,9 @@
 			"resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-3.2.1.tgz",
 			"integrity": "sha512-ZXYSmx2U+bpHjljjqS5LGj2UIPcQk0EAq6japkaOzQ/OcyzMwWVD9oXMjcRZdO5W1g/pClIV70uEBOWuBMqP4g==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.1",
-				"rc-util": "^5.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15560,8 +16006,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15571,12 +16017,12 @@
 			"resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.9.7.tgz",
 			"integrity": "sha512-S/46pdU7fKBoL7N8JDu+KpkGSB3fJkiGoxvMCLBrR4p7/BJEYr1X4MFKb5BpkE7ZpEK4n44ILiVZZT7I7EiGVA==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.5",
-				"raf": "^3.4.1",
-				"rc-resize-observer": "^0.2.0",
-				"rc-util": "^5.0.4",
-				"shallowequal": "^1.1.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"raf": "3.4.1",
+				"rc-resize-observer": "0.2.5",
+				"rc-util": "5.2.1",
+				"shallowequal": "1.1.0"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15584,8 +16030,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15595,14 +16041,14 @@
 			"resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-11.6.1.tgz",
 			"integrity": "sha512-fJZUOmwBo2E4WTbucCSZO/N1ZK+d9K/QchgDeycTIqxl5D/xtX0Dw/vC2DFi140OFjAy2JL7H0EmsSeOFfCgzw==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "2.x",
-				"raf": "^3.4.1",
-				"rc-dropdown": "^3.1.0",
-				"rc-menu": "^8.2.1",
-				"rc-resize-observer": "^0.2.1",
-				"rc-trigger": "^4.2.1",
-				"rc-util": "^5.0.0"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"raf": "3.4.1",
+				"rc-dropdown": "3.1.2",
+				"rc-menu": "8.5.3",
+				"rc-resize-observer": "0.2.5",
+				"rc-trigger": "4.4.2",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-align": {
@@ -15610,11 +16056,11 @@
 					"resolved": "https://registry.npmjs.org/rc-align/-/rc-align-4.0.3.tgz",
 					"integrity": "sha512-TpI0t1tvAo/wYdoZbZlkCK+MkQBqNuPyRZesfsji4tMlqoqQ0q0MhnC9JD5KGPitMvmSB+KWgFpaN2uTz4hw6Q==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "2.x",
-						"dom-align": "^1.7.0",
-						"rc-util": "^5.0.1",
-						"resize-observer-polyfill": "^1.5.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"dom-align": "1.12.0",
+						"rc-util": "5.2.1",
+						"resize-observer-polyfill": "1.5.1"
 					}
 				},
 				"rc-trigger": {
@@ -15622,12 +16068,12 @@
 					"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-4.4.2.tgz",
 					"integrity": "sha512-uw2/s7j1b/RXyixa4omPuxZWv/3ln+H+p0v3trIUBxseolbdj8TTFpXYjXMZdGtMpAEAIbN1yo/K+r7wRB+xtQ==",
 					"requires": {
-						"@babel/runtime": "^7.10.1",
-						"classnames": "^2.2.6",
-						"raf": "^3.4.1",
-						"rc-align": "^4.0.0",
-						"rc-motion": "^1.0.0",
-						"rc-util": "^5.0.1"
+						"@babel/runtime": "7.10.4",
+						"classnames": "2.2.6",
+						"raf": "3.4.1",
+						"rc-align": "4.0.3",
+						"rc-motion": "1.1.2",
+						"rc-util": "5.2.1"
 					}
 				},
 				"rc-util": {
@@ -15635,8 +16081,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15646,10 +16092,10 @@
 			"resolved": "https://registry.npmjs.org/rc-textarea/-/rc-textarea-0.3.0.tgz",
 			"integrity": "sha512-vrTPkPT6wrO7EI8ouLFZZLXA1pFVrVRCnkmyyf0yRComFbcH1ogmFEGu85CjVT96rQqAiQFOe0QV3nKopZOJow==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "^2.2.1",
-				"omit.js": "^2.0.0",
-				"rc-resize-observer": "^0.2.3"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"omit.js": "2.0.2",
+				"rc-resize-observer": "0.2.5"
 			},
 			"dependencies": {
 				"omit.js": {
@@ -15664,9 +16110,9 @@
 			"resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz",
 			"integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"prop-types": "^15.5.8",
-				"rc-trigger": "^2.2.2"
+				"babel-runtime": "6.26.0",
+				"prop-types": "15.7.2",
+				"rc-trigger": "2.6.5"
 			}
 		},
 		"rc-tree": {
@@ -15674,11 +16120,11 @@
 			"resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-3.9.4.tgz",
 			"integrity": "sha512-uzgpQL4LLoriYE7xTro2tzb5rd6Eg9lhjWZlN/MaWn+lsFw2nnlLbMULejHd7RQXdYB7t3tTCwk7DiKSN+udrA==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "2.x",
-				"rc-motion": "^1.0.0",
-				"rc-util": "^5.0.0",
-				"rc-virtual-list": "^3.0.1"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-motion": "1.1.2",
+				"rc-util": "5.2.1",
+				"rc-virtual-list": "3.0.12"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15686,8 +16132,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15697,11 +16143,11 @@
 			"resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-4.1.2.tgz",
 			"integrity": "sha512-2tRwZ4ChY+BarVKHoPR65kSZtopgwKCig6ngJiiTVgYfRdAhfdQp2j2+L8YW9TkosYGmwgTOhmlphlG3QNy7Pg==",
 			"requires": {
-				"@babel/runtime": "^7.10.1",
-				"classnames": "2.x",
-				"rc-select": "^11.1.1",
-				"rc-tree": "^3.8.0",
-				"rc-util": "^5.0.5"
+				"@babel/runtime": "7.10.4",
+				"classnames": "2.2.6",
+				"rc-select": "11.1.7",
+				"rc-tree": "3.9.4",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15709,8 +16155,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15720,13 +16166,13 @@
 			"resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-2.6.5.tgz",
 			"integrity": "sha512-m6Cts9hLeZWsTvWnuMm7oElhf+03GOjOLfTuU0QmdB9ZrW7jR2IpI5rpNM7i9MvAAlMAmTx5Zr7g3uu/aMvZAw==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.6",
-				"prop-types": "15.x",
-				"rc-align": "^2.4.0",
-				"rc-animate": "2.x",
-				"rc-util": "^4.4.0",
-				"react-lifecycles-compat": "^3.0.4"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"prop-types": "15.7.2",
+				"rc-align": "2.4.5",
+				"rc-animate": "2.11.1",
+				"rc-util": "4.21.1",
+				"react-lifecycles-compat": "3.0.4"
 			}
 		},
 		"rc-upload": {
@@ -15734,7 +16180,7 @@
 			"resolved": "https://registry.npmjs.org/rc-upload/-/rc-upload-3.2.1.tgz",
 			"integrity": "sha512-gmIy08tco2YFTSiru9zgeTmUcDKPyUMUUBdUIjG2CcHz4jdbpaPx/RL/Wz9CMD6ppQizK0gES0rcQ1+o5frK2Q==",
 			"requires": {
-				"classnames": "^2.2.5"
+				"classnames": "2.2.6"
 			}
 		},
 		"rc-util": {
@@ -15742,11 +16188,11 @@
 			"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz",
 			"integrity": "sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg==",
 			"requires": {
-				"add-dom-event-listener": "^1.1.0",
-				"prop-types": "^15.5.10",
-				"react-is": "^16.12.0",
-				"react-lifecycles-compat": "^3.0.4",
-				"shallowequal": "^1.1.0"
+				"add-dom-event-listener": "1.1.0",
+				"prop-types": "15.7.2",
+				"react-is": "16.13.1",
+				"react-lifecycles-compat": "3.0.4",
+				"shallowequal": "1.1.0"
 			}
 		},
 		"rc-virtual-list": {
@@ -15754,9 +16200,9 @@
 			"resolved": "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.0.12.tgz",
 			"integrity": "sha512-CSl/QFkLzuq84rqKi1GcrDnQgnYGdsfDiGtISIX8ZE2Uc4ZmUA2exQ/4lXmX2Hnex/sQK4oO+NJuQYfY3CTxxg==",
 			"requires": {
-				"classnames": "^2.2.6",
-				"rc-resize-observer": "^0.2.3",
-				"rc-util": "^5.0.7"
+				"classnames": "2.2.6",
+				"rc-resize-observer": "0.2.5",
+				"rc-util": "5.2.1"
 			},
 			"dependencies": {
 				"rc-util": {
@@ -15764,8 +16210,8 @@
 					"resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.2.1.tgz",
 					"integrity": "sha512-OnIKp4DsYZpT3St9LwiGARXyMR38wNbk7C4jXS6NGAGHZEQWck7W6qfiJwj+MUmhJiUisAknU6BUs65exbhFTw==",
 					"requires": {
-						"react-is": "^16.12.0",
-						"shallowequal": "^1.1.0"
+						"react-is": "16.13.1",
+						"shallowequal": "1.1.0"
 					}
 				}
 			}
@@ -15775,9 +16221,9 @@
 			"resolved": "https://registry.npmjs.org/react/-/react-16.13.1.tgz",
 			"integrity": "sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w==",
 			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.2"
+				"loose-envify": "1.4.0",
+				"object-assign": "4.1.1",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-addons-shallow-compare": {
@@ -15785,8 +16231,8 @@
 			"resolved": "https://registry.npmjs.org/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.2.tgz",
 			"integrity": "sha1-GYoAuR/DdiPbZKKP0XtZa6NicC8=",
 			"requires": {
-				"fbjs": "^0.8.4",
-				"object-assign": "^4.1.0"
+				"fbjs": "0.8.17",
+				"object-assign": "4.1.1"
 			}
 		},
 		"react-alice-carousel": {
@@ -15794,7 +16240,7 @@
 			"resolved": "https://registry.npmjs.org/react-alice-carousel/-/react-alice-carousel-1.19.3.tgz",
 			"integrity": "sha512-FaOQ/f7C/4cBuXr2tA4YgVyVrvWI7VbccGxJpu+rCsnnUlcN0YLz+20iJ2TFCXJp9M+/FjBratUNC7vQBrMQPw==",
 			"requires": {
-				"prop-types": "^15.5.10",
+				"prop-types": "15.7.2",
 				"vanilla-swipe": "1.2.0"
 			}
 		},
@@ -15804,18 +16250,18 @@
 			"integrity": "sha512-OfBnObtnGgLGfweORmdZbyEz+3dgVePQBb3zipiaDsMHV1NpWm0rDFYIVXFV/AK+x4VIIfWHhrdMIeoTLyRr2g==",
 			"dev": true,
 			"requires": {
-				"core-js": "^3.5.0",
-				"object-assign": "^4.1.1",
-				"promise": "^8.0.3",
-				"raf": "^3.4.1",
-				"regenerator-runtime": "^0.13.3",
-				"whatwg-fetch": "^3.0.0"
+				"core-js": "3.10.0",
+				"object-assign": "4.1.1",
+				"promise": "8.1.0",
+				"raf": "3.4.1",
+				"regenerator-runtime": "0.13.7",
+				"whatwg-fetch": "3.1.1"
 			},
 			"dependencies": {
 				"core-js": {
-					"version": "3.6.5",
-					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-					"integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==",
+					"version": "3.10.0",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.10.0.tgz",
+					"integrity": "sha512-MQx/7TLgmmDVamSyfE+O+5BHvG1aUGj/gHhLn1wVtm2B5u1eVIPvh7vkfjwWKNCjrTJB8+He99IntSQ1qP+vYQ==",
 					"dev": true
 				},
 				"promise": {
@@ -15824,7 +16270,7 @@
 					"integrity": "sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q==",
 					"dev": true,
 					"requires": {
-						"asap": "~2.0.6"
+						"asap": "2.0.6"
 					}
 				},
 				"regenerator-runtime": {
@@ -15840,8 +16286,8 @@
 			"resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz",
 			"integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==",
 			"requires": {
-				"copy-to-clipboard": "^3",
-				"prop-types": "^15.5.8"
+				"copy-to-clipboard": "3.3.1",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-csv": {
@@ -15854,9 +16300,9 @@
 			"resolved": "https://registry.npmjs.org/react-custom-scrollbars/-/react-custom-scrollbars-4.2.1.tgz",
 			"integrity": "sha1-gw/ZUCkn6X6KeMIIaBOJmyqLZts=",
 			"requires": {
-				"dom-css": "^2.0.0",
-				"prop-types": "^15.5.10",
-				"raf": "^3.1.0"
+				"dom-css": "2.1.0",
+				"prop-types": "15.7.2",
+				"raf": "3.4.1"
 			}
 		},
 		"react-dates": {
@@ -15864,20 +16310,20 @@
 			"resolved": "https://registry.npmjs.org/react-dates/-/react-dates-20.1.0.tgz",
 			"integrity": "sha512-GHUb7UHzsomYLUWxafVgMBnwHPzkP6dcPk0u84ODf1USiU819eLqFu7HMRCFQsvSBSSl41dTRT8dIUs+zC4Q6Q==",
 			"requires": {
-				"airbnb-prop-types": "^2.10.0",
-				"consolidated-events": "^1.1.1 || ^2.0.0",
-				"is-touch-device": "^1.0.1",
-				"lodash": "^4.1.1",
-				"object.assign": "^4.1.0",
-				"object.values": "^1.0.4",
-				"prop-types": "^15.6.1",
-				"react-addons-shallow-compare": "^15.6.2",
-				"react-moment-proptypes": "^1.6.0",
-				"react-outside-click-handler": "^1.2.0",
-				"react-portal": "^4.1.5",
-				"react-with-direction": "^1.3.0",
-				"react-with-styles": "^3.2.0",
-				"react-with-styles-interface-css": "^4.0.2"
+				"airbnb-prop-types": "2.16.0",
+				"consolidated-events": "2.0.2",
+				"is-touch-device": "1.0.1",
+				"lodash": "4.17.19",
+				"object.assign": "4.1.0",
+				"object.values": "1.1.1",
+				"prop-types": "15.7.2",
+				"react-addons-shallow-compare": "15.6.2",
+				"react-moment-proptypes": "1.7.0",
+				"react-outside-click-handler": "1.3.0",
+				"react-portal": "4.2.1",
+				"react-with-direction": "1.3.1",
+				"react-with-styles": "3.2.3",
+				"react-with-styles-interface-css": "4.0.3"
 			}
 		},
 		"react-dev-utils": {
@@ -15903,9 +16349,9 @@
 				"inquirer": "7.0.4",
 				"is-root": "2.1.0",
 				"loader-utils": "1.2.3",
-				"open": "^7.0.2",
+				"open": "7.4.2",
 				"pkg-up": "3.1.0",
-				"react-error-overlay": "^6.0.7",
+				"react-error-overlay": "6.0.9",
 				"recursive-readdir": "2.2.2",
 				"shell-quote": "1.7.2",
 				"strip-ansi": "6.0.0",
@@ -15918,16 +16364,16 @@
 					"integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
 					"dev": true,
 					"requires": {
-						"@babel/highlight": "^7.8.3"
+						"@babel/highlight": "7.10.4"
 					}
 				},
 				"ansi-escapes": {
-					"version": "4.3.1",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz",
-					"integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==",
+					"version": "4.3.2",
+					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+					"integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
 					"dev": true,
 					"requires": {
-						"type-fest": "^0.11.0"
+						"type-fest": "0.21.3"
 					}
 				},
 				"ansi-regex": {
@@ -15942,10 +16388,10 @@
 					"integrity": "sha512-TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA==",
 					"dev": true,
 					"requires": {
-						"caniuse-lite": "^1.0.30001035",
-						"electron-to-chromium": "^1.3.378",
-						"node-releases": "^1.1.52",
-						"pkg-up": "^3.1.0"
+						"caniuse-lite": "1.0.30001207",
+						"electron-to-chromium": "1.3.708",
+						"node-releases": "1.1.71",
+						"pkg-up": "3.1.0"
 					}
 				},
 				"cli-cursor": {
@@ -15954,7 +16400,7 @@
 					"integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
 					"dev": true,
 					"requires": {
-						"restore-cursor": "^3.1.0"
+						"restore-cursor": "3.1.0"
 					}
 				},
 				"cli-width": {
@@ -15969,9 +16415,9 @@
 					"integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
 					"dev": true,
 					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
+						"path-key": "3.1.1",
+						"shebang-command": "2.0.0",
+						"which": "2.0.2"
 					}
 				},
 				"emoji-regex": {
@@ -15992,73 +16438,35 @@
 					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
 					"dev": true
 				},
-				"figures": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-					"integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					},
-					"dependencies": {
-						"escape-string-regexp": {
-							"version": "1.0.5",
-							"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-							"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-							"dev": true
-						}
-					}
-				},
 				"find-up": {
 					"version": "4.1.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
 					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 					"dev": true,
 					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
-					}
-				},
-				"globby": {
-					"version": "8.0.2",
-					"resolved": "https://registry.npmjs.org/globby/-/globby-8.0.2.tgz",
-					"integrity": "sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==",
-					"dev": true,
-					"requires": {
-						"array-union": "^1.0.1",
-						"dir-glob": "2.0.0",
-						"fast-glob": "^2.0.2",
-						"glob": "^7.1.2",
-						"ignore": "^3.3.5",
-						"pify": "^3.0.0",
-						"slash": "^1.0.0"
+						"locate-path": "5.0.0",
+						"path-exists": "4.0.0"
 					}
 				},
-				"ignore": {
-					"version": "3.3.10",
-					"resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz",
-					"integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
-					"dev": true
-				},
 				"inquirer": {
 					"version": "7.0.4",
 					"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.0.4.tgz",
 					"integrity": "sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ==",
 					"dev": true,
 					"requires": {
-						"ansi-escapes": "^4.2.1",
-						"chalk": "^2.4.2",
-						"cli-cursor": "^3.1.0",
-						"cli-width": "^2.0.0",
-						"external-editor": "^3.0.3",
-						"figures": "^3.0.0",
-						"lodash": "^4.17.15",
+						"ansi-escapes": "4.3.2",
+						"chalk": "2.4.2",
+						"cli-cursor": "3.1.0",
+						"cli-width": "2.2.1",
+						"external-editor": "3.1.0",
+						"figures": "3.2.0",
+						"lodash": "4.17.19",
 						"mute-stream": "0.0.8",
-						"run-async": "^2.2.0",
-						"rxjs": "^6.5.3",
-						"string-width": "^4.1.0",
-						"strip-ansi": "^5.1.0",
-						"through": "^2.3.6"
+						"run-async": "2.4.1",
+						"rxjs": "6.6.0",
+						"string-width": "4.2.2",
+						"strip-ansi": "5.2.0",
+						"through": "2.3.8"
 					},
 					"dependencies": {
 						"ansi-regex": {
@@ -16073,7 +16481,7 @@
 							"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 							"dev": true,
 							"requires": {
-								"ansi-regex": "^4.1.0"
+								"ansi-regex": "4.1.0"
 							}
 						}
 					}
@@ -16090,7 +16498,7 @@
 					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
 					"dev": true,
 					"requires": {
-						"minimist": "^1.2.0"
+						"minimist": "1.2.5"
 					}
 				},
 				"loader-utils": {
@@ -16099,9 +16507,9 @@
 					"integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
 					"dev": true,
 					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^2.0.0",
-						"json5": "^1.0.1"
+						"big.js": "5.2.2",
+						"emojis-list": "2.1.0",
+						"json5": "1.0.1"
 					}
 				},
 				"locate-path": {
@@ -16110,7 +16518,7 @@
 					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 					"dev": true,
 					"requires": {
-						"p-locate": "^4.1.0"
+						"p-locate": "4.1.0"
 					}
 				},
 				"mimic-fn": {
@@ -16125,7 +16533,7 @@
 					"integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
 					"dev": true,
 					"requires": {
-						"mimic-fn": "^2.1.0"
+						"mimic-fn": "2.1.0"
 					}
 				},
 				"p-locate": {
@@ -16134,7 +16542,7 @@
 					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 					"dev": true,
 					"requires": {
-						"p-limit": "^2.2.0"
+						"p-limit": "2.3.0"
 					}
 				},
 				"path-exists": {
@@ -16155,8 +16563,8 @@
 					"integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
 					"dev": true,
 					"requires": {
-						"onetime": "^5.1.0",
-						"signal-exit": "^3.0.2"
+						"onetime": "5.1.2",
+						"signal-exit": "3.0.3"
 					}
 				},
 				"shebang-command": {
@@ -16165,7 +16573,7 @@
 					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 					"dev": true,
 					"requires": {
-						"shebang-regex": "^3.0.0"
+						"shebang-regex": "3.0.0"
 					}
 				},
 				"shebang-regex": {
@@ -16174,21 +16582,15 @@
 					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 					"dev": true
 				},
-				"slash": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz",
-					"integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
-					"dev": true
-				},
 				"string-width": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+					"version": "4.2.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+					"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.0"
+						"emoji-regex": "8.0.0",
+						"is-fullwidth-code-point": "3.0.0",
+						"strip-ansi": "6.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -16197,13 +16599,13 @@
 					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^5.0.0"
+						"ansi-regex": "5.0.0"
 					}
 				},
 				"type-fest": {
-					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz",
-					"integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==",
+					"version": "0.21.3",
+					"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+					"integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
 					"dev": true
 				},
 				"which": {
@@ -16212,7 +16614,7 @@
 					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 					"dev": true,
 					"requires": {
-						"isexe": "^2.0.0"
+						"isexe": "2.0.0"
 					}
 				}
 			}
@@ -16227,10 +16629,10 @@
 			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.13.1.tgz",
 			"integrity": "sha512-81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag==",
 			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1",
-				"prop-types": "^15.6.2",
-				"scheduler": "^0.19.1"
+				"loose-envify": "1.4.0",
+				"object-assign": "4.1.1",
+				"prop-types": "15.7.2",
+				"scheduler": "0.19.1"
 			}
 		},
 		"react-draft-wysiwyg": {
@@ -16238,17 +16640,17 @@
 			"resolved": "https://registry.npmjs.org/react-draft-wysiwyg/-/react-draft-wysiwyg-1.14.5.tgz",
 			"integrity": "sha512-utbJEs91757QXYoBwKRb/4kB3JdswLlj0heUiAeXs/OxZAUISJXxLMFLBIixRlIcUnNkwxOsMikRshDMtWIS3g==",
 			"requires": {
-				"classnames": "^2.2.6",
-				"draftjs-utils": "^0.10.2",
-				"html-to-draftjs": "^1.5.0",
-				"linkify-it": "^2.2.0",
-				"prop-types": "^15.7.2"
+				"classnames": "2.2.6",
+				"draftjs-utils": "0.10.2",
+				"html-to-draftjs": "1.5.0",
+				"linkify-it": "2.2.0",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-error-overlay": {
-			"version": "6.0.7",
-			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz",
-			"integrity": "sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA==",
+			"version": "6.0.9",
+			"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
+			"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==",
 			"dev": true
 		},
 		"react-event-listener": {
@@ -16256,9 +16658,9 @@
 			"resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.6.6.tgz",
 			"integrity": "sha512-+hCNqfy7o9wvO6UgjqFmBzARJS7qrNoda0VqzvOuioEpoEXKutiKuv92dSz6kP7rYLmyHPyYNLesi5t/aH1gfw==",
 			"requires": {
-				"@babel/runtime": "^7.2.0",
-				"prop-types": "^15.6.0",
-				"warning": "^4.0.1"
+				"@babel/runtime": "7.10.4",
+				"prop-types": "15.7.2",
+				"warning": "4.0.3"
 			}
 		},
 		"react-expanding-textarea": {
@@ -16281,10 +16683,10 @@
 			"resolved": "https://registry.npmjs.org/react-helmet/-/react-helmet-6.0.0.tgz",
 			"integrity": "sha512-My6S4sa0uHN/IuVUn0HFmasW5xj9clTkB9qmMngscVycQ5vVG51Qp44BEvLJ4lixupTwDlU9qX1/sCrMN4AEPg==",
 			"requires": {
-				"object-assign": "^4.1.1",
-				"prop-types": "^15.7.2",
-				"react-fast-compare": "^2.0.4",
-				"react-side-effect": "^2.1.0"
+				"object-assign": "4.1.1",
+				"prop-types": "15.7.2",
+				"react-fast-compare": "2.0.4",
+				"react-side-effect": "2.1.0"
 			}
 		},
 		"react-ionicons": {
@@ -16303,8 +16705,8 @@
 					"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz",
 					"integrity": "sha1-J5ffwxJhguOpXj37suiT3ddFYVQ=",
 					"requires": {
-						"fbjs": "^0.8.9",
-						"loose-envify": "^1.3.1"
+						"fbjs": "0.8.17",
+						"loose-envify": "1.4.0"
 					}
 				},
 				"react": {
@@ -16312,9 +16714,9 @@
 					"resolved": "https://registry.npmjs.org/react/-/react-15.4.2.tgz",
 					"integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=",
 					"requires": {
-						"fbjs": "^0.8.4",
-						"loose-envify": "^1.1.0",
-						"object-assign": "^4.1.0"
+						"fbjs": "0.8.17",
+						"loose-envify": "1.4.0",
+						"object-assign": "4.1.1"
 					}
 				},
 				"react-dom": {
@@ -16322,9 +16724,9 @@
 					"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.4.2.tgz",
 					"integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=",
 					"requires": {
-						"fbjs": "^0.8.1",
-						"loose-envify": "^1.1.0",
-						"object-assign": "^4.1.0"
+						"fbjs": "0.8.17",
+						"loose-envify": "1.4.0",
+						"object-assign": "4.1.1"
 					}
 				}
 			}
@@ -16344,7 +16746,7 @@
 			"resolved": "https://registry.npmjs.org/react-localization/-/react-localization-0.1.10.tgz",
 			"integrity": "sha512-rYwucM/GPE9MSlbK7Wd7tArJz5jpu9KEHsAcm5brwQM6mp2sylo5MRUbbNhT2vzYFMIxEcwfzVtxJ9qbyawixQ==",
 			"requires": {
-				"react": "^16.0.0"
+				"react": "16.13.1"
 			}
 		},
 		"react-modal": {
@@ -16352,10 +16754,10 @@
 			"resolved": "https://registry.npmjs.org/react-modal/-/react-modal-3.8.1.tgz",
 			"integrity": "sha512-aLKeZM9pgXpIKVwopRHMuvqKWiBajkqisDA8UzocdCF6S4fyKVfLWmZR5G1Q0ODBxxxxf2XIwiCP8G/11GJAuw==",
 			"requires": {
-				"exenv": "^1.2.0",
-				"prop-types": "^15.5.10",
-				"react-lifecycles-compat": "^3.0.0",
-				"warning": "^3.0.0"
+				"exenv": "1.2.2",
+				"prop-types": "15.7.2",
+				"react-lifecycles-compat": "3.0.4",
+				"warning": "3.0.0"
 			},
 			"dependencies": {
 				"warning": {
@@ -16363,7 +16765,7 @@
 					"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
 					"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
 					"requires": {
-						"loose-envify": "^1.0.0"
+						"loose-envify": "1.4.0"
 					}
 				}
 			}
@@ -16378,7 +16780,7 @@
 			"resolved": "https://registry.npmjs.org/react-moment-proptypes/-/react-moment-proptypes-1.7.0.tgz",
 			"integrity": "sha512-ZbOn/P4u469WEGAw5hgkS/E+g1YZqdves2BjYsLluJobzUZCtManhjHiZKjniBVT7MSHM6D/iKtRVzlXVv3ikA==",
 			"requires": {
-				"moment": ">=1.6.0"
+				"moment": "2.24.0"
 			}
 		},
 		"react-native-swipeout": {
@@ -16386,9 +16788,9 @@
 			"resolved": "https://registry.npmjs.org/react-native-swipeout/-/react-native-swipeout-2.3.6.tgz",
 			"integrity": "sha512-t9suUCspzck4vp2pWggWe0frS/QOtX6yYCawHnEes75A7dZCEE74bxX2A1bQzGH9cUMjq6xsdfC94RbiDKIkJg==",
 			"requires": {
-				"create-react-class": "^15.6.0",
-				"prop-types": "^15.5.10",
-				"react-tween-state": "^0.1.5"
+				"create-react-class": "15.6.3",
+				"prop-types": "15.7.2",
+				"react-tween-state": "0.1.5"
 			}
 		},
 		"react-outside-click-handler": {
@@ -16396,11 +16798,11 @@
 			"resolved": "https://registry.npmjs.org/react-outside-click-handler/-/react-outside-click-handler-1.3.0.tgz",
 			"integrity": "sha512-Te/7zFU0oHpAnctl//pP3hEAeobfeHMyygHB8MnjP6sX5OR8KHT1G3jmLsV3U9RnIYo+Yn+peJYWu+D5tUS8qQ==",
 			"requires": {
-				"airbnb-prop-types": "^2.15.0",
-				"consolidated-events": "^1.1.1 || ^2.0.0",
-				"document.contains": "^1.0.1",
-				"object.values": "^1.1.0",
-				"prop-types": "^15.7.2"
+				"airbnb-prop-types": "2.16.0",
+				"consolidated-events": "2.0.2",
+				"document.contains": "1.0.2",
+				"object.values": "1.1.1",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-portal": {
@@ -16408,7 +16810,7 @@
 			"resolved": "https://registry.npmjs.org/react-portal/-/react-portal-4.2.1.tgz",
 			"integrity": "sha512-fE9kOBagwmTXZ3YGRYb4gcMy+kSA+yLO0xnPankjRlfBv4uCpFXqKPfkpsGQQR15wkZ9EssnvTOl1yMzbkxhPQ==",
 			"requires": {
-				"prop-types": "^15.5.8"
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-recaptcha-v3": {
@@ -16421,12 +16823,12 @@
 			"resolved": "https://registry.npmjs.org/react-redux/-/react-redux-6.0.1.tgz",
 			"integrity": "sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ==",
 			"requires": {
-				"@babel/runtime": "^7.3.1",
-				"hoist-non-react-statics": "^3.3.0",
-				"invariant": "^2.2.4",
-				"loose-envify": "^1.4.0",
-				"prop-types": "^15.7.2",
-				"react-is": "^16.8.2"
+				"@babel/runtime": "7.10.4",
+				"hoist-non-react-statics": "3.3.2",
+				"invariant": "2.2.4",
+				"loose-envify": "1.4.0",
+				"prop-types": "15.7.2",
+				"react-is": "16.13.1"
 			}
 		},
 		"react-router": {
@@ -16434,13 +16836,13 @@
 			"resolved": "https://registry.npmjs.org/react-router/-/react-router-3.2.1.tgz",
 			"integrity": "sha512-SXkhC0nr3G0ltzVU07IN8jYl0bB6FsrDIqlLC9dK3SITXqyTJyM7yhXlUqs89w3Nqi5OkXsfRUeHX+P874HQrg==",
 			"requires": {
-				"create-react-class": "^15.5.1",
-				"history": "^3.0.0",
-				"hoist-non-react-statics": "^2.3.1",
-				"invariant": "^2.2.1",
-				"loose-envify": "^1.2.0",
-				"prop-types": "^15.5.6",
-				"warning": "^3.0.0"
+				"create-react-class": "15.6.3",
+				"history": "3.3.0",
+				"hoist-non-react-statics": "2.5.5",
+				"invariant": "2.2.4",
+				"loose-envify": "1.4.0",
+				"prop-types": "15.7.2",
+				"warning": "3.0.0"
 			},
 			"dependencies": {
 				"hoist-non-react-statics": {
@@ -16453,7 +16855,7 @@
 					"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
 					"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
 					"requires": {
-						"loose-envify": "^1.0.0"
+						"loose-envify": "1.4.0"
 					}
 				}
 			}
@@ -16466,28 +16868,28 @@
 			"requires": {
 				"@babel/core": "7.9.0",
 				"@svgr/webpack": "4.3.3",
-				"@typescript-eslint/eslint-plugin": "^2.10.0",
-				"@typescript-eslint/parser": "^2.10.0",
+				"@typescript-eslint/eslint-plugin": "2.34.0",
+				"@typescript-eslint/parser": "2.34.0",
 				"babel-eslint": "10.1.0",
-				"babel-jest": "^24.9.0",
+				"babel-jest": "24.9.0",
 				"babel-loader": "8.1.0",
-				"babel-plugin-named-asset-import": "^0.3.6",
-				"babel-preset-react-app": "^9.1.2",
-				"camelcase": "^5.3.1",
+				"babel-plugin-named-asset-import": "0.3.7",
+				"babel-preset-react-app": "9.1.2",
+				"camelcase": "5.3.1",
 				"case-sensitive-paths-webpack-plugin": "2.3.0",
 				"css-loader": "3.4.2",
 				"dotenv": "8.2.0",
 				"dotenv-expand": "5.1.0",
-				"eslint": "^6.6.0",
-				"eslint-config-react-app": "^5.2.1",
+				"eslint": "6.8.0",
+				"eslint-config-react-app": "5.2.1",
 				"eslint-loader": "3.0.3",
 				"eslint-plugin-flowtype": "4.6.0",
 				"eslint-plugin-import": "2.20.1",
 				"eslint-plugin-jsx-a11y": "6.2.3",
 				"eslint-plugin-react": "7.19.0",
-				"eslint-plugin-react-hooks": "^1.6.1",
+				"eslint-plugin-react-hooks": "1.7.0",
 				"file-loader": "4.3.0",
-				"fs-extra": "^8.1.0",
+				"fs-extra": "8.1.0",
 				"fsevents": "2.1.2",
 				"html-webpack-plugin": "4.0.0-beta.11",
 				"identity-obj-proxy": "3.0.0",
@@ -16503,8 +16905,8 @@
 				"postcss-normalize": "8.0.1",
 				"postcss-preset-env": "6.7.0",
 				"postcss-safe-parser": "4.0.1",
-				"react-app-polyfill": "^1.0.6",
-				"react-dev-utils": "^10.2.1",
+				"react-app-polyfill": "1.0.6",
+				"react-dev-utils": "10.2.1",
 				"resolve": "1.15.0",
 				"resolve-url-loader": "3.1.1",
 				"sass-loader": "8.0.2",
@@ -16525,20 +16927,13 @@
 					"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 					"dev": true
 				},
-				"fsevents": {
-					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
-					"integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
-					"dev": true,
-					"optional": true
-				},
 				"resolve": {
 					"version": "1.15.0",
 					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
 					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
 					"dev": true,
 					"requires": {
-						"path-parse": "^1.0.6"
+						"path-parse": "1.0.6"
 					}
 				},
 				"semver": {
@@ -16559,9 +16954,9 @@
 			"resolved": "https://registry.npmjs.org/react-sortable-hoc/-/react-sortable-hoc-1.10.1.tgz",
 			"integrity": "sha512-eVyv5rrK6qY9bG60bboRY78In7OpdRRg+hxp4QMLIjC/UJaFSU7exTYd0764GtXvBqh+b+faYGzren5/ffRYKw==",
 			"requires": {
-				"@babel/runtime": "^7.2.0",
-				"invariant": "^2.2.4",
-				"prop-types": "^15.5.7"
+				"@babel/runtime": "7.10.4",
+				"invariant": "2.2.4",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-sparklines": {
@@ -16569,7 +16964,7 @@
 			"resolved": "https://registry.npmjs.org/react-sparklines/-/react-sparklines-1.7.0.tgz",
 			"integrity": "sha512-bJFt9K4c5Z0k44G8KtxIhbG+iyxrKjBZhdW6afP+R7EnIq+iKjbWbEFISrf3WKNFsda+C46XAfnX0StS5fbDcg==",
 			"requires": {
-				"prop-types": "^15.5.10"
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-stockcharts": {
@@ -16577,21 +16972,21 @@
 			"resolved": "https://registry.npmjs.org/react-stockcharts/-/react-stockcharts-0.7.8.tgz",
 			"integrity": "sha512-swtnTFrp8+82dDGhuI3gg2qvO7irU/dz210k3KtmRiZGMwrmdWBsfYGRrctKRK2OSm+C7G4WgbhKo0pdfFlwyQ==",
 			"requires": {
-				"d3-array": "^1.2.1",
-				"d3-collection": "^1.0.4",
-				"d3-force": "^1.1.0",
-				"d3-format": "^1.2.1",
-				"d3-interpolate": "^1.1.6",
-				"d3-path": "^1.0.5",
-				"d3-scale": "^1.0.7",
-				"d3-selection": "^1.2.0",
-				"d3-shape": "^1.2.0",
-				"d3-time": "^1.0.8",
-				"d3-time-format": "^2.1.1",
-				"debug": "^3.1.0",
-				"lodash.flattendeep": "^4.4.0",
-				"prop-types": "^15.6.0",
-				"save-svg-as-png": "^1.4.5"
+				"d3-array": "1.2.4",
+				"d3-collection": "1.0.7",
+				"d3-force": "1.2.1",
+				"d3-format": "1.4.4",
+				"d3-interpolate": "1.4.0",
+				"d3-path": "1.0.9",
+				"d3-scale": "1.0.7",
+				"d3-selection": "1.4.0",
+				"d3-shape": "1.3.7",
+				"d3-time": "1.0.11",
+				"d3-time-format": "2.2.3",
+				"debug": "3.2.6",
+				"lodash.flattendeep": "4.4.0",
+				"prop-types": "15.7.2",
+				"save-svg-as-png": "1.4.17"
 			},
 			"dependencies": {
 				"d3-scale": {
@@ -16599,13 +16994,13 @@
 					"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz",
 					"integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==",
 					"requires": {
-						"d3-array": "^1.2.0",
-						"d3-collection": "1",
-						"d3-color": "1",
-						"d3-format": "1",
-						"d3-interpolate": "1",
-						"d3-time": "1",
-						"d3-time-format": "2"
+						"d3-array": "1.2.4",
+						"d3-collection": "1.0.7",
+						"d3-color": "1.4.1",
+						"d3-format": "1.4.4",
+						"d3-interpolate": "1.4.0",
+						"d3-time": "1.0.11",
+						"d3-time-format": "2.2.3"
 					}
 				}
 			}
@@ -16615,9 +17010,9 @@
 			"resolved": "https://registry.npmjs.org/react-svg/-/react-svg-11.2.2.tgz",
 			"integrity": "sha512-Q9lAuUgaI8c55OluftgrAyE4GAmIvmqVHJXt1fIzXFHcuIauKqVjhUH/BiizOqjPmY+R27kiTkv9g7AxY7O+wA==",
 			"requires": {
-				"@babel/runtime": "^7.12.5",
-				"@tanem/svg-injector": "^8.2.1",
-				"prop-types": "^15.7.2"
+				"@babel/runtime": "7.12.5",
+				"@tanem/svg-injector": "8.2.2",
+				"prop-types": "15.7.2"
 			},
 			"dependencies": {
 				"@babel/runtime": {
@@ -16625,7 +17020,7 @@
 					"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz",
 					"integrity": "sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==",
 					"requires": {
-						"regenerator-runtime": "^0.13.4"
+						"regenerator-runtime": "0.13.7"
 					}
 				},
 				"regenerator-runtime": {
@@ -16640,10 +17035,10 @@
 			"resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.1.tgz",
 			"integrity": "sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==",
 			"requires": {
-				"@babel/runtime": "^7.5.5",
-				"dom-helpers": "^5.0.1",
-				"loose-envify": "^1.4.0",
-				"prop-types": "^15.6.2"
+				"@babel/runtime": "7.10.4",
+				"dom-helpers": "5.2.0",
+				"loose-envify": "1.4.0",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-truncate-markup": {
@@ -16667,8 +17062,8 @@
 			"resolved": "https://registry.npmjs.org/react-tween-state/-/react-tween-state-0.1.5.tgz",
 			"integrity": "sha1-6YsGZVHvuTy5LdG+FJlcLj3q4zk=",
 			"requires": {
-				"raf": "^3.1.0",
-				"tween-functions": "^1.0.1"
+				"raf": "3.4.1",
+				"tween-functions": "1.2.0"
 			}
 		},
 		"react-with-direction": {
@@ -16676,14 +17071,14 @@
 			"resolved": "https://registry.npmjs.org/react-with-direction/-/react-with-direction-1.3.1.tgz",
 			"integrity": "sha512-aGcM21ZzhqeXFvDCfPj0rVNYuaVXfTz5D3Rbn0QMz/unZe+CCiLHthrjQWO7s6qdfXORgYFtmS7OVsRgSk5LXQ==",
 			"requires": {
-				"airbnb-prop-types": "^2.10.0",
-				"brcast": "^2.0.2",
-				"deepmerge": "^1.5.2",
-				"direction": "^1.0.2",
-				"hoist-non-react-statics": "^3.3.0",
-				"object.assign": "^4.1.0",
-				"object.values": "^1.0.4",
-				"prop-types": "^15.6.2"
+				"airbnb-prop-types": "2.16.0",
+				"brcast": "2.0.2",
+				"deepmerge": "1.5.2",
+				"direction": "1.0.4",
+				"hoist-non-react-statics": "3.3.2",
+				"object.assign": "4.1.0",
+				"object.values": "1.1.1",
+				"prop-types": "15.7.2"
 			}
 		},
 		"react-with-styles": {
@@ -16691,10 +17086,10 @@
 			"resolved": "https://registry.npmjs.org/react-with-styles/-/react-with-styles-3.2.3.tgz",
 			"integrity": "sha512-MTI1UOvMHABRLj5M4WpODfwnveHaip6X7QUMI2x6zovinJiBXxzhA9AJP7MZNaKqg1JRFtHPXZdroUC8KcXwlQ==",
 			"requires": {
-				"hoist-non-react-statics": "^3.2.1",
-				"object.assign": "^4.1.0",
-				"prop-types": "^15.6.2",
-				"react-with-direction": "^1.3.0"
+				"hoist-non-react-statics": "3.3.2",
+				"object.assign": "4.1.0",
+				"prop-types": "15.7.2",
+				"react-with-direction": "1.3.1"
 			}
 		},
 		"react-with-styles-interface-css": {
@@ -16702,8 +17097,8 @@
 			"resolved": "https://registry.npmjs.org/react-with-styles-interface-css/-/react-with-styles-interface-css-4.0.3.tgz",
 			"integrity": "sha512-wE43PIyjal2dexxyyx4Lhbcb+E42amoYPnkunRZkb9WTA+Z+9LagbyxwsI352NqMdFmghR0opg29dzDO4/YXbw==",
 			"requires": {
-				"array.prototype.flat": "^1.2.1",
-				"global-cache": "^1.2.1"
+				"array.prototype.flat": "1.2.3",
+				"global-cache": "1.2.1"
 			}
 		},
 		"read": {
@@ -16712,7 +17107,47 @@
 			"integrity": "sha1-AHo9FpR4qnEKSRcn5FPv+5LnYgM=",
 			"dev": true,
 			"requires": {
-				"mute-stream": "~0.0.4"
+				"mute-stream": "0.0.8"
+			}
+		},
+		"read-pkg": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+			"integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
+			"dev": true,
+			"requires": {
+				"load-json-file": "4.0.0",
+				"normalize-package-data": "2.5.0",
+				"path-type": "3.0.0"
+			},
+			"dependencies": {
+				"load-json-file": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+					"integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "4.2.4",
+						"parse-json": "4.0.0",
+						"pify": "3.0.0",
+						"strip-bom": "3.0.0"
+					}
+				},
+				"path-type": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+					"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
+					"dev": true,
+					"requires": {
+						"pify": "3.0.0"
+					}
+				},
+				"strip-bom": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+					"dev": true
+				}
 			}
 		},
 		"read-pkg-up": {
@@ -16721,8 +17156,8 @@
 			"integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
 			"dev": true,
 			"requires": {
-				"find-up": "^1.0.0",
-				"read-pkg": "^1.0.0"
+				"find-up": "1.1.2",
+				"read-pkg": "1.1.0"
 			},
 			"dependencies": {
 				"find-up": {
@@ -16731,8 +17166,8 @@
 					"integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
 					"dev": true,
 					"requires": {
-						"path-exists": "^2.0.0",
-						"pinkie-promise": "^2.0.0"
+						"path-exists": "2.1.0",
+						"pinkie-promise": "2.0.1"
 					}
 				},
 				"path-exists": {
@@ -16741,7 +17176,7 @@
 					"integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
 					"dev": true,
 					"requires": {
-						"pinkie-promise": "^2.0.0"
+						"pinkie-promise": "2.0.1"
 					}
 				},
 				"read-pkg": {
@@ -16750,9 +17185,9 @@
 					"integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
 					"dev": true,
 					"requires": {
-						"load-json-file": "^1.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^1.0.0"
+						"load-json-file": "1.1.0",
+						"normalize-package-data": "2.5.0",
+						"path-type": "1.1.0"
 					}
 				}
 			}
@@ -16762,52 +17197,18 @@
 			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
 			"integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
 			"requires": {
-				"inherits": "^2.0.3",
-				"string_decoder": "^1.1.1",
-				"util-deprecate": "^1.0.1"
+				"inherits": "2.0.4",
+				"string_decoder": "1.3.0",
+				"util-deprecate": "1.0.2"
 			}
 		},
 		"readdirp": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-			"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+			"version": "3.5.0",
+			"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.5.0.tgz",
+			"integrity": "sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.11",
-				"micromatch": "^3.1.10",
-				"readable-stream": "^2.0.2"
-			},
-			"dependencies": {
-				"readable-stream": {
-					"version": "2.3.7",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-					"dev": true,
-					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
-					}
-				},
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-					"dev": true
-				},
-				"string_decoder": {
-					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-					"dev": true,
-					"requires": {
-						"safe-buffer": "~5.1.0"
-					}
-				}
+				"picomatch": "2.2.2"
 			}
 		},
 		"realpath-native": {
@@ -16816,7 +17217,7 @@
 			"integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
 			"dev": true,
 			"requires": {
-				"util.promisify": "^1.0.0"
+				"util.promisify": "1.0.1"
 			}
 		},
 		"recursive-readdir": {
@@ -16834,8 +17235,8 @@
 			"integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
 			"dev": true,
 			"requires": {
-				"indent-string": "^2.1.0",
-				"strip-indent": "^1.0.1"
+				"indent-string": "2.1.0",
+				"strip-indent": "1.0.1"
 			},
 			"dependencies": {
 				"indent-string": {
@@ -16844,7 +17245,7 @@
 					"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
 					"dev": true,
 					"requires": {
-						"repeating": "^2.0.0"
+						"repeating": "2.0.1"
 					}
 				}
 			}
@@ -16854,8 +17255,8 @@
 			"resolved": "https://registry.npmjs.org/redux/-/redux-4.0.1.tgz",
 			"integrity": "sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==",
 			"requires": {
-				"loose-envify": "^1.4.0",
-				"symbol-observable": "^1.2.0"
+				"loose-envify": "1.4.0",
+				"symbol-observable": "1.2.0"
 			}
 		},
 		"redux-form": {
@@ -16863,16 +17264,16 @@
 			"resolved": "https://registry.npmjs.org/redux-form/-/redux-form-8.1.0.tgz",
 			"integrity": "sha512-d2+0OaJpSq3kwkbPtFlG3W/HENWLxX8NqqTHSOnfgIrID/9faH/rxejLa1X3HChilCTm71zWe/g9zaLPCMCofQ==",
 			"requires": {
-				"@babel/runtime": "^7.2.0",
-				"es6-error": "^4.1.1",
-				"hoist-non-react-statics": "^3.2.1",
-				"invariant": "^2.2.4",
-				"is-promise": "^2.1.0",
-				"lodash": "^4.17.11",
-				"lodash-es": "^4.17.11",
-				"prop-types": "^15.6.1",
-				"react-is": "^16.7.0",
-				"react-lifecycles-compat": "^3.0.4"
+				"@babel/runtime": "7.10.4",
+				"es6-error": "4.1.1",
+				"hoist-non-react-statics": "3.3.2",
+				"invariant": "2.2.4",
+				"is-promise": "2.2.2",
+				"lodash": "4.17.19",
+				"lodash-es": "4.17.15",
+				"prop-types": "15.7.2",
+				"react-is": "16.13.1",
+				"react-lifecycles-compat": "3.0.4"
 			}
 		},
 		"redux-logger": {
@@ -16880,7 +17281,7 @@
 			"resolved": "https://registry.npmjs.org/redux-logger/-/redux-logger-3.0.6.tgz",
 			"integrity": "sha1-91VZZvMJjzyIYExEnPC69XeCdL8=",
 			"requires": {
-				"deep-diff": "^0.3.5"
+				"deep-diff": "0.3.8"
 			}
 		},
 		"redux-persist": {
@@ -16888,9 +17289,9 @@
 			"resolved": "https://registry.npmjs.org/redux-persist/-/redux-persist-4.10.2.tgz",
 			"integrity": "sha512-U+e0ieMGC69Zr72929iJW40dEld7Mflh6mu0eJtVMLGfMq/aJqjxUM1hzyUWMR1VUyAEEdPHuQmeq5ti9krIgg==",
 			"requires": {
-				"json-stringify-safe": "^5.0.1",
-				"lodash": "^4.17.4",
-				"lodash-es": "^4.17.4"
+				"json-stringify-safe": "5.0.1",
+				"lodash": "4.17.19",
+				"lodash-es": "4.17.15"
 			}
 		},
 		"redux-promise-middleware": {
@@ -16909,9 +17310,9 @@
 			"integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA="
 		},
 		"regenerate": {
-			"version": "1.4.1",
-			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
-			"integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
+			"version": "1.4.2",
+			"resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+			"integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
 			"dev": true
 		},
 		"regenerate-unicode-properties": {
@@ -16920,13 +17321,13 @@
 			"integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
 			"dev": true,
 			"requires": {
-				"regenerate": "^1.4.0"
+				"regenerate": "1.4.2"
 			}
 		},
 		"regenerator-runtime": {
-			"version": "0.11.1",
-			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-			"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
+			"version": "0.13.7",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz",
+			"integrity": "sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew=="
 		},
 		"regenerator-transform": {
 			"version": "0.14.5",
@@ -16934,7 +17335,7 @@
 			"integrity": "sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.8.4"
+				"@babel/runtime": "7.10.4"
 			}
 		},
 		"regex-not": {
@@ -16943,8 +17344,8 @@
 			"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "^3.0.2",
-				"safe-regex": "^1.1.0"
+				"extend-shallow": "3.0.2",
+				"safe-regex": "1.1.0"
 			}
 		},
 		"regex-parser": {
@@ -16959,8 +17360,8 @@
 			"integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==",
 			"dev": true,
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"regexpp": {
@@ -16970,17 +17371,17 @@
 			"dev": true
 		},
 		"regexpu-core": {
-			"version": "4.7.0",
-			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-			"integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+			"version": "4.7.1",
+			"resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+			"integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
 			"dev": true,
 			"requires": {
-				"regenerate": "^1.4.0",
-				"regenerate-unicode-properties": "^8.2.0",
-				"regjsgen": "^0.5.1",
-				"regjsparser": "^0.6.4",
-				"unicode-match-property-ecmascript": "^1.0.4",
-				"unicode-match-property-value-ecmascript": "^1.2.0"
+				"regenerate": "1.4.2",
+				"regenerate-unicode-properties": "8.2.0",
+				"regjsgen": "0.5.2",
+				"regjsparser": "0.6.9",
+				"unicode-match-property-ecmascript": "1.0.4",
+				"unicode-match-property-value-ecmascript": "1.2.0"
 			}
 		},
 		"regjsgen": {
@@ -16990,12 +17391,12 @@
 			"dev": true
 		},
 		"regjsparser": {
-			"version": "0.6.4",
-			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.4.tgz",
-			"integrity": "sha512-64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw==",
+			"version": "0.6.9",
+			"resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz",
+			"integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==",
 			"dev": true,
 			"requires": {
-				"jsesc": "~0.5.0"
+				"jsesc": "0.5.0"
 			},
 			"dependencies": {
 				"jsesc": {
@@ -17018,45 +17419,23 @@
 			"dev": true
 		},
 		"renderkid": {
-			"version": "2.0.3",
-			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.3.tgz",
-			"integrity": "sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==",
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.5.tgz",
+			"integrity": "sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==",
 			"dev": true,
 			"requires": {
-				"css-select": "^1.1.0",
-				"dom-converter": "^0.2",
-				"htmlparser2": "^3.3.0",
-				"strip-ansi": "^3.0.0",
-				"utila": "^0.4.0"
+				"css-select": "2.1.0",
+				"dom-converter": "0.2.0",
+				"htmlparser2": "3.10.1",
+				"lodash": "4.17.21",
+				"strip-ansi": "3.0.1"
 			},
 			"dependencies": {
-				"css-select": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz",
-					"integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=",
-					"dev": true,
-					"requires": {
-						"boolbase": "~1.0.0",
-						"css-what": "2.1",
-						"domutils": "1.5.1",
-						"nth-check": "~1.0.1"
-					}
-				},
-				"css-what": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz",
-					"integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==",
+				"lodash": {
+					"version": "4.17.21",
+					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+					"integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
 					"dev": true
-				},
-				"domutils": {
-					"version": "1.5.1",
-					"resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz",
-					"integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=",
-					"dev": true,
-					"requires": {
-						"dom-serializer": "0",
-						"domelementtype": "1"
-					}
 				}
 			}
 		},
@@ -17078,7 +17457,7 @@
 			"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
 			"dev": true,
 			"requires": {
-				"is-finite": "^1.0.0"
+				"is-finite": "1.1.0"
 			}
 		},
 		"request": {
@@ -17087,26 +17466,26 @@
 			"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
 			"dev": true,
 			"requires": {
-				"aws-sign2": "~0.7.0",
-				"aws4": "^1.8.0",
-				"caseless": "~0.12.0",
-				"combined-stream": "~1.0.6",
-				"extend": "~3.0.2",
-				"forever-agent": "~0.6.1",
-				"form-data": "~2.3.2",
-				"har-validator": "~5.1.3",
-				"http-signature": "~1.2.0",
-				"is-typedarray": "~1.0.0",
-				"isstream": "~0.1.2",
-				"json-stringify-safe": "~5.0.1",
-				"mime-types": "~2.1.19",
-				"oauth-sign": "~0.9.0",
-				"performance-now": "^2.1.0",
-				"qs": "~6.5.2",
-				"safe-buffer": "^5.1.2",
-				"tough-cookie": "~2.5.0",
-				"tunnel-agent": "^0.6.0",
-				"uuid": "^3.3.2"
+				"aws-sign2": "0.7.0",
+				"aws4": "1.10.0",
+				"caseless": "0.12.0",
+				"combined-stream": "1.0.8",
+				"extend": "3.0.2",
+				"forever-agent": "0.6.1",
+				"form-data": "2.3.3",
+				"har-validator": "5.1.3",
+				"http-signature": "1.2.0",
+				"is-typedarray": "1.0.0",
+				"isstream": "0.1.2",
+				"json-stringify-safe": "5.0.1",
+				"mime-types": "2.1.27",
+				"oauth-sign": "0.9.0",
+				"performance-now": "2.1.0",
+				"qs": "6.5.2",
+				"safe-buffer": "5.2.1",
+				"tough-cookie": "2.5.0",
+				"tunnel-agent": "0.6.0",
+				"uuid": "3.4.0"
 			}
 		},
 		"request-promise-core": {
@@ -17115,7 +17494,7 @@
 			"integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
 			"dev": true,
 			"requires": {
-				"lodash": "^4.17.19"
+				"lodash": "4.17.19"
 			}
 		},
 		"request-promise-native": {
@@ -17125,8 +17504,8 @@
 			"dev": true,
 			"requires": {
 				"request-promise-core": "1.1.4",
-				"stealthy-require": "^1.1.1",
-				"tough-cookie": "^2.3.3"
+				"stealthy-require": "1.1.1",
+				"tough-cookie": "2.5.0"
 			}
 		},
 		"require-directory": {
@@ -17162,7 +17541,7 @@
 			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
 			"integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
 			"requires": {
-				"path-parse": "^1.0.6"
+				"path-parse": "1.0.6"
 			}
 		},
 		"resolve-cwd": {
@@ -17171,7 +17550,7 @@
 			"integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
 			"dev": true,
 			"requires": {
-				"resolve-from": "^3.0.0"
+				"resolve-from": "3.0.0"
 			}
 		},
 		"resolve-from": {
@@ -17222,7 +17601,7 @@
 					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
 					"dev": true,
 					"requires": {
-						"minimist": "^1.2.0"
+						"minimist": "1.2.5"
 					}
 				},
 				"loader-utils": {
@@ -17231,9 +17610,9 @@
 					"integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
 					"dev": true,
 					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^2.0.0",
-						"json5": "^1.0.1"
+						"big.js": "5.2.2",
+						"emojis-list": "2.1.0",
+						"json5": "1.0.1"
 					}
 				},
 				"postcss": {
@@ -17242,9 +17621,9 @@
 					"integrity": "sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ==",
 					"dev": true,
 					"requires": {
-						"chalk": "^2.4.2",
-						"source-map": "^0.6.1",
-						"supports-color": "^6.1.0"
+						"chalk": "2.4.2",
+						"source-map": "0.6.1",
+						"supports-color": "6.1.0"
 					}
 				},
 				"source-map": {
@@ -17259,7 +17638,7 @@
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "3.0.0"
 					}
 				}
 			}
@@ -17270,8 +17649,8 @@
 			"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
 			"dev": true,
 			"requires": {
-				"onetime": "^2.0.0",
-				"signal-exit": "^3.0.2"
+				"onetime": "2.0.1",
+				"signal-exit": "3.0.3"
 			}
 		},
 		"ret": {
@@ -17298,8 +17677,8 @@
 			"integrity": "sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=",
 			"dev": true,
 			"requires": {
-				"convert-source-map": "^0.3.3",
-				"css": "^2.0.0"
+				"convert-source-map": "0.3.5",
+				"css": "2.2.4"
 			},
 			"dependencies": {
 				"convert-source-map": {
@@ -17334,7 +17713,7 @@
 			"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
 			"dev": true,
 			"requires": {
-				"glob": "^7.1.3"
+				"glob": "7.1.6"
 			}
 		},
 		"ripemd160": {
@@ -17342,8 +17721,8 @@
 			"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 			"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 			"requires": {
-				"hash-base": "^3.0.0",
-				"inherits": "^2.0.1"
+				"hash-base": "3.1.0",
+				"inherits": "2.0.4"
 			}
 		},
 		"rmc-align": {
@@ -17351,9 +17730,9 @@
 			"resolved": "https://registry.npmjs.org/rmc-align/-/rmc-align-1.0.0.tgz",
 			"integrity": "sha512-3gEa5/+hqqoEVoeQ25KoRc8DOsXIdSaVpaBq1zQFaV941LR3xvZIRTlxTDT/IagYwoGM1KZea/jd7cNMYP34Rg==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"dom-align": "1.x",
-				"rc-util": "4.x"
+				"babel-runtime": "6.26.0",
+				"dom-align": "1.12.0",
+				"rc-util": "4.21.1"
 			}
 		},
 		"rmc-calendar": {
@@ -17361,9 +17740,9 @@
 			"resolved": "https://registry.npmjs.org/rmc-calendar/-/rmc-calendar-1.1.4.tgz",
 			"integrity": "sha512-xxQZaPFDnpHt4IFO8mukYrXSgC1W8LcNVp+EoX4iyeOJFimungOKB/iP5/cy+st8yXq8lUgk9TXsHNtM6Xo6ZA==",
 			"requires": {
-				"babel-runtime": "^6.26.0",
-				"rc-animate": "^2.4.4",
-				"rmc-date-picker": "^6.0.8"
+				"babel-runtime": "6.26.0",
+				"rc-animate": "2.11.1",
+				"rmc-date-picker": "6.0.10"
 			}
 		},
 		"rmc-cascader": {
@@ -17371,9 +17750,9 @@
 			"resolved": "https://registry.npmjs.org/rmc-cascader/-/rmc-cascader-5.0.3.tgz",
 			"integrity": "sha512-PxDhMjWViDdG4SMZqoXtAthGwgDyYnyxxZEE17IDDYsiCHpWtOhoIL8nsI+/hZ212UT/XF2LpqCsOlMoJiYk+w==",
 			"requires": {
-				"array-tree-filter": "2.1.x",
-				"babel-runtime": "6.x",
-				"rmc-picker": "~5.0.0"
+				"array-tree-filter": "2.1.0",
+				"babel-runtime": "6.26.0",
+				"rmc-picker": "5.0.10"
 			}
 		},
 		"rmc-date-picker": {
@@ -17381,8 +17760,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-date-picker/-/rmc-date-picker-6.0.10.tgz",
 			"integrity": "sha512-/9+I6lm3EDEl6M7862V6++zFuxwsM0UEq8wSHbotYIPPmyB/65gx1cviblghOv2QfB0O9+U2w3qEJlRP/WsMrA==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"rmc-picker": "~5.0.0"
+				"babel-runtime": "6.26.0",
+				"rmc-picker": "5.0.10"
 			}
 		},
 		"rmc-dialog": {
@@ -17390,8 +17769,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-dialog/-/rmc-dialog-1.1.1.tgz",
 			"integrity": "sha512-28aJqtPTX6v13Z/aU1WBy1AFIXkE74PxZXde7JvtEIy9hQDTjH8fqOi822BpzAbXCyNE7jF9iFomy3H2ClsDJA==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"rc-animate": "2.x"
+				"babel-runtime": "6.26.0",
+				"rc-animate": "2.11.1"
 			}
 		},
 		"rmc-drawer": {
@@ -17399,9 +17778,9 @@
 			"resolved": "https://registry.npmjs.org/rmc-drawer/-/rmc-drawer-0.4.11.tgz",
 			"integrity": "sha512-YfB9XEJ8iM0MMuLWAK4313uOxSM8NAljC8Cqun1KamXutglYTuRviUuTLNSOzV8HHPp5kNpsVduvPCGLWXvThw==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.4",
-				"prop-types": "^15.5.10"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"prop-types": "15.7.2"
 			}
 		},
 		"rmc-feedback": {
@@ -17409,8 +17788,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-feedback/-/rmc-feedback-2.0.0.tgz",
 			"integrity": "sha512-5PWOGOW7VXks/l3JzlOU9NIxRpuaSS8d9zA3UULUCuTKnpwBHNvv1jSJzxgbbCQeYzROWUpgKI4za3X4C/mKmQ==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.5"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6"
 			}
 		},
 		"rmc-input-number": {
@@ -17418,9 +17797,9 @@
 			"resolved": "https://registry.npmjs.org/rmc-input-number/-/rmc-input-number-1.0.5.tgz",
 			"integrity": "sha512-prPkEtoOVde77GnEnEaBeWjBobMOPgGqU5bd0gxfp1kt1pUN740mMpVAcH7uxpJjVfmw+kuGWtiz4S7CueagSg==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.0",
-				"rmc-feedback": "^2.0.0"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"rmc-feedback": "2.0.0"
 			}
 		},
 		"rmc-list-view": {
@@ -17428,12 +17807,12 @@
 			"resolved": "https://registry.npmjs.org/rmc-list-view/-/rmc-list-view-0.11.5.tgz",
 			"integrity": "sha512-eMOC5394tLNawcdEEhF7boMpQgpjJGDdL5lS+LblAWdBec7Q4EYkUdnrKNbt+O9k5RGM6nSLAGZK5oB4FN85Lg==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.5",
-				"fbjs": "^0.8.3",
-				"prop-types": "^15.5.8",
-				"warning": "^3.0.0",
-				"zscroller": "~0.4.0"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"fbjs": "0.8.17",
+				"prop-types": "15.7.2",
+				"warning": "3.0.0",
+				"zscroller": "0.4.8"
 			},
 			"dependencies": {
 				"warning": {
@@ -17441,7 +17820,7 @@
 					"resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
 					"integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=",
 					"requires": {
-						"loose-envify": "^1.0.0"
+						"loose-envify": "1.4.0"
 					}
 				}
 			}
@@ -17451,11 +17830,11 @@
 			"resolved": "https://registry.npmjs.org/rmc-notification/-/rmc-notification-1.0.0.tgz",
 			"integrity": "sha512-9sPxjltFvtRLt2v312Hu7OXwk53pHkBYgINRDmnJ3A5NF1qtJeCCcdN0Xr0fzJ6sbQvtGju822tWHdzYA9u7Vw==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "2.x",
-				"prop-types": "^15.5.8",
-				"rc-animate": "2.x",
-				"rc-util": "^4.0.4"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"prop-types": "15.7.2",
+				"rc-animate": "2.11.1",
+				"rc-util": "4.21.1"
 			}
 		},
 		"rmc-nuka-carousel": {
@@ -17463,8 +17842,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-nuka-carousel/-/rmc-nuka-carousel-3.0.1.tgz",
 			"integrity": "sha512-w2EPTERMUUZqcUSKFuejjin7xsMlhrLrtS0A/igTXpFJGq3kemDKcRi7q3pSYDuZBHYBl5iV4UqsLLkjdFtrYA==",
 			"requires": {
-				"exenv": "^1.2.0",
-				"raf": "^3.3.2"
+				"exenv": "1.2.2",
+				"raf": "3.4.1"
 			}
 		},
 		"rmc-picker": {
@@ -17472,10 +17851,10 @@
 			"resolved": "https://registry.npmjs.org/rmc-picker/-/rmc-picker-5.0.10.tgz",
 			"integrity": "sha512-KZ70+WjcaZHnG5GyCxWCPFWAZ12s6NqyrbW73LeqH0WEqaTMMs0sOrk2f4mQAZ/CGT0XcFN6VZLw7Ozoxfn7LA==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.6",
-				"rmc-dialog": "^1.1.1",
-				"rmc-feedback": "^2.0.0"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6",
+				"rmc-dialog": "1.1.1",
+				"rmc-feedback": "2.0.0"
 			}
 		},
 		"rmc-pull-to-refresh": {
@@ -17483,8 +17862,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-pull-to-refresh/-/rmc-pull-to-refresh-1.0.13.tgz",
 			"integrity": "sha512-iYLsURiR7G/sKmRA6p2kq6ZXicn7Hyeo6VQFljssV1eMW+fzDgihhaz0kv5mza0f88vphGJvjOihT9E6+xGb6Q==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"classnames": "^2.2.5"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6"
 			}
 		},
 		"rmc-steps": {
@@ -17492,8 +17871,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-steps/-/rmc-steps-1.0.1.tgz",
 			"integrity": "sha512-8ijtwp4D1CYTtI2yerXJYqCv+GQbiBc9T12nrFngd/vM0y+58CnznGphTAueF6IWf7qbxBwcjTrcFgg7bP2YGA==",
 			"requires": {
-				"babel-runtime": "^6.23.0",
-				"classnames": "^2.2.3"
+				"babel-runtime": "6.26.0",
+				"classnames": "2.2.6"
 			}
 		},
 		"rmc-tabs": {
@@ -17501,8 +17880,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-tabs/-/rmc-tabs-1.2.29.tgz",
 			"integrity": "sha512-wiJS9WSJi9JH9GQO+FqncX+zaHP31qHa/S8nDW9UXUx0qbCX294QcJEnvfB+WmsfUws7rXjs6sOQp5EDiObnHg==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"rc-gesture": "~0.0.18"
+				"babel-runtime": "6.26.0",
+				"rc-gesture": "0.0.22"
 			}
 		},
 		"rmc-tooltip": {
@@ -17510,8 +17889,8 @@
 			"resolved": "https://registry.npmjs.org/rmc-tooltip/-/rmc-tooltip-1.0.1.tgz",
 			"integrity": "sha512-fSDArf2BlMVrHExmBiqb2TkCRJHshvXFJQ/7tMraLellwaJLNiwrxtWpW329k3S+zTtoVG8UxFS1TjBGEsMzRg==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"rmc-trigger": "1.x"
+				"babel-runtime": "6.26.0",
+				"rmc-trigger": "1.0.12"
 			}
 		},
 		"rmc-trigger": {
@@ -17519,10 +17898,10 @@
 			"resolved": "https://registry.npmjs.org/rmc-trigger/-/rmc-trigger-1.0.12.tgz",
 			"integrity": "sha512-AccQniX7PX7Pm8hBhHEsnf3JU6CA61Xc7fAt2WbO+oXrGaI/jqN8C3COhhOXG54S5iTOjLS26j858zshwAxR9A==",
 			"requires": {
-				"babel-runtime": "6.x",
-				"rc-animate": "2.x",
-				"rc-util": "4.x",
-				"rmc-align": "~1.0.0"
+				"babel-runtime": "6.26.0",
+				"rc-animate": "2.11.1",
+				"rc-util": "4.21.1",
+				"rmc-align": "1.0.0"
 			}
 		},
 		"rsvp": {
@@ -17542,7 +17921,7 @@
 			"integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
 			"dev": true,
 			"requires": {
-				"aproba": "^1.1.1"
+				"aproba": "1.2.0"
 			}
 		},
 		"rxjs": {
@@ -17551,7 +17930,7 @@
 			"integrity": "sha512-3HMA8z/Oz61DUHe+SdOiQyzIf4tOx5oQHmMir7IZEu6TMqCLHT4LRcmNaUS0NwOz8VLvmmBduMsoaUvMaIiqzg==",
 			"dev": true,
 			"requires": {
-				"tslib": "^1.9.0"
+				"tslib": "1.13.0"
 			}
 		},
 		"safe-buffer": {
@@ -17565,7 +17944,7 @@
 			"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
 			"dev": true,
 			"requires": {
-				"ret": "~0.1.10"
+				"ret": "0.1.15"
 			}
 		},
 		"safer-buffer": {
@@ -17579,15 +17958,15 @@
 			"integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
 			"dev": true,
 			"requires": {
-				"@cnakazawa/watch": "^1.0.3",
-				"anymatch": "^2.0.0",
-				"capture-exit": "^2.0.0",
-				"exec-sh": "^0.3.2",
-				"execa": "^1.0.0",
-				"fb-watchman": "^2.0.0",
-				"micromatch": "^3.1.4",
-				"minimist": "^1.1.1",
-				"walker": "~1.0.5"
+				"@cnakazawa/watch": "1.0.4",
+				"anymatch": "2.0.0",
+				"capture-exit": "2.0.0",
+				"exec-sh": "0.3.6",
+				"execa": "1.0.0",
+				"fb-watchman": "2.0.1",
+				"micromatch": "3.1.10",
+				"minimist": "1.2.5",
+				"walker": "1.0.7"
 			}
 		},
 		"sanitize.css": {
@@ -17602,10 +17981,10 @@
 			"integrity": "sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==",
 			"dev": true,
 			"requires": {
-				"glob": "^7.0.0",
-				"lodash": "^4.0.0",
-				"scss-tokenizer": "^0.2.3",
-				"yargs": "^7.0.0"
+				"glob": "7.1.6",
+				"lodash": "4.17.19",
+				"scss-tokenizer": "0.2.3",
+				"yargs": "7.1.1"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -17620,9 +17999,9 @@
 					"integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1",
-						"wrap-ansi": "^2.0.0"
+						"string-width": "1.0.2",
+						"strip-ansi": "3.0.1",
+						"wrap-ansi": "2.1.0"
 					}
 				},
 				"get-caller-file": {
@@ -17649,8 +18028,8 @@
 					"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
 					"dev": true,
 					"requires": {
-						"string-width": "^1.0.1",
-						"strip-ansi": "^3.0.1"
+						"string-width": "1.0.2",
+						"strip-ansi": "3.0.1"
 					}
 				},
 				"y18n": {
@@ -17665,18 +18044,18 @@
 					"integrity": "sha512-huO4Fr1f9PmiJJdll5kwoS2e4GqzGSsMT3PPMpOwoVkOK8ckqAewMTZyA6LXVQWflleb/Z8oPBEvNsMft0XE+g==",
 					"dev": true,
 					"requires": {
-						"camelcase": "^3.0.0",
-						"cliui": "^3.2.0",
-						"decamelize": "^1.1.1",
-						"get-caller-file": "^1.0.1",
-						"os-locale": "^1.4.0",
-						"read-pkg-up": "^1.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^1.0.1",
-						"set-blocking": "^2.0.0",
-						"string-width": "^1.0.2",
-						"which-module": "^1.0.0",
-						"y18n": "^3.2.1",
+						"camelcase": "3.0.0",
+						"cliui": "3.2.0",
+						"decamelize": "1.2.0",
+						"get-caller-file": "1.0.3",
+						"os-locale": "1.4.0",
+						"read-pkg-up": "1.0.1",
+						"require-directory": "2.1.1",
+						"require-main-filename": "1.0.1",
+						"set-blocking": "2.0.0",
+						"string-width": "1.0.2",
+						"which-module": "1.0.0",
+						"y18n": "3.2.1",
 						"yargs-parser": "5.0.0-security.0"
 					}
 				},
@@ -17686,8 +18065,8 @@
 					"integrity": "sha512-T69y4Ps64LNesYxeYGYPvfoMTt/7y1XtfpIslUeK4um+9Hu7hlGoRtaDLvdXb7+/tfq4opVa2HRY5xGip022rQ==",
 					"dev": true,
 					"requires": {
-						"camelcase": "^3.0.0",
-						"object.assign": "^4.1.0"
+						"camelcase": "3.0.0",
+						"object.assign": "4.1.0"
 					}
 				}
 			}
@@ -17698,11 +18077,11 @@
 			"integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
 			"dev": true,
 			"requires": {
-				"clone-deep": "^4.0.1",
-				"loader-utils": "^1.2.3",
-				"neo-async": "^2.6.1",
-				"schema-utils": "^2.6.1",
-				"semver": "^6.3.0"
+				"clone-deep": "4.0.1",
+				"loader-utils": "1.4.0",
+				"neo-async": "2.6.2",
+				"schema-utils": "2.7.1",
+				"semver": "6.3.0"
 			},
 			"dependencies": {
 				"clone-deep": {
@@ -17711,9 +18090,9 @@
 					"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
 					"dev": true,
 					"requires": {
-						"is-plain-object": "^2.0.4",
-						"kind-of": "^6.0.2",
-						"shallow-clone": "^3.0.0"
+						"is-plain-object": "2.0.4",
+						"kind-of": "6.0.3",
+						"shallow-clone": "3.0.1"
 					}
 				},
 				"semver": {
@@ -17728,7 +18107,7 @@
 					"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.2"
+						"kind-of": "6.0.3"
 					}
 				}
 			}
@@ -17750,7 +18129,7 @@
 			"integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==",
 			"dev": true,
 			"requires": {
-				"xmlchars": "^2.1.1"
+				"xmlchars": "2.2.0"
 			}
 		},
 		"scheduler": {
@@ -17758,19 +18137,33 @@
 			"resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
 			"integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
 			"requires": {
-				"loose-envify": "^1.1.0",
-				"object-assign": "^4.1.1"
+				"loose-envify": "1.4.0",
+				"object-assign": "4.1.1"
 			}
 		},
 		"schema-utils": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
-			"integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
+			"version": "2.7.1",
+			"resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+			"integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
 			"dev": true,
 			"requires": {
-				"@types/json-schema": "^7.0.4",
-				"ajv": "^6.12.2",
-				"ajv-keywords": "^3.4.1"
+				"@types/json-schema": "7.0.7",
+				"ajv": "6.12.6",
+				"ajv-keywords": "3.5.2"
+			},
+			"dependencies": {
+				"ajv": {
+					"version": "6.12.6",
+					"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+					"integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+					"dev": true,
+					"requires": {
+						"fast-deep-equal": "3.1.3",
+						"fast-json-stable-stringify": "2.1.0",
+						"json-schema-traverse": "0.4.1",
+						"uri-js": "4.2.2"
+					}
+				}
 			}
 		},
 		"scroll-into-view-if-needed": {
@@ -17778,7 +18171,7 @@
 			"resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.26.tgz",
 			"integrity": "sha512-SQ6AOKfABaSchokAmmaxVnL9IArxEnLEX9j4wAZw+x4iUTb40q7irtHG3z4GtAWz5veVZcCnubXDBRyLVQaohw==",
 			"requires": {
-				"compute-scroll-into-view": "^1.0.16"
+				"compute-scroll-into-view": "1.0.16"
 			}
 		},
 		"scss-tokenizer": {
@@ -17787,8 +18180,8 @@
 			"integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=",
 			"dev": true,
 			"requires": {
-				"js-base64": "^2.1.8",
-				"source-map": "^0.4.2"
+				"js-base64": "2.6.4",
+				"source-map": "0.4.4"
 			},
 			"dependencies": {
 				"source-map": {
@@ -17797,7 +18190,7 @@
 					"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
 					"dev": true,
 					"requires": {
-						"amdefine": ">=0.0.4"
+						"amdefine": "1.0.1"
 					}
 				}
 			}
@@ -17814,12 +18207,12 @@
 			"dev": true
 		},
 		"selfsigned": {
-			"version": "1.10.7",
-			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
-			"integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+			"version": "1.10.8",
+			"resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.8.tgz",
+			"integrity": "sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w==",
 			"dev": true,
 			"requires": {
-				"node-forge": "0.9.0"
+				"node-forge": "0.10.0"
 			}
 		},
 		"semver": {
@@ -17846,18 +18239,18 @@
 			"dev": true,
 			"requires": {
 				"debug": "2.6.9",
-				"depd": "~1.1.2",
-				"destroy": "~1.0.4",
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"etag": "~1.8.1",
+				"depd": "1.1.2",
+				"destroy": "1.0.4",
+				"encodeurl": "1.0.2",
+				"escape-html": "1.0.3",
+				"etag": "1.8.1",
 				"fresh": "0.5.2",
-				"http-errors": "~1.7.2",
+				"http-errors": "1.7.2",
 				"mime": "1.6.0",
 				"ms": "2.1.1",
-				"on-finished": "~2.3.0",
-				"range-parser": "~1.2.1",
-				"statuses": "~1.5.0"
+				"on-finished": "2.3.0",
+				"range-parser": "1.2.1",
+				"statuses": "1.5.0"
 			},
 			"dependencies": {
 				"debug": {
@@ -17877,6 +18270,12 @@
 						}
 					}
 				},
+				"mime": {
+					"version": "1.6.0",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+					"integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+					"dev": true
+				},
 				"ms": {
 					"version": "2.1.1",
 					"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -17891,7 +18290,7 @@
 			"integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
 			"dev": true,
 			"requires": {
-				"randombytes": "^2.1.0"
+				"randombytes": "2.1.0"
 			}
 		},
 		"serve-index": {
@@ -17900,13 +18299,13 @@
 			"integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
 			"dev": true,
 			"requires": {
-				"accepts": "~1.3.4",
+				"accepts": "1.3.7",
 				"batch": "0.6.1",
 				"debug": "2.6.9",
-				"escape-html": "~1.0.3",
-				"http-errors": "~1.6.2",
-				"mime-types": "~2.1.17",
-				"parseurl": "~1.3.2"
+				"escape-html": "1.0.3",
+				"http-errors": "1.6.3",
+				"mime-types": "2.1.27",
+				"parseurl": "1.3.3"
 			},
 			"dependencies": {
 				"debug": {
@@ -17924,10 +18323,10 @@
 					"integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
 					"dev": true,
 					"requires": {
-						"depd": "~1.1.2",
+						"depd": "1.1.2",
 						"inherits": "2.0.3",
 						"setprototypeof": "1.1.0",
-						"statuses": ">= 1.4.0 < 2"
+						"statuses": "1.5.0"
 					}
 				},
 				"inherits": {
@@ -17956,9 +18355,9 @@
 			"integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
 			"dev": true,
 			"requires": {
-				"encodeurl": "~1.0.2",
-				"escape-html": "~1.0.3",
-				"parseurl": "~1.3.3",
+				"encodeurl": "1.0.2",
+				"escape-html": "1.0.3",
+				"parseurl": "1.3.3",
 				"send": "0.17.1"
 			}
 		},
@@ -17974,10 +18373,10 @@
 			"integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "^2.0.1",
-				"is-extendable": "^0.1.1",
-				"is-plain-object": "^2.0.3",
-				"split-string": "^3.0.1"
+				"extend-shallow": "2.0.1",
+				"is-extendable": "0.1.1",
+				"is-plain-object": "2.0.4",
+				"split-string": "3.1.0"
 			},
 			"dependencies": {
 				"extend-shallow": {
@@ -17986,7 +18385,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"is-extendable": "0.1.1"
 					}
 				}
 			}
@@ -18007,8 +18406,8 @@
 			"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 			"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 			"requires": {
-				"inherits": "^2.0.1",
-				"safe-buffer": "^5.0.1"
+				"inherits": "2.0.4",
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"shallow-clone": {
@@ -18017,10 +18416,10 @@
 			"integrity": "sha1-WQnodLp3EG1zrEFM/sH/yofZcGA=",
 			"dev": true,
 			"requires": {
-				"is-extendable": "^0.1.1",
-				"kind-of": "^2.0.1",
-				"lazy-cache": "^0.2.3",
-				"mixin-object": "^2.0.1"
+				"is-extendable": "0.1.1",
+				"kind-of": "2.0.1",
+				"lazy-cache": "0.2.7",
+				"mixin-object": "2.0.1"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -18029,7 +18428,7 @@
 					"integrity": "sha1-AY7HpM5+OobLkUG+UZ0kyPqpgbU=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.0.2"
+						"is-buffer": "1.1.6"
 					}
 				},
 				"lazy-cache": {
@@ -18050,7 +18449,7 @@
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
 			"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
 			"requires": {
-				"shebang-regex": "^1.0.0"
+				"shebang-regex": "1.0.0"
 			}
 		},
 		"shebang-regex": {
@@ -18070,13 +18469,22 @@
 			"dev": true
 		},
 		"side-channel": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz",
-			"integrity": "sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==",
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+			"integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
 			"dev": true,
 			"requires": {
-				"es-abstract": "^1.17.0-next.1",
-				"object-inspect": "^1.7.0"
+				"call-bind": "1.0.2",
+				"get-intrinsic": "1.1.1",
+				"object-inspect": "1.9.0"
+			},
+			"dependencies": {
+				"object-inspect": {
+					"version": "1.9.0",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+					"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+					"dev": true
+				}
 			}
 		},
 		"signal-exit": {
@@ -18090,7 +18498,7 @@
 			"resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
 			"integrity": "sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=",
 			"requires": {
-				"is-arrayish": "^0.3.1"
+				"is-arrayish": "0.3.2"
 			},
 			"dependencies": {
 				"is-arrayish": {
@@ -18118,9 +18526,9 @@
 			"integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "^4.0.0",
-				"astral-regex": "^2.0.0",
-				"is-fullwidth-code-point": "^3.0.0"
+				"ansi-styles": "4.3.0",
+				"astral-regex": "2.0.0",
+				"is-fullwidth-code-point": "3.0.0"
 			},
 			"dependencies": {
 				"ansi-styles": {
@@ -18129,7 +18537,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"astral-regex": {
@@ -18144,7 +18552,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -18167,14 +18575,14 @@
 			"integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
 			"dev": true,
 			"requires": {
-				"base": "^0.11.1",
-				"debug": "^2.2.0",
-				"define-property": "^0.2.5",
-				"extend-shallow": "^2.0.1",
-				"map-cache": "^0.2.2",
-				"source-map": "^0.5.6",
-				"source-map-resolve": "^0.5.0",
-				"use": "^3.1.0"
+				"base": "0.11.2",
+				"debug": "2.6.9",
+				"define-property": "0.2.5",
+				"extend-shallow": "2.0.1",
+				"map-cache": "0.2.2",
+				"source-map": "0.5.7",
+				"source-map-resolve": "0.5.3",
+				"use": "3.1.1"
 			},
 			"dependencies": {
 				"debug": {
@@ -18192,7 +18600,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
+						"is-descriptor": "0.1.6"
 					}
 				},
 				"extend-shallow": {
@@ -18201,7 +18609,7 @@
 					"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
 					"dev": true,
 					"requires": {
-						"is-extendable": "^0.1.0"
+						"is-extendable": "0.1.1"
 					}
 				},
 				"ms": {
@@ -18218,9 +18626,9 @@
 			"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
 			"dev": true,
 			"requires": {
-				"define-property": "^1.0.0",
-				"isobject": "^3.0.0",
-				"snapdragon-util": "^3.0.1"
+				"define-property": "1.0.0",
+				"isobject": "3.0.1",
+				"snapdragon-util": "3.0.1"
 			},
 			"dependencies": {
 				"define-property": {
@@ -18229,7 +18637,7 @@
 					"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^1.0.0"
+						"is-descriptor": "1.0.2"
 					}
 				},
 				"is-accessor-descriptor": {
@@ -18238,7 +18646,7 @@
 					"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-data-descriptor": {
@@ -18247,7 +18655,7 @@
 					"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
 					"dev": true,
 					"requires": {
-						"kind-of": "^6.0.0"
+						"kind-of": "6.0.3"
 					}
 				},
 				"is-descriptor": {
@@ -18256,9 +18664,9 @@
 					"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
 					"dev": true,
 					"requires": {
-						"is-accessor-descriptor": "^1.0.0",
-						"is-data-descriptor": "^1.0.0",
-						"kind-of": "^6.0.2"
+						"is-accessor-descriptor": "1.0.0",
+						"is-data-descriptor": "1.0.0",
+						"kind-of": "6.0.3"
 					}
 				}
 			}
@@ -18269,7 +18677,7 @@
 			"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
 			"dev": true,
 			"requires": {
-				"kind-of": "^3.2.0"
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -18278,7 +18686,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -18289,8 +18697,8 @@
 			"integrity": "sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA==",
 			"dev": true,
 			"requires": {
-				"faye-websocket": "^0.10.0",
-				"uuid": "^3.4.0",
+				"faye-websocket": "0.10.0",
+				"uuid": "3.4.0",
 				"websocket-driver": "0.6.5"
 			}
 		},
@@ -18300,12 +18708,12 @@
 			"integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
 			"dev": true,
 			"requires": {
-				"debug": "^3.2.5",
-				"eventsource": "^1.0.7",
-				"faye-websocket": "~0.11.1",
-				"inherits": "^2.0.3",
-				"json3": "^3.3.2",
-				"url-parse": "^1.4.3"
+				"debug": "3.2.6",
+				"eventsource": "1.1.0",
+				"faye-websocket": "0.11.3",
+				"inherits": "2.0.4",
+				"json3": "3.3.3",
+				"url-parse": "1.5.1"
 			},
 			"dependencies": {
 				"faye-websocket": {
@@ -18314,7 +18722,7 @@
 					"integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
 					"dev": true,
 					"requires": {
-						"websocket-driver": ">=0.5.1"
+						"websocket-driver": "0.6.5"
 					}
 				}
 			}
@@ -18325,7 +18733,7 @@
 			"integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
 			"dev": true,
 			"requires": {
-				"is-plain-obj": "^1.0.0"
+				"is-plain-obj": "1.1.0"
 			}
 		},
 		"source-list-map": {
@@ -18346,11 +18754,11 @@
 			"integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
 			"dev": true,
 			"requires": {
-				"atob": "^2.1.2",
-				"decode-uri-component": "^0.2.0",
-				"resolve-url": "^0.2.1",
-				"source-map-url": "^0.4.0",
-				"urix": "^0.1.0"
+				"atob": "2.1.2",
+				"decode-uri-component": "0.2.0",
+				"resolve-url": "0.2.1",
+				"source-map-url": "0.4.0",
+				"urix": "0.1.0"
 			}
 		},
 		"source-map-support": {
@@ -18358,8 +18766,8 @@
 			"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz",
 			"integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==",
 			"requires": {
-				"buffer-from": "^1.0.0",
-				"source-map": "^0.6.0"
+				"buffer-from": "1.1.1",
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"source-map": {
@@ -18380,8 +18788,8 @@
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
 			"integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
 			"requires": {
-				"spdx-expression-parse": "^3.0.0",
-				"spdx-license-ids": "^3.0.0"
+				"spdx-expression-parse": "3.0.1",
+				"spdx-license-ids": "3.0.5"
 			}
 		},
 		"spdx-exceptions": {
@@ -18394,8 +18802,8 @@
 			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
 			"integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
 			"requires": {
-				"spdx-exceptions": "^2.1.0",
-				"spdx-license-ids": "^3.0.0"
+				"spdx-exceptions": "2.3.0",
+				"spdx-license-ids": "3.0.5"
 			}
 		},
 		"spdx-license-ids": {
@@ -18409,20 +18817,20 @@
 			"integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
 			"dev": true,
 			"requires": {
-				"debug": "^4.1.0",
-				"handle-thing": "^2.0.0",
-				"http-deceiver": "^1.2.7",
-				"select-hose": "^2.0.0",
-				"spdy-transport": "^3.0.0"
+				"debug": "4.3.1",
+				"handle-thing": "2.0.1",
+				"http-deceiver": "1.2.7",
+				"select-hose": "2.0.0",
+				"spdy-transport": "3.0.0"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				}
 			}
@@ -18433,21 +18841,21 @@
 			"integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
 			"dev": true,
 			"requires": {
-				"debug": "^4.1.0",
-				"detect-node": "^2.0.4",
-				"hpack.js": "^2.1.6",
-				"obuf": "^1.1.2",
-				"readable-stream": "^3.0.6",
-				"wbuf": "^1.7.3"
+				"debug": "4.3.1",
+				"detect-node": "2.0.5",
+				"hpack.js": "2.1.6",
+				"obuf": "1.1.2",
+				"readable-stream": "3.6.0",
+				"wbuf": "1.7.3"
 			},
 			"dependencies": {
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				}
 			}
@@ -18458,7 +18866,7 @@
 			"integrity": "sha1-zrzxQr9hu7ZLFBYo5ttIKikUZUw=",
 			"dev": true,
 			"requires": {
-				"through": "2"
+				"through": "2.3.8"
 			}
 		},
 		"split-string": {
@@ -18467,7 +18875,7 @@
 			"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
 			"dev": true,
 			"requires": {
-				"extend-shallow": "^3.0.0"
+				"extend-shallow": "3.0.2"
 			}
 		},
 		"sprintf-js": {
@@ -18482,15 +18890,15 @@
 			"integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
 			"dev": true,
 			"requires": {
-				"asn1": "~0.2.3",
-				"assert-plus": "^1.0.0",
-				"bcrypt-pbkdf": "^1.0.0",
-				"dashdash": "^1.12.0",
-				"ecc-jsbn": "~0.1.1",
-				"getpass": "^0.1.1",
-				"jsbn": "~0.1.0",
-				"safer-buffer": "^2.0.2",
-				"tweetnacl": "~0.14.0"
+				"asn1": "0.2.4",
+				"assert-plus": "1.0.0",
+				"bcrypt-pbkdf": "1.0.2",
+				"dashdash": "1.14.1",
+				"ecc-jsbn": "0.1.2",
+				"getpass": "0.1.7",
+				"jsbn": "0.1.1",
+				"safer-buffer": "2.1.2",
+				"tweetnacl": "0.14.5"
 			}
 		},
 		"ssri": {
@@ -18499,8 +18907,8 @@
 			"integrity": "sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==",
 			"dev": true,
 			"requires": {
-				"figgy-pudding": "^3.5.1",
-				"minipass": "^3.1.1"
+				"figgy-pudding": "3.5.2",
+				"minipass": "3.1.3"
 			}
 		},
 		"stable": {
@@ -18516,10 +18924,21 @@
 			"dev": true
 		},
 		"stack-utils": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.2.tgz",
-			"integrity": "sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==",
-			"dev": true
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz",
+			"integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==",
+			"dev": true,
+			"requires": {
+				"escape-string-regexp": "2.0.0"
+			},
+			"dependencies": {
+				"escape-string-regexp": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+					"integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+					"dev": true
+				}
+			}
 		},
 		"static-extend": {
 			"version": "0.1.2",
@@ -18527,8 +18946,8 @@
 			"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
 			"dev": true,
 			"requires": {
-				"define-property": "^0.2.5",
-				"object-copy": "^0.1.0"
+				"define-property": "0.2.5",
+				"object-copy": "0.1.0"
 			},
 			"dependencies": {
 				"define-property": {
@@ -18537,7 +18956,7 @@
 					"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
 					"dev": true,
 					"requires": {
-						"is-descriptor": "^0.1.0"
+						"is-descriptor": "0.1.6"
 					}
 				}
 			}
@@ -18554,7 +18973,7 @@
 			"integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "^2.0.1"
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -18563,13 +18982,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -18584,7 +19003,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -18601,8 +19020,8 @@
 			"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
 			"dev": true,
 			"requires": {
-				"inherits": "~2.0.1",
-				"readable-stream": "^2.0.2"
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -18611,13 +19030,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -18632,7 +19051,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -18643,8 +19062,8 @@
 			"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
 			"dev": true,
 			"requires": {
-				"end-of-stream": "^1.1.0",
-				"stream-shift": "^1.0.0"
+				"end-of-stream": "1.4.4",
+				"stream-shift": "1.0.1"
 			}
 		},
 		"stream-http": {
@@ -18653,11 +19072,11 @@
 			"integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
 			"dev": true,
 			"requires": {
-				"builtin-status-codes": "^3.0.0",
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.3.6",
-				"to-arraybuffer": "^1.0.0",
-				"xtend": "^4.0.0"
+				"builtin-status-codes": "3.0.0",
+				"inherits": "2.0.4",
+				"readable-stream": "2.3.7",
+				"to-arraybuffer": "1.0.1",
+				"xtend": "4.0.2"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -18666,13 +19085,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -18687,7 +19106,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -18720,8 +19139,8 @@
 			"integrity": "sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=",
 			"dev": true,
 			"requires": {
-				"astral-regex": "^1.0.0",
-				"strip-ansi": "^4.0.0"
+				"astral-regex": "1.0.0",
+				"strip-ansi": "4.0.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -18736,7 +19155,7 @@
 					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^3.0.0"
+						"ansi-regex": "3.0.0"
 					}
 				}
 			}
@@ -18747,23 +19166,122 @@
 			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 			"dev": true,
 			"requires": {
-				"code-point-at": "^1.0.0",
-				"is-fullwidth-code-point": "^1.0.0",
-				"strip-ansi": "^3.0.0"
+				"code-point-at": "1.1.0",
+				"is-fullwidth-code-point": "1.0.0",
+				"strip-ansi": "3.0.1"
 			}
 		},
 		"string.prototype.matchall": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz",
-			"integrity": "sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==",
-			"dev": true,
-			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0",
-				"has-symbols": "^1.0.1",
-				"internal-slot": "^1.0.2",
-				"regexp.prototype.flags": "^1.3.0",
-				"side-channel": "^1.0.2"
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz",
+			"integrity": "sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==",
+			"dev": true,
+			"requires": {
+				"call-bind": "1.0.2",
+				"define-properties": "1.1.3",
+				"es-abstract": "1.18.0",
+				"has-symbols": "1.0.1",
+				"internal-slot": "1.0.3",
+				"regexp.prototype.flags": "1.3.1",
+				"side-channel": "1.0.4"
+			},
+			"dependencies": {
+				"es-abstract": {
+					"version": "1.18.0",
+					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0.tgz",
+					"integrity": "sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"es-to-primitive": "1.2.1",
+						"function-bind": "1.1.1",
+						"get-intrinsic": "1.1.1",
+						"has": "1.0.3",
+						"has-symbols": "1.0.2",
+						"is-callable": "1.2.3",
+						"is-negative-zero": "2.0.1",
+						"is-regex": "1.1.2",
+						"is-string": "1.0.5",
+						"object-inspect": "1.9.0",
+						"object-keys": "1.1.1",
+						"object.assign": "4.1.2",
+						"string.prototype.trimend": "1.0.4",
+						"string.prototype.trimstart": "1.0.4",
+						"unbox-primitive": "1.0.1"
+					},
+					"dependencies": {
+						"has-symbols": {
+							"version": "1.0.2",
+							"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+							"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+							"dev": true
+						}
+					}
+				},
+				"is-callable": {
+					"version": "1.2.3",
+					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.3.tgz",
+					"integrity": "sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==",
+					"dev": true
+				},
+				"is-regex": {
+					"version": "1.1.2",
+					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.2.tgz",
+					"integrity": "sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"has-symbols": "1.0.1"
+					}
+				},
+				"object-inspect": {
+					"version": "1.9.0",
+					"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.9.0.tgz",
+					"integrity": "sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==",
+					"dev": true
+				},
+				"object.assign": {
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz",
+					"integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3",
+						"has-symbols": "1.0.1",
+						"object-keys": "1.1.1"
+					}
+				},
+				"regexp.prototype.flags": {
+					"version": "1.3.1",
+					"resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
+					"integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				},
+				"string.prototype.trimend": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz",
+					"integrity": "sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				},
+				"string.prototype.trimstart": {
+					"version": "1.0.4",
+					"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz",
+					"integrity": "sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==",
+					"dev": true,
+					"requires": {
+						"call-bind": "1.0.2",
+						"define-properties": "1.1.3"
+					}
+				}
 			}
 		},
 		"string.prototype.padend": {
@@ -18771,8 +19289,8 @@
 			"resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz",
 			"integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.0-next.1"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"string.prototype.trimend": {
@@ -18780,8 +19298,8 @@
 			"resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz",
 			"integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"string.prototype.trimstart": {
@@ -18789,8 +19307,8 @@
 			"resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz",
 			"integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==",
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.5"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6"
 			}
 		},
 		"string_decoder": {
@@ -18798,7 +19316,7 @@
 			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
 			"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
 			"requires": {
-				"safe-buffer": "~5.2.0"
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"stringify-object": {
@@ -18807,9 +19325,9 @@
 			"integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
 			"dev": true,
 			"requires": {
-				"get-own-enumerable-property-symbols": "^3.0.0",
-				"is-obj": "^1.0.1",
-				"is-regexp": "^1.0.0"
+				"get-own-enumerable-property-symbols": "3.0.2",
+				"is-obj": "1.0.1",
+				"is-regexp": "1.0.0"
 			}
 		},
 		"strip-ansi": {
@@ -18818,7 +19336,7 @@
 			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"dev": true,
 			"requires": {
-				"ansi-regex": "^2.0.0"
+				"ansi-regex": "2.1.1"
 			}
 		},
 		"strip-bom": {
@@ -18827,7 +19345,7 @@
 			"integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
 			"dev": true,
 			"requires": {
-				"is-utf8": "^0.2.0"
+				"is-utf8": "0.2.1"
 			}
 		},
 		"strip-comments": {
@@ -18836,8 +19354,8 @@
 			"integrity": "sha512-kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw==",
 			"dev": true,
 			"requires": {
-				"babel-extract-comments": "^1.0.0",
-				"babel-plugin-transform-object-rest-spread": "^6.26.0"
+				"babel-extract-comments": "1.0.0",
+				"babel-plugin-transform-object-rest-spread": "6.26.0"
 			}
 		},
 		"strip-eof": {
@@ -18858,7 +19376,7 @@
 			"integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
 			"dev": true,
 			"requires": {
-				"get-stdin": "^4.0.1"
+				"get-stdin": "4.0.1"
 			},
 			"dependencies": {
 				"get-stdin": {
@@ -18881,8 +19399,8 @@
 			"integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "^1.1.0",
-				"schema-utils": "^1.0.0"
+				"loader-utils": "1.4.0",
+				"schema-utils": "1.0.0"
 			},
 			"dependencies": {
 				"schema-utils": {
@@ -18891,9 +19409,9 @@
 					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
+						"ajv": "6.12.3",
+						"ajv-errors": "1.0.1",
+						"ajv-keywords": "3.5.2"
 					}
 				}
 			}
@@ -18903,15 +19421,15 @@
 			"resolved": "https://registry.npmjs.org/styled-components/-/styled-components-2.2.3.tgz",
 			"integrity": "sha512-KzdZv4zyZPLoM4V90Tu+3evqTBZt1quFC1DBt5SA7k4dY3ANWmK+LZiIk/Q99GzLisBiEjV+Fn9nyty9rrZ1jw==",
 			"requires": {
-				"buffer": "^5.0.3",
-				"css-to-react-native": "^2.0.3",
-				"fbjs": "^0.8.9",
-				"hoist-non-react-statics": "^1.2.0",
-				"is-function": "^1.0.1",
-				"is-plain-object": "^2.0.1",
-				"prop-types": "^15.5.4",
-				"stylis": "3.x",
-				"supports-color": "^3.2.3"
+				"buffer": "5.6.0",
+				"css-to-react-native": "2.3.2",
+				"fbjs": "0.8.17",
+				"hoist-non-react-statics": "1.2.0",
+				"is-function": "1.0.2",
+				"is-plain-object": "2.0.4",
+				"prop-types": "15.7.2",
+				"stylis": "3.5.4",
+				"supports-color": "3.2.3"
 			},
 			"dependencies": {
 				"has-flag": {
@@ -18929,7 +19447,7 @@
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
 					"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
 					"requires": {
-						"has-flag": "^1.0.0"
+						"has-flag": "1.0.0"
 					}
 				}
 			}
@@ -18940,9 +19458,9 @@
 			"integrity": "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==",
 			"dev": true,
 			"requires": {
-				"browserslist": "^4.0.0",
-				"postcss": "^7.0.0",
-				"postcss-selector-parser": "^3.0.0"
+				"browserslist": "4.16.3",
+				"postcss": "7.0.35",
+				"postcss-selector-parser": "3.1.2"
 			},
 			"dependencies": {
 				"postcss-selector-parser": {
@@ -18951,9 +19469,9 @@
 					"integrity": "sha512-h7fJ/5uWuRVyOtkO45pnt1Ih40CEleeyCHzipqAZO2e5H20g25Y48uYnFUiShvY4rZWNJ/Bib/KVPmanaCtOhA==",
 					"dev": true,
 					"requires": {
-						"dot-prop": "^5.2.0",
-						"indexes-of": "^1.0.1",
-						"uniq": "^1.0.1"
+						"dot-prop": "5.3.0",
+						"indexes-of": "1.0.1",
+						"uniq": "1.0.1"
 					}
 				}
 			}
@@ -18968,7 +19486,7 @@
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
 			"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 			"requires": {
-				"has-flag": "^3.0.0"
+				"has-flag": "3.0.0"
 			}
 		},
 		"surge": {
@@ -18977,18 +19495,18 @@
 			"integrity": "sha512-FejQvGH9G1Xt9nWGaQnwX5anKReDJkFUrAh3/UCroJTf/M91hId8JOt1N6Glgh9T2Sz8G4DFaFFHJsoPaI5DBw==",
 			"dev": true,
 			"requires": {
-				"cli-table3": "^0.5.1",
-				"inquirer": "^6.2.2",
+				"cli-table3": "0.5.1",
+				"inquirer": "6.5.2",
 				"is-domain": "0.0.1",
 				"minimist": "1.2.3",
 				"moniker": "0.1.2",
 				"netrc": "0.1.4",
 				"progress": "1.1.8",
-				"prompt": "~0.2.14",
+				"prompt": "0.2.14",
 				"read": "1.0.5",
-				"request": "^2.88.0",
+				"request": "2.88.2",
 				"split": "0.3.1",
-				"surge-fstream-ignore": "^1.0.6",
+				"surge-fstream-ignore": "1.0.6",
 				"surge-ignore": "0.2.0",
 				"tarr": "1.1.0",
 				"url-parse-as-address": "1.0.0"
@@ -19012,7 +19530,7 @@
 					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
 					"dev": true,
 					"requires": {
-						"escape-string-regexp": "^1.0.5"
+						"escape-string-regexp": "1.0.5"
 					}
 				},
 				"inquirer": {
@@ -19021,19 +19539,19 @@
 					"integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
 					"dev": true,
 					"requires": {
-						"ansi-escapes": "^3.2.0",
-						"chalk": "^2.4.2",
-						"cli-cursor": "^2.1.0",
-						"cli-width": "^2.0.0",
-						"external-editor": "^3.0.3",
-						"figures": "^2.0.0",
-						"lodash": "^4.17.12",
+						"ansi-escapes": "3.2.0",
+						"chalk": "2.4.2",
+						"cli-cursor": "2.1.0",
+						"cli-width": "2.2.1",
+						"external-editor": "3.1.0",
+						"figures": "2.0.0",
+						"lodash": "4.17.19",
 						"mute-stream": "0.0.7",
-						"run-async": "^2.2.0",
-						"rxjs": "^6.4.0",
-						"string-width": "^2.1.0",
-						"strip-ansi": "^5.1.0",
-						"through": "^2.3.6"
+						"run-async": "2.4.1",
+						"rxjs": "6.6.0",
+						"string-width": "2.1.1",
+						"strip-ansi": "5.2.0",
+						"through": "2.3.8"
 					}
 				},
 				"is-fullwidth-code-point": {
@@ -19066,8 +19584,8 @@
 					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
 					"dev": true,
 					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "4.0.0"
 					},
 					"dependencies": {
 						"strip-ansi": {
@@ -19076,7 +19594,7 @@
 							"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
 							"dev": true,
 							"requires": {
-								"ansi-regex": "^3.0.0"
+								"ansi-regex": "3.0.0"
 							}
 						}
 					}
@@ -19087,7 +19605,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					},
 					"dependencies": {
 						"ansi-regex": {
@@ -19106,9 +19624,9 @@
 			"integrity": "sha512-hNN52cz2fYCAzhlHmWPn4aE3bFbpBt01AkWFLljrtSzFvxlipLAeLuLtQ3t4f0RKoUkjzXWCAFK13WoET2iM1A==",
 			"dev": true,
 			"requires": {
-				"fstream": ">=1.0.12",
-				"inherits": "2",
-				"minimatch": "^3.0.0"
+				"fstream": "1.0.12",
+				"inherits": "2.0.4",
+				"minimatch": "3.0.4"
 			}
 		},
 		"surge-ignore": {
@@ -19129,19 +19647,19 @@
 			"integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.4.1",
-				"coa": "^2.0.2",
-				"css-select": "^2.0.0",
-				"css-select-base-adapter": "^0.1.1",
+				"chalk": "2.4.2",
+				"coa": "2.0.2",
+				"css-select": "2.1.0",
+				"css-select-base-adapter": "0.1.1",
 				"css-tree": "1.0.0-alpha.37",
-				"csso": "^4.0.2",
-				"js-yaml": "^3.13.1",
-				"mkdirp": "~0.5.1",
-				"object.values": "^1.1.0",
-				"sax": "~1.2.4",
-				"stable": "^0.1.8",
-				"unquote": "~1.1.1",
-				"util.promisify": "~1.0.0"
+				"csso": "4.2.0",
+				"js-yaml": "3.14.1",
+				"mkdirp": "0.5.5",
+				"object.values": "1.1.1",
+				"sax": "1.2.4",
+				"stable": "0.1.8",
+				"unquote": "1.1.1",
+				"util.promisify": "1.0.1"
 			}
 		},
 		"symbol-observable": {
@@ -19161,10 +19679,10 @@
 			"integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
 			"dev": true,
 			"requires": {
-				"ajv": "^6.10.2",
-				"lodash": "^4.17.14",
-				"slice-ansi": "^2.1.0",
-				"string-width": "^3.0.0"
+				"ajv": "6.12.3",
+				"lodash": "4.17.19",
+				"slice-ansi": "2.1.0",
+				"string-width": "3.1.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -19185,9 +19703,9 @@
 					"integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.0",
-						"astral-regex": "^1.0.0",
-						"is-fullwidth-code-point": "^2.0.0"
+						"ansi-styles": "3.2.1",
+						"astral-regex": "1.0.0",
+						"is-fullwidth-code-point": "2.0.0"
 					}
 				},
 				"string-width": {
@@ -19196,9 +19714,9 @@
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
+						"emoji-regex": "7.0.3",
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "5.2.0"
 					}
 				},
 				"strip-ansi": {
@@ -19207,7 +19725,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					}
 				}
 			}
@@ -19224,9 +19742,9 @@
 			"integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
 			"dev": true,
 			"requires": {
-				"block-stream": "*",
-				"fstream": "^1.0.12",
-				"inherits": "2"
+				"block-stream": "0.0.9",
+				"fstream": "1.0.12",
+				"inherits": "2.0.4"
 			}
 		},
 		"tarr": {
@@ -19235,9 +19753,9 @@
 			"integrity": "sha512-tENbQ43IQckay71stp1p1lljRhoEZpZk10FzEZKW2tJcMcnLwV3CfZdxBAERlH6nwnFvnHMS9eJOJl6IzSsG0g==",
 			"dev": true,
 			"requires": {
-				"block-stream": "*",
-				"fstream": ">=1.0.12",
-				"inherits": "2"
+				"block-stream": "0.0.9",
+				"fstream": "1.0.12",
+				"inherits": "2.0.4"
 			}
 		},
 		"terser": {
@@ -19245,9 +19763,9 @@
 			"resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
 			"integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
 			"requires": {
-				"commander": "^2.20.0",
-				"source-map": "~0.6.1",
-				"source-map-support": "~0.5.12"
+				"commander": "2.20.3",
+				"source-map": "0.6.1",
+				"source-map-support": "0.5.19"
 			},
 			"dependencies": {
 				"source-map": {
@@ -19263,15 +19781,15 @@
 			"integrity": "sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==",
 			"dev": true,
 			"requires": {
-				"cacache": "^13.0.1",
-				"find-cache-dir": "^3.3.1",
-				"jest-worker": "^25.4.0",
-				"p-limit": "^2.3.0",
-				"schema-utils": "^2.6.6",
-				"serialize-javascript": "^4.0.0",
-				"source-map": "^0.6.1",
-				"terser": "^4.6.12",
-				"webpack-sources": "^1.4.3"
+				"cacache": "13.0.1",
+				"find-cache-dir": "3.3.1",
+				"jest-worker": "25.5.0",
+				"p-limit": "2.3.0",
+				"schema-utils": "2.7.1",
+				"serialize-javascript": "4.0.0",
+				"source-map": "0.6.1",
+				"terser": "4.8.0",
+				"webpack-sources": "1.4.3"
 			},
 			"dependencies": {
 				"find-cache-dir": {
@@ -19280,9 +19798,9 @@
 					"integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==",
 					"dev": true,
 					"requires": {
-						"commondir": "^1.0.1",
-						"make-dir": "^3.0.2",
-						"pkg-dir": "^4.1.0"
+						"commondir": "1.0.1",
+						"make-dir": "3.1.0",
+						"pkg-dir": "4.2.0"
 					}
 				},
 				"find-up": {
@@ -19291,8 +19809,8 @@
 					"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 					"dev": true,
 					"requires": {
-						"locate-path": "^5.0.0",
-						"path-exists": "^4.0.0"
+						"locate-path": "5.0.0",
+						"path-exists": "4.0.0"
 					}
 				},
 				"has-flag": {
@@ -19307,8 +19825,8 @@
 					"integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==",
 					"dev": true,
 					"requires": {
-						"merge-stream": "^2.0.0",
-						"supports-color": "^7.0.0"
+						"merge-stream": "2.0.0",
+						"supports-color": "7.2.0"
 					}
 				},
 				"locate-path": {
@@ -19317,7 +19835,7 @@
 					"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 					"dev": true,
 					"requires": {
-						"p-locate": "^4.1.0"
+						"p-locate": "4.1.0"
 					}
 				},
 				"make-dir": {
@@ -19326,7 +19844,7 @@
 					"integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
 					"dev": true,
 					"requires": {
-						"semver": "^6.0.0"
+						"semver": "6.3.0"
 					}
 				},
 				"p-locate": {
@@ -19335,7 +19853,7 @@
 					"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 					"dev": true,
 					"requires": {
-						"p-limit": "^2.2.0"
+						"p-limit": "2.3.0"
 					}
 				},
 				"path-exists": {
@@ -19350,7 +19868,7 @@
 					"integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
 					"dev": true,
 					"requires": {
-						"find-up": "^4.0.0"
+						"find-up": "4.1.0"
 					}
 				},
 				"semver": {
@@ -19366,12 +19884,12 @@
 					"dev": true
 				},
 				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "4.0.0"
 					}
 				}
 			}
@@ -19382,59 +19900,21 @@
 			"integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==",
 			"dev": true,
 			"requires": {
-				"glob": "^7.1.3",
-				"minimatch": "^3.0.4",
-				"read-pkg-up": "^4.0.0",
-				"require-main-filename": "^2.0.0"
+				"glob": "7.1.6",
+				"minimatch": "3.0.4",
+				"read-pkg-up": "4.0.0",
+				"require-main-filename": "2.0.0"
 			},
 			"dependencies": {
-				"load-json-file": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
-					"integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"parse-json": "^4.0.0",
-						"pify": "^3.0.0",
-						"strip-bom": "^3.0.0"
-					}
-				},
-				"path-type": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
-					"integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
-					"dev": true,
-					"requires": {
-						"pify": "^3.0.0"
-					}
-				},
-				"read-pkg": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
-					"integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
-					"dev": true,
-					"requires": {
-						"load-json-file": "^4.0.0",
-						"normalize-package-data": "^2.3.2",
-						"path-type": "^3.0.0"
-					}
-				},
 				"read-pkg-up": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-4.0.0.tgz",
 					"integrity": "sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==",
 					"dev": true,
 					"requires": {
-						"find-up": "^3.0.0",
-						"read-pkg": "^3.0.0"
+						"find-up": "3.0.0",
+						"read-pkg": "3.0.0"
 					}
-				},
-				"strip-bom": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-					"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-					"dev": true
 				}
 			}
 		},
@@ -19462,8 +19942,8 @@
 			"integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
 			"dev": true,
 			"requires": {
-				"readable-stream": "~2.3.6",
-				"xtend": "~4.0.1"
+				"readable-stream": "2.3.7",
+				"xtend": "4.0.2"
 			},
 			"dependencies": {
 				"readable-stream": {
@@ -19472,13 +19952,13 @@
 					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"core-util-is": "~1.0.0",
-						"inherits": "~2.0.3",
-						"isarray": "~1.0.0",
-						"process-nextick-args": "~2.0.0",
-						"safe-buffer": "~5.1.1",
-						"string_decoder": "~1.1.1",
-						"util-deprecate": "~1.0.1"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
 				"safe-buffer": {
@@ -19493,7 +19973,7 @@
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"requires": {
-						"safe-buffer": "~5.1.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
@@ -19505,12 +19985,12 @@
 			"dev": true
 		},
 		"timers-browserify": {
-			"version": "2.0.11",
-			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-			"integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+			"version": "2.0.12",
+			"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+			"integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
 			"dev": true,
 			"requires": {
-				"setimmediate": "^1.0.4"
+				"setimmediate": "1.0.5"
 			}
 		},
 		"timsort": {
@@ -19535,7 +20015,7 @@
 			"integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
 			"dev": true,
 			"requires": {
-				"os-tmpdir": "~1.0.2"
+				"os-tmpdir": "1.0.2"
 			}
 		},
 		"tmpl": {
@@ -19555,7 +20035,7 @@
 			"resolved": "https://registry.npmjs.org/to-camel-case/-/to-camel-case-1.0.0.tgz",
 			"integrity": "sha1-GlYFSy+daWKYzmamCJcyK29CPkY=",
 			"requires": {
-				"to-space-case": "^1.0.0"
+				"to-space-case": "1.0.0"
 			}
 		},
 		"to-fast-properties": {
@@ -19575,7 +20055,7 @@
 			"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
 			"dev": true,
 			"requires": {
-				"kind-of": "^3.0.2"
+				"kind-of": "3.2.2"
 			},
 			"dependencies": {
 				"kind-of": {
@@ -19584,7 +20064,7 @@
 					"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
 					"dev": true,
 					"requires": {
-						"is-buffer": "^1.1.5"
+						"is-buffer": "1.1.6"
 					}
 				}
 			}
@@ -19595,10 +20075,10 @@
 			"integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
 			"dev": true,
 			"requires": {
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"regex-not": "^1.0.2",
-				"safe-regex": "^1.1.0"
+				"define-property": "2.0.2",
+				"extend-shallow": "3.0.2",
+				"regex-not": "1.0.2",
+				"safe-regex": "1.1.0"
 			}
 		},
 		"to-regex-range": {
@@ -19607,8 +20087,8 @@
 			"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
 			"dev": true,
 			"requires": {
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1"
+				"is-number": "3.0.0",
+				"repeat-string": "1.6.1"
 			}
 		},
 		"to-space-case": {
@@ -19616,7 +20096,7 @@
 			"resolved": "https://registry.npmjs.org/to-space-case/-/to-space-case-1.0.0.tgz",
 			"integrity": "sha1-sFLar7Gysp3HcM6gFj5ewOvJ/Bc=",
 			"requires": {
-				"to-no-case": "^1.0.0"
+				"to-no-case": "1.0.2"
 			}
 		},
 		"toggle-selection": {
@@ -19636,8 +20116,17 @@
 			"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
 			"dev": true,
 			"requires": {
-				"psl": "^1.1.28",
-				"punycode": "^2.1.1"
+				"psl": "1.8.0",
+				"punycode": "2.1.1"
+			}
+		},
+		"tr46": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+			"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+			"dev": true,
+			"requires": {
+				"punycode": "2.1.1"
 			}
 		},
 		"trim-newlines": {
@@ -19652,7 +20141,7 @@
 			"integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==",
 			"dev": true,
 			"requires": {
-				"glob": "^7.1.2"
+				"glob": "7.1.6"
 			}
 		},
 		"try-to-catch": {
@@ -19672,12 +20161,12 @@
 			"integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="
 		},
 		"tsutils": {
-			"version": "3.17.1",
-			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz",
-			"integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==",
+			"version": "3.21.0",
+			"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+			"integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
 			"dev": true,
 			"requires": {
-				"tslib": "^1.8.1"
+				"tslib": "1.13.0"
 			}
 		},
 		"tty-browserify": {
@@ -19692,7 +20181,7 @@
 			"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
 			"dev": true,
 			"requires": {
-				"safe-buffer": "^5.0.1"
+				"safe-buffer": "5.2.1"
 			}
 		},
 		"tween-functions": {
@@ -19718,7 +20207,7 @@
 			"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
 			"dev": true,
 			"requires": {
-				"prelude-ls": "~1.1.2"
+				"prelude-ls": "1.1.2"
 			}
 		},
 		"type-fest": {
@@ -19734,7 +20223,7 @@
 			"dev": true,
 			"requires": {
 				"media-typer": "0.3.0",
-				"mime-types": "~2.1.24"
+				"mime-types": "2.1.27"
 			}
 		},
 		"typed-function": {
@@ -19758,6 +20247,26 @@
 			"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
 			"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
 		},
+		"unbox-primitive": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
+			"integrity": "sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==",
+			"dev": true,
+			"requires": {
+				"function-bind": "1.1.1",
+				"has-bigints": "1.0.1",
+				"has-symbols": "1.0.2",
+				"which-boxed-primitive": "1.0.2"
+			},
+			"dependencies": {
+				"has-symbols": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz",
+					"integrity": "sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==",
+					"dev": true
+				}
+			}
+		},
 		"underscore": {
 			"version": "1.10.2",
 			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
@@ -19775,8 +20284,8 @@
 			"integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
 			"dev": true,
 			"requires": {
-				"unicode-canonical-property-names-ecmascript": "^1.0.4",
-				"unicode-property-aliases-ecmascript": "^1.0.4"
+				"unicode-canonical-property-names-ecmascript": "1.0.4",
+				"unicode-property-aliases-ecmascript": "1.1.0"
 			}
 		},
 		"unicode-match-property-value-ecmascript": {
@@ -19797,10 +20306,10 @@
 			"integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
 			"dev": true,
 			"requires": {
-				"arr-union": "^3.1.0",
-				"get-value": "^2.0.6",
-				"is-extendable": "^0.1.1",
-				"set-value": "^2.0.1"
+				"arr-union": "3.1.0",
+				"get-value": "2.0.6",
+				"is-extendable": "0.1.1",
+				"set-value": "2.0.1"
 			}
 		},
 		"uniq": {
@@ -19821,7 +20330,7 @@
 			"integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
 			"dev": true,
 			"requires": {
-				"unique-slug": "^2.0.0"
+				"unique-slug": "2.0.2"
 			}
 		},
 		"unique-slug": {
@@ -19830,7 +20339,7 @@
 			"integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
 			"dev": true,
 			"requires": {
-				"imurmurhash": "^0.1.4"
+				"imurmurhash": "0.1.4"
 			}
 		},
 		"universal-cookie": {
@@ -19838,10 +20347,10 @@
 			"resolved": "https://registry.npmjs.org/universal-cookie/-/universal-cookie-4.0.2.tgz",
 			"integrity": "sha512-n14lhA//lQeYRweP9j9uXsshN9Cs4LunVSnvAGmnA69SofwsjpUU03geaCaPC9LlsH2rkBy99o3zxQyVOldGvA==",
 			"requires": {
-				"@types/cookie": "^0.3.3",
-				"@types/object-assign": "^4.0.30",
-				"cookie": "^0.4.0",
-				"object-assign": "^4.1.1"
+				"@types/cookie": "0.3.3",
+				"@types/object-assign": "4.0.30",
+				"cookie": "0.4.0",
+				"object-assign": "4.1.1"
 			}
 		},
 		"universalify": {
@@ -19868,8 +20377,8 @@
 			"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
 			"dev": true,
 			"requires": {
-				"has-value": "^0.3.1",
-				"isobject": "^3.0.0"
+				"has-value": "0.3.1",
+				"isobject": "3.0.1"
 			},
 			"dependencies": {
 				"has-value": {
@@ -19878,9 +20387,9 @@
 					"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
 					"dev": true,
 					"requires": {
-						"get-value": "^2.0.3",
-						"has-values": "^0.1.4",
-						"isobject": "^2.0.0"
+						"get-value": "2.0.6",
+						"has-values": "0.1.4",
+						"isobject": "2.1.0"
 					},
 					"dependencies": {
 						"isobject": {
@@ -19914,7 +20423,7 @@
 			"integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
 			"dev": true,
 			"requires": {
-				"punycode": "^2.1.0"
+				"punycode": "2.1.1"
 			}
 		},
 		"urix": {
@@ -19947,27 +20456,19 @@
 			"integrity": "sha512-goSdg8VY+7nPZKUEChZSEtW5gjbS66USIGCeSJ1OVOJ7Yfuh/36YxCwMi5HVEJh6mqUYOoy3NJ0vlOMrWsSHog==",
 			"dev": true,
 			"requires": {
-				"loader-utils": "^1.2.3",
-				"mime": "^2.4.4",
-				"schema-utils": "^2.5.0"
-			},
-			"dependencies": {
-				"mime": {
-					"version": "2.4.6",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-					"integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-					"dev": true
-				}
+				"loader-utils": "1.4.0",
+				"mime": "2.5.2",
+				"schema-utils": "2.7.1"
 			}
 		},
 		"url-parse": {
-			"version": "1.4.7",
-			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
-			"integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
+			"integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
 			"dev": true,
 			"requires": {
-				"querystringify": "^2.1.1",
-				"requires-port": "^1.0.0"
+				"querystringify": "2.2.0",
+				"requires-port": "1.0.0"
 			}
 		},
 		"url-parse-as-address": {
@@ -20010,10 +20511,10 @@
 			"integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
 			"dev": true,
 			"requires": {
-				"define-properties": "^1.1.3",
-				"es-abstract": "^1.17.2",
-				"has-symbols": "^1.0.1",
-				"object.getownpropertydescriptors": "^2.1.0"
+				"define-properties": "1.1.3",
+				"es-abstract": "1.17.6",
+				"has-symbols": "1.0.1",
+				"object.getownpropertydescriptors": "2.1.2"
 			}
 		},
 		"utila": {
@@ -20028,12 +20529,12 @@
 			"integrity": "sha1-kwyI6ZCY1iIINMNWy9mncFItkNc=",
 			"dev": true,
 			"requires": {
-				"async": "~0.2.9",
-				"deep-equal": "*",
-				"i": "0.3.x",
-				"mkdirp": "0.x.x",
-				"ncp": "0.4.x",
-				"rimraf": "2.x.x"
+				"async": "0.2.10",
+				"deep-equal": "1.1.1",
+				"i": "0.3.6",
+				"mkdirp": "0.5.5",
+				"ncp": "0.4.2",
+				"rimraf": "2.7.1"
 			},
 			"dependencies": {
 				"async": {
@@ -20048,7 +20549,7 @@
 					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
 					"dev": true,
 					"requires": {
-						"glob": "^7.1.3"
+						"glob": "7.1.6"
 					}
 				}
 			}
@@ -20066,9 +20567,9 @@
 			"dev": true
 		},
 		"v8-compile-cache": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-			"integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz",
+			"integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==",
 			"dev": true
 		},
 		"validate-color": {
@@ -20081,8 +20582,8 @@
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
 			"requires": {
-				"spdx-correct": "^3.0.0",
-				"spdx-expression-parse": "^3.0.0"
+				"spdx-correct": "3.1.1",
+				"spdx-expression-parse": "3.0.1"
 			}
 		},
 		"validator": {
@@ -20113,9 +20614,9 @@
 			"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
 			"dev": true,
 			"requires": {
-				"assert-plus": "^1.0.0",
+				"assert-plus": "1.0.0",
 				"core-util-is": "1.0.2",
-				"extsprintf": "^1.2.0"
+				"extsprintf": "1.3.0"
 			}
 		},
 		"vm-browserify": {
@@ -20130,7 +20631,7 @@
 			"integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
 			"dev": true,
 			"requires": {
-				"browser-process-hrtime": "^1.0.0"
+				"browser-process-hrtime": "1.0.0"
 			}
 		},
 		"w3c-xmlserializer": {
@@ -20139,17 +20640,9 @@
 			"integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==",
 			"dev": true,
 			"requires": {
-				"domexception": "^1.0.1",
-				"webidl-conversions": "^4.0.2",
-				"xml-name-validator": "^3.0.0"
-			},
-			"dependencies": {
-				"xml-name-validator": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
-					"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-					"dev": true
-				}
+				"domexception": "1.0.1",
+				"webidl-conversions": "4.0.2",
+				"xml-name-validator": "3.0.0"
 			}
 		},
 		"walker": {
@@ -20158,7 +20651,7 @@
 			"integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=",
 			"dev": true,
 			"requires": {
-				"makeerror": "1.0.x"
+				"makeerror": "1.0.11"
 			}
 		},
 		"warning": {
@@ -20166,149 +20659,132 @@
 			"resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
 			"integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
 			"requires": {
-				"loose-envify": "^1.0.0"
+				"loose-envify": "1.4.0"
 			}
 		},
 		"watchpack": {
-			"version": "1.7.4",
-			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",
-			"integrity": "sha512-aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg==",
+			"version": "1.7.5",
+			"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+			"integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
+			"dev": true,
+			"requires": {
+				"chokidar": "3.5.1",
+				"graceful-fs": "4.2.4",
+				"neo-async": "2.6.2",
+				"watchpack-chokidar2": "2.0.1"
+			}
+		},
+		"watchpack-chokidar2": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+			"integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
 			"dev": true,
+			"optional": true,
 			"requires": {
-				"chokidar": "^3.4.1",
-				"graceful-fs": "^4.1.2",
-				"neo-async": "^2.5.0",
-				"watchpack-chokidar2": "^2.0.0"
+				"chokidar": "2.1.8"
 			},
 			"dependencies": {
-				"anymatch": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-					"integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"normalize-path": "^3.0.0",
-						"picomatch": "^2.0.4"
-					}
-				},
 				"binary-extensions": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz",
-					"integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==",
+					"version": "1.13.1",
+					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
 					"dev": true,
 					"optional": true
 				},
-				"braces": {
-					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-					"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-					"dev": true,
-					"optional": true,
-					"requires": {
-						"fill-range": "^7.0.1"
-					}
-				},
 				"chokidar": {
-					"version": "3.4.2",
-					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-					"integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
+					"version": "2.1.8",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"anymatch": "~3.1.1",
-						"braces": "~3.0.2",
-						"fsevents": "~2.1.2",
-						"glob-parent": "~5.1.0",
-						"is-binary-path": "~2.1.0",
-						"is-glob": "~4.0.1",
-						"normalize-path": "~3.0.0",
-						"readdirp": "~3.4.0"
+						"anymatch": "2.0.0",
+						"async-each": "1.0.3",
+						"braces": "2.3.2",
+						"fsevents": "1.2.13",
+						"glob-parent": "3.1.0",
+						"inherits": "2.0.4",
+						"is-binary-path": "1.0.1",
+						"is-glob": "4.0.1",
+						"normalize-path": "3.0.0",
+						"path-is-absolute": "1.0.1",
+						"readdirp": "2.2.1",
+						"upath": "1.2.0"
 					}
 				},
-				"fill-range": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-					"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+				"fsevents": {
+					"version": "1.2.13",
+					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"to-regex-range": "^5.0.1"
+						"nan": "2.14.1"
 					}
 				},
-				"fsevents": {
-					"version": "2.1.3",
-					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz",
-					"integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==",
-					"dev": true,
-					"optional": true
-				},
-				"glob-parent": {
-					"version": "5.1.1",
-					"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz",
-					"integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==",
+				"is-binary-path": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+					"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"is-glob": "^4.0.1"
+						"binary-extensions": "1.13.1"
 					}
 				},
-				"is-binary-path": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-					"integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+				"readable-stream": {
+					"version": "2.3.7",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"binary-extensions": "^2.0.0"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
-				"is-number": {
-					"version": "7.0.0",
-					"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-					"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-					"dev": true,
-					"optional": true
-				},
 				"readdirp": {
-					"version": "3.4.0",
-					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz",
-					"integrity": "sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ==",
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"picomatch": "^2.2.1"
+						"graceful-fs": "4.2.4",
+						"micromatch": "3.1.10",
+						"readable-stream": "2.3.7"
 					}
 				},
-				"to-regex-range": {
-					"version": "5.0.1",
-					"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-					"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+					"dev": true
+				},
+				"string_decoder": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"optional": true,
 					"requires": {
-						"is-number": "^7.0.0"
+						"safe-buffer": "5.1.2"
 					}
 				}
 			}
 		},
-		"watchpack-chokidar2": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz",
-			"integrity": "sha512-9TyfOyN/zLUbA288wZ8IsMZ+6cbzvsNyEzSBp6e/zkifi6xxbl8SmQ/CxQq32k8NNqrdVEVUVSEf56L4rQ/ZxA==",
-			"dev": true,
-			"optional": true,
-			"requires": {
-				"chokidar": "^2.1.8"
-			}
-		},
 		"wbuf": {
 			"version": "1.7.3",
 			"resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
 			"integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
 			"dev": true,
 			"requires": {
-				"minimalistic-assert": "^1.0.0"
+				"minimalistic-assert": "1.0.1"
 			}
 		},
 		"webidl-conversions": {
@@ -20327,31 +20803,31 @@
 				"@webassemblyjs/helper-module-context": "1.8.5",
 				"@webassemblyjs/wasm-edit": "1.8.5",
 				"@webassemblyjs/wasm-parser": "1.8.5",
-				"acorn": "^6.2.1",
-				"ajv": "^6.10.2",
-				"ajv-keywords": "^3.4.1",
-				"chrome-trace-event": "^1.0.2",
-				"enhanced-resolve": "^4.1.0",
-				"eslint-scope": "^4.0.3",
-				"json-parse-better-errors": "^1.0.2",
-				"loader-runner": "^2.4.0",
-				"loader-utils": "^1.2.3",
-				"memory-fs": "^0.4.1",
-				"micromatch": "^3.1.10",
-				"mkdirp": "^0.5.1",
-				"neo-async": "^2.6.1",
-				"node-libs-browser": "^2.2.1",
-				"schema-utils": "^1.0.0",
-				"tapable": "^1.1.3",
-				"terser-webpack-plugin": "^1.4.3",
-				"watchpack": "^1.6.0",
-				"webpack-sources": "^1.4.1"
+				"acorn": "6.4.2",
+				"ajv": "6.12.3",
+				"ajv-keywords": "3.5.2",
+				"chrome-trace-event": "1.0.2",
+				"enhanced-resolve": "4.5.0",
+				"eslint-scope": "4.0.3",
+				"json-parse-better-errors": "1.0.2",
+				"loader-runner": "2.4.0",
+				"loader-utils": "1.4.0",
+				"memory-fs": "0.4.1",
+				"micromatch": "3.1.10",
+				"mkdirp": "0.5.5",
+				"neo-async": "2.6.2",
+				"node-libs-browser": "2.2.1",
+				"schema-utils": "1.0.0",
+				"tapable": "1.1.3",
+				"terser-webpack-plugin": "1.4.5",
+				"watchpack": "1.7.5",
+				"webpack-sources": "1.4.3"
 			},
 			"dependencies": {
 				"acorn": {
-					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
-					"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
+					"version": "6.4.2",
+					"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz",
+					"integrity": "sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==",
 					"dev": true
 				},
 				"cacache": {
@@ -20360,32 +20836,21 @@
 					"integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
 					"dev": true,
 					"requires": {
-						"bluebird": "^3.5.5",
-						"chownr": "^1.1.1",
-						"figgy-pudding": "^3.5.1",
-						"glob": "^7.1.4",
-						"graceful-fs": "^4.1.15",
-						"infer-owner": "^1.0.3",
-						"lru-cache": "^5.1.1",
-						"mississippi": "^3.0.0",
-						"mkdirp": "^0.5.1",
-						"move-concurrently": "^1.0.1",
-						"promise-inflight": "^1.0.1",
-						"rimraf": "^2.6.3",
-						"ssri": "^6.0.1",
-						"unique-filename": "^1.1.1",
-						"y18n": "^4.0.0"
-					},
-					"dependencies": {
-						"rimraf": {
-							"version": "2.7.1",
-							"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-							"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-							"dev": true,
-							"requires": {
-								"glob": "^7.1.3"
-							}
-						}
+						"bluebird": "3.5.5",
+						"chownr": "1.1.4",
+						"figgy-pudding": "3.5.2",
+						"glob": "7.1.6",
+						"graceful-fs": "4.2.4",
+						"infer-owner": "1.0.4",
+						"lru-cache": "5.1.1",
+						"mississippi": "3.0.0",
+						"mkdirp": "0.5.5",
+						"move-concurrently": "1.0.1",
+						"promise-inflight": "1.0.1",
+						"rimraf": "2.7.1",
+						"ssri": "6.0.1",
+						"unique-filename": "1.1.1",
+						"y18n": "4.0.0"
 					}
 				},
 				"eslint-scope": {
@@ -20394,8 +20859,8 @@
 					"integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
 					"dev": true,
 					"requires": {
-						"esrecurse": "^4.1.0",
-						"estraverse": "^4.1.1"
+						"esrecurse": "4.3.0",
+						"estraverse": "4.3.0"
 					}
 				},
 				"lru-cache": {
@@ -20404,7 +20869,16 @@
 					"integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
 					"dev": true,
 					"requires": {
-						"yallist": "^3.0.2"
+						"yallist": "3.1.1"
+					}
+				},
+				"rimraf": {
+					"version": "2.7.1",
+					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+					"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+					"dev": true,
+					"requires": {
+						"glob": "7.1.6"
 					}
 				},
 				"schema-utils": {
@@ -20413,9 +20887,9 @@
 					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
+						"ajv": "6.12.3",
+						"ajv-errors": "1.0.1",
+						"ajv-keywords": "3.5.2"
 					}
 				},
 				"source-map": {
@@ -20430,7 +20904,7 @@
 					"integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
 					"dev": true,
 					"requires": {
-						"figgy-pudding": "^3.5.1"
+						"figgy-pudding": "3.5.2"
 					}
 				},
 				"terser-webpack-plugin": {
@@ -20439,15 +20913,15 @@
 					"integrity": "sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==",
 					"dev": true,
 					"requires": {
-						"cacache": "^12.0.2",
-						"find-cache-dir": "^2.1.0",
-						"is-wsl": "^1.1.0",
-						"schema-utils": "^1.0.0",
-						"serialize-javascript": "^4.0.0",
-						"source-map": "^0.6.1",
-						"terser": "^4.1.2",
-						"webpack-sources": "^1.4.0",
-						"worker-farm": "^1.7.0"
+						"cacache": "12.0.4",
+						"find-cache-dir": "2.1.0",
+						"is-wsl": "1.1.0",
+						"schema-utils": "1.0.0",
+						"serialize-javascript": "4.0.0",
+						"source-map": "0.6.1",
+						"terser": "4.8.0",
+						"webpack-sources": "1.4.3",
+						"worker-farm": "1.7.0"
 					}
 				},
 				"yallist": {
@@ -20459,24 +20933,16 @@
 			}
 		},
 		"webpack-dev-middleware": {
-			"version": "3.7.2",
-			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
-			"integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+			"version": "3.7.3",
+			"resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.3.tgz",
+			"integrity": "sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==",
 			"dev": true,
 			"requires": {
-				"memory-fs": "^0.4.1",
-				"mime": "^2.4.4",
-				"mkdirp": "^0.5.1",
-				"range-parser": "^1.2.1",
-				"webpack-log": "^2.0.0"
-			},
-			"dependencies": {
-				"mime": {
-					"version": "2.4.6",
-					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.6.tgz",
-					"integrity": "sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==",
-					"dev": true
-				}
+				"memory-fs": "0.4.1",
+				"mime": "2.5.2",
+				"mkdirp": "0.5.5",
+				"range-parser": "1.2.1",
+				"webpack-log": "2.0.0"
 			}
 		},
 		"webpack-dev-server": {
@@ -20486,85 +20952,83 @@
 			"dev": true,
 			"requires": {
 				"ansi-html": "0.0.7",
-				"bonjour": "^3.5.0",
-				"chokidar": "^2.1.8",
-				"compression": "^1.7.4",
-				"connect-history-api-fallback": "^1.6.0",
-				"debug": "^4.1.1",
-				"del": "^4.1.1",
-				"express": "^4.17.1",
-				"html-entities": "^1.3.1",
+				"bonjour": "3.5.0",
+				"chokidar": "2.1.8",
+				"compression": "1.7.4",
+				"connect-history-api-fallback": "1.6.0",
+				"debug": "4.3.1",
+				"del": "4.1.1",
+				"express": "4.17.1",
+				"html-entities": "1.4.0",
 				"http-proxy-middleware": "0.19.1",
-				"import-local": "^2.0.0",
-				"internal-ip": "^4.3.0",
-				"ip": "^1.1.5",
-				"is-absolute-url": "^3.0.3",
-				"killable": "^1.0.1",
-				"loglevel": "^1.6.8",
-				"opn": "^5.5.0",
-				"p-retry": "^3.0.1",
-				"portfinder": "^1.0.26",
-				"schema-utils": "^1.0.0",
-				"selfsigned": "^1.10.7",
-				"semver": "^6.3.0",
-				"serve-index": "^1.9.1",
+				"import-local": "2.0.0",
+				"internal-ip": "4.3.0",
+				"ip": "1.1.5",
+				"is-absolute-url": "3.0.3",
+				"killable": "1.0.1",
+				"loglevel": "1.7.1",
+				"opn": "5.5.0",
+				"p-retry": "3.0.1",
+				"portfinder": "1.0.28",
+				"schema-utils": "1.0.0",
+				"selfsigned": "1.10.8",
+				"semver": "6.3.0",
+				"serve-index": "1.9.1",
 				"sockjs": "0.3.20",
 				"sockjs-client": "1.4.0",
-				"spdy": "^4.0.2",
-				"strip-ansi": "^3.0.1",
-				"supports-color": "^6.1.0",
-				"url": "^0.11.0",
-				"webpack-dev-middleware": "^3.7.2",
-				"webpack-log": "^2.0.0",
-				"ws": "^6.2.1",
-				"yargs": "^13.3.2"
+				"spdy": "4.0.2",
+				"strip-ansi": "3.0.1",
+				"supports-color": "6.1.0",
+				"url": "0.11.0",
+				"webpack-dev-middleware": "3.7.3",
+				"webpack-log": "2.0.0",
+				"ws": "6.2.1",
+				"yargs": "13.3.2"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+				"binary-extensions": {
+					"version": "1.13.1",
+					"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+					"integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+					"dev": true
+				},
+				"chokidar": {
+					"version": "2.1.8",
+					"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+					"integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"anymatch": "2.0.0",
+						"async-each": "1.0.3",
+						"braces": "2.3.2",
+						"fsevents": "1.2.13",
+						"glob-parent": "3.1.0",
+						"inherits": "2.0.4",
+						"is-binary-path": "1.0.1",
+						"is-glob": "4.0.1",
+						"normalize-path": "3.0.0",
+						"path-is-absolute": "1.0.1",
+						"readdirp": "2.2.1",
+						"upath": "1.2.0"
 					}
 				},
-				"del": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-					"integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+				"debug": {
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"@types/glob": "^7.1.1",
-						"globby": "^6.1.0",
-						"is-path-cwd": "^2.0.0",
-						"is-path-in-cwd": "^2.0.0",
-						"p-map": "^2.0.0",
-						"pify": "^4.0.1",
-						"rimraf": "^2.6.3"
-					},
-					"dependencies": {
-						"rimraf": {
-							"version": "2.7.1",
-							"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-							"integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-							"dev": true,
-							"requires": {
-								"glob": "^7.1.3"
-							}
-						}
+						"ms": "2.1.2"
 					}
 				},
-				"http-proxy-middleware": {
-					"version": "0.19.1",
-					"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
-					"integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+				"fsevents": {
+					"version": "1.2.13",
+					"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
+					"integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
 					"dev": true,
+					"optional": true,
 					"requires": {
-						"http-proxy": "^1.17.0",
-						"is-glob": "^4.0.0",
-						"lodash": "^4.17.11",
-						"micromatch": "^3.1.10"
+						"nan": "2.14.1"
 					}
 				},
 				"is-absolute-url": {
@@ -20573,40 +21037,45 @@
 					"integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
 					"dev": true
 				},
-				"is-path-cwd": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-					"integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-					"dev": true
-				},
-				"is-path-in-cwd": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-					"integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+				"is-binary-path": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+					"integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
 					"dev": true,
 					"requires": {
-						"is-path-inside": "^2.1.0"
+						"binary-extensions": "1.13.1"
 					}
 				},
-				"is-path-inside": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-					"integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+				"readable-stream": {
+					"version": "2.3.7",
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
+					"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
 					"dev": true,
 					"requires": {
-						"path-is-inside": "^1.0.2"
+						"core-util-is": "1.0.2",
+						"inherits": "2.0.4",
+						"isarray": "1.0.0",
+						"process-nextick-args": "2.0.1",
+						"safe-buffer": "5.1.2",
+						"string_decoder": "1.1.1",
+						"util-deprecate": "1.0.2"
 					}
 				},
-				"p-map": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-					"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-					"dev": true
+				"readdirp": {
+					"version": "2.2.1",
+					"resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+					"integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "4.2.4",
+						"micromatch": "3.1.10",
+						"readable-stream": "2.3.7"
+					}
 				},
-				"pify": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-					"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+				"safe-buffer": {
+					"version": "5.1.2",
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"dev": true
 				},
 				"schema-utils": {
@@ -20615,9 +21084,9 @@
 					"integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
 					"dev": true,
 					"requires": {
-						"ajv": "^6.1.0",
-						"ajv-errors": "^1.0.0",
-						"ajv-keywords": "^3.1.0"
+						"ajv": "6.12.3",
+						"ajv-errors": "1.0.1",
+						"ajv-keywords": "3.5.2"
 					}
 				},
 				"semver": {
@@ -20626,13 +21095,22 @@
 					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
 					"dev": true
 				},
+				"string_decoder": {
+					"version": "1.1.1",
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+					"dev": true,
+					"requires": {
+						"safe-buffer": "5.1.2"
+					}
+				},
 				"supports-color": {
 					"version": "6.1.0",
 					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
 					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "3.0.0"
 					}
 				},
 				"ws": {
@@ -20641,7 +21119,7 @@
 					"integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
 					"dev": true,
 					"requires": {
-						"async-limiter": "~1.0.0"
+						"async-limiter": "1.0.1"
 					}
 				}
 			}
@@ -20652,8 +21130,8 @@
 			"integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
 			"dev": true,
 			"requires": {
-				"ansi-colors": "^3.0.0",
-				"uuid": "^3.3.2"
+				"ansi-colors": "3.2.4",
+				"uuid": "3.4.0"
 			}
 		},
 		"webpack-manifest-plugin": {
@@ -20662,10 +21140,10 @@
 			"integrity": "sha512-9S6YyKKKh/Oz/eryM1RyLVDVmy3NSPV0JXMRhZ18fJsq+AwGxUY34X54VNwkzYcEmEkDwNxuEOboCZEebJXBAQ==",
 			"dev": true,
 			"requires": {
-				"fs-extra": "^7.0.0",
-				"lodash": ">=3.5 <5",
-				"object.entries": "^1.1.0",
-				"tapable": "^1.0.0"
+				"fs-extra": "7.0.1",
+				"lodash": "4.17.19",
+				"object.entries": "1.1.2",
+				"tapable": "1.1.3"
 			},
 			"dependencies": {
 				"fs-extra": {
@@ -20674,9 +21152,9 @@
 					"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
+						"graceful-fs": "4.2.4",
+						"jsonfile": "4.0.0",
+						"universalify": "0.1.2"
 					}
 				}
 			}
@@ -20687,8 +21165,8 @@
 			"integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
 			"dev": true,
 			"requires": {
-				"source-list-map": "^2.0.0",
-				"source-map": "~0.6.1"
+				"source-list-map": "2.0.1",
+				"source-map": "0.6.1"
 			},
 			"dependencies": {
 				"source-map": {
@@ -20705,7 +21183,7 @@
 			"integrity": "sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY=",
 			"dev": true,
 			"requires": {
-				"websocket-extensions": ">=0.1.1"
+				"websocket-extensions": "0.1.4"
 			}
 		},
 		"websocket-extensions": {
@@ -20734,12 +21212,36 @@
 			"integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
 			"dev": true
 		},
+		"whatwg-url": {
+			"version": "6.5.0",
+			"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.5.0.tgz",
+			"integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==",
+			"dev": true,
+			"requires": {
+				"lodash.sortby": "4.7.0",
+				"tr46": "1.0.1",
+				"webidl-conversions": "4.0.2"
+			}
+		},
 		"which": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
 			"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
 			"requires": {
-				"isexe": "^2.0.0"
+				"isexe": "2.0.0"
+			}
+		},
+		"which-boxed-primitive": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+			"integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
+			"dev": true,
+			"requires": {
+				"is-bigint": "1.0.1",
+				"is-boolean-object": "1.1.0",
+				"is-number-object": "1.0.4",
+				"is-string": "1.0.5",
+				"is-symbol": "1.0.3"
 			}
 		},
 		"which-module": {
@@ -20760,7 +21262,7 @@
 			"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 			"dev": true,
 			"requires": {
-				"string-width": "^1.0.2 || 2"
+				"string-width": "1.0.2"
 			}
 		},
 		"winston": {
@@ -20769,13 +21271,13 @@
 			"integrity": "sha1-ZLar9M0Brcrv1QCTk7HY6L7BnbA=",
 			"dev": true,
 			"requires": {
-				"async": "0.2.x",
-				"colors": "0.6.x",
-				"cycle": "1.0.x",
-				"eyes": "0.1.x",
-				"isstream": "0.1.x",
-				"pkginfo": "0.3.x",
-				"stack-trace": "0.0.x"
+				"async": "0.2.10",
+				"colors": "0.6.2",
+				"cycle": "1.0.3",
+				"eyes": "0.1.8",
+				"isstream": "0.1.2",
+				"pkginfo": "0.3.1",
+				"stack-trace": "0.0.10"
 			},
 			"dependencies": {
 				"async": {
@@ -20810,7 +21312,7 @@
 			"integrity": "sha512-1uFkvU8JXi7L7fCHVBEEnc3asPpiAL33kO495UMcD5+arew9IbKW2rV5lpzhoWcm/qhGB89YfO4PmB/0hQwPRg==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-broadcast-update": {
@@ -20819,7 +21321,7 @@
 			"integrity": "sha512-MTSfgzIljpKLTBPROo4IpKjESD86pPFlZwlvVG32Kb70hW+aob4Jxpblud8EhNb1/L5m43DUM4q7C+W6eQMMbA==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-build": {
@@ -20828,29 +21330,29 @@
 			"integrity": "sha512-UHdwrN3FrDvicM3AqJS/J07X0KXj67R8Cg0waq1MKEOqzo89ap6zh6LmaLnRAjpB+bDIz+7OlPye9iii9KBnxw==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.3.4",
-				"@hapi/joi": "^15.0.0",
-				"common-tags": "^1.8.0",
-				"fs-extra": "^4.0.2",
-				"glob": "^7.1.3",
-				"lodash.template": "^4.4.0",
-				"pretty-bytes": "^5.1.0",
-				"stringify-object": "^3.3.0",
-				"strip-comments": "^1.0.2",
-				"workbox-background-sync": "^4.3.1",
-				"workbox-broadcast-update": "^4.3.1",
-				"workbox-cacheable-response": "^4.3.1",
-				"workbox-core": "^4.3.1",
-				"workbox-expiration": "^4.3.1",
-				"workbox-google-analytics": "^4.3.1",
-				"workbox-navigation-preload": "^4.3.1",
-				"workbox-precaching": "^4.3.1",
-				"workbox-range-requests": "^4.3.1",
-				"workbox-routing": "^4.3.1",
-				"workbox-strategies": "^4.3.1",
-				"workbox-streams": "^4.3.1",
-				"workbox-sw": "^4.3.1",
-				"workbox-window": "^4.3.1"
+				"@babel/runtime": "7.10.4",
+				"@hapi/joi": "15.1.1",
+				"common-tags": "1.8.0",
+				"fs-extra": "4.0.3",
+				"glob": "7.1.6",
+				"lodash.template": "4.5.0",
+				"pretty-bytes": "5.6.0",
+				"stringify-object": "3.3.0",
+				"strip-comments": "1.0.2",
+				"workbox-background-sync": "4.3.1",
+				"workbox-broadcast-update": "4.3.1",
+				"workbox-cacheable-response": "4.3.1",
+				"workbox-core": "4.3.1",
+				"workbox-expiration": "4.3.1",
+				"workbox-google-analytics": "4.3.1",
+				"workbox-navigation-preload": "4.3.1",
+				"workbox-precaching": "4.3.1",
+				"workbox-range-requests": "4.3.1",
+				"workbox-routing": "4.3.1",
+				"workbox-strategies": "4.3.1",
+				"workbox-streams": "4.3.1",
+				"workbox-sw": "4.3.1",
+				"workbox-window": "4.3.1"
 			},
 			"dependencies": {
 				"fs-extra": {
@@ -20859,9 +21361,9 @@
 					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
+						"graceful-fs": "4.2.4",
+						"jsonfile": "4.0.0",
+						"universalify": "0.1.2"
 					}
 				}
 			}
@@ -20872,7 +21374,7 @@
 			"integrity": "sha512-Rp5qlzm6z8IOvnQNkCdO9qrDgDpoPNguovs0H8C+wswLuPgSzSp9p2afb5maUt9R1uTIwOXrVQMmPfPypv+npw==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-core": {
@@ -20887,7 +21389,7 @@
 			"integrity": "sha512-vsJLhgQsQouv9m0rpbXubT5jw0jMQdjpkum0uT+d9tTwhXcEZks7qLfQ9dGSaufTD2eimxbUOJfWLbNQpIDMPw==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-google-analytics": {
@@ -20896,10 +21398,10 @@
 			"integrity": "sha512-xzCjAoKuOb55CBSwQrbyWBKqp35yg1vw9ohIlU2wTy06ZrYfJ8rKochb1MSGlnoBfXGWss3UPzxR5QL5guIFdg==",
 			"dev": true,
 			"requires": {
-				"workbox-background-sync": "^4.3.1",
-				"workbox-core": "^4.3.1",
-				"workbox-routing": "^4.3.1",
-				"workbox-strategies": "^4.3.1"
+				"workbox-background-sync": "4.3.1",
+				"workbox-core": "4.3.1",
+				"workbox-routing": "4.3.1",
+				"workbox-strategies": "4.3.1"
 			}
 		},
 		"workbox-navigation-preload": {
@@ -20908,7 +21410,7 @@
 			"integrity": "sha512-K076n3oFHYp16/C+F8CwrRqD25GitA6Rkd6+qAmLmMv1QHPI2jfDwYqrytOfKfYq42bYtW8Pr21ejZX7GvALOw==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-precaching": {
@@ -20917,7 +21419,7 @@
 			"integrity": "sha512-piSg/2csPoIi/vPpp48t1q5JLYjMkmg5gsXBQkh/QYapCdVwwmKlU9mHdmy52KsDGIjVaqEUMFvEzn2LRaigqQ==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-range-requests": {
@@ -20926,7 +21428,7 @@
 			"integrity": "sha512-S+HhL9+iTFypJZ/yQSl/x2Bf5pWnbXdd3j57xnb0V60FW1LVn9LRZkPtneODklzYuFZv7qK6riZ5BNyc0R0jZA==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-routing": {
@@ -20935,7 +21437,7 @@
 			"integrity": "sha512-FkbtrODA4Imsi0p7TW9u9MXuQ5P4pVs1sWHK4dJMMChVROsbEltuE79fBoIk/BCztvOJ7yUpErMKa4z3uQLX+g==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-strategies": {
@@ -20944,7 +21446,7 @@
 			"integrity": "sha512-F/+E57BmVG8dX6dCCopBlkDvvhg/zj6VDs0PigYwSN23L8hseSRwljrceU2WzTvk/+BSYICsWmRq5qHS2UYzhw==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-streams": {
@@ -20953,7 +21455,7 @@
 			"integrity": "sha512-4Kisis1f/y0ihf4l3u/+ndMkJkIT4/6UOacU3A4BwZSAC9pQ9vSvJpIi/WFGQRH/uPXvuVjF5c2RfIPQFSS2uA==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"workbox-sw": {
@@ -20968,9 +21470,9 @@
 			"integrity": "sha512-gJ9jd8Mb8wHLbRz9ZvGN57IAmknOipD3W4XNE/Lk/4lqs5Htw4WOQgakQy/o/4CoXQlMCYldaqUg+EJ35l9MEQ==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime": "^7.0.0",
-				"json-stable-stringify": "^1.0.1",
-				"workbox-build": "^4.3.1"
+				"@babel/runtime": "7.10.4",
+				"json-stable-stringify": "1.0.1",
+				"workbox-build": "4.3.1"
 			}
 		},
 		"workbox-window": {
@@ -20979,7 +21481,7 @@
 			"integrity": "sha512-C5gWKh6I58w3GeSc0wp2Ne+rqVw8qwcmZnQGpjiek8A2wpbxSJb1FdCoQVO+jDJs35bFgo/WETgl1fqgsxN0Hg==",
 			"dev": true,
 			"requires": {
-				"workbox-core": "^4.3.1"
+				"workbox-core": "4.3.1"
 			}
 		},
 		"worker-farm": {
@@ -20988,7 +21490,7 @@
 			"integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
 			"dev": true,
 			"requires": {
-				"errno": "~0.1.7"
+				"errno": "0.1.8"
 			}
 		},
 		"worker-rpc": {
@@ -20997,7 +21499,7 @@
 			"integrity": "sha512-P1WjMrUB3qgJNI9jfmpZ/htmBEjFh//6l/5y8SD9hg1Ef5zTTVVoRjTrTEzPrNBQvmhMxkoTsjOXN10GWU7aCg==",
 			"dev": true,
 			"requires": {
-				"microevent.ts": "~0.1.1"
+				"microevent.ts": "0.1.1"
 			}
 		},
 		"wrap-ansi": {
@@ -21006,9 +21508,9 @@
 			"integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
 			"dev": true,
 			"requires": {
-				"ansi-styles": "^4.0.0",
-				"string-width": "^4.1.0",
-				"strip-ansi": "^6.0.0"
+				"ansi-styles": "4.3.0",
+				"string-width": "4.2.0",
+				"strip-ansi": "6.0.0"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -21023,7 +21525,7 @@
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^2.0.1"
+						"color-convert": "2.0.1"
 					}
 				},
 				"color-convert": {
@@ -21032,7 +21534,7 @@
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.4"
 					}
 				},
 				"color-name": {
@@ -21059,9 +21561,9 @@
 					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^8.0.0",
-						"is-fullwidth-code-point": "^3.0.0",
-						"strip-ansi": "^6.0.0"
+						"emoji-regex": "8.0.0",
+						"is-fullwidth-code-point": "3.0.0",
+						"strip-ansi": "6.0.0"
 					}
 				},
 				"strip-ansi": {
@@ -21070,7 +21572,7 @@
 					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^5.0.0"
+						"ansi-regex": "5.0.0"
 					}
 				}
 			}
@@ -21086,7 +21588,7 @@
 			"integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
 			"dev": true,
 			"requires": {
-				"mkdirp": "^0.5.1"
+				"mkdirp": "0.5.5"
 			}
 		},
 		"write-file-atomic": {
@@ -21095,18 +21597,18 @@
 			"integrity": "sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.1.11",
-				"imurmurhash": "^0.1.4",
-				"signal-exit": "^3.0.2"
+				"graceful-fs": "4.2.4",
+				"imurmurhash": "0.1.4",
+				"signal-exit": "3.0.3"
 			}
 		},
 		"ws": {
-			"version": "6.1.4",
-			"resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
-			"integrity": "sha512-eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==",
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz",
+			"integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==",
 			"dev": true,
 			"requires": {
-				"async-limiter": "~1.0.0"
+				"async-limiter": "1.0.1"
 			}
 		},
 		"ws-heartbeat": {
@@ -21114,7 +21616,7 @@
 			"resolved": "https://registry.npmjs.org/ws-heartbeat/-/ws-heartbeat-1.2.0.tgz",
 			"integrity": "sha512-HlN5j2LEFU5O3onX/poHEEwOduF4QYPWrY956CYe+nJQP4tU7aAM+8KciNFlZ1wDEX1/ZnLFP3QNMqnTgMmBkw==",
 			"requires": {
-				"ws": "7"
+				"ws": "7.4.1"
 			},
 			"dependencies": {
 				"ws": {
@@ -21124,6 +21626,12 @@
 				}
 			}
 		},
+		"xml-name-validator": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+			"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+			"dev": true
+		},
 		"xmlchars": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
@@ -21131,12 +21639,12 @@
 			"dev": true
 		},
 		"xregexp": {
-			"version": "4.3.0",
-			"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz",
-			"integrity": "sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g==",
+			"version": "4.4.1",
+			"resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.4.1.tgz",
+			"integrity": "sha512-2u9HwfadaJaY9zHtRRnH6BY6CQVNQKkYm3oLtC9gJXXzfsbACg5X5e4EZZGVAH+YIfa+QA9lsFQTTe3HURF3ag==",
 			"dev": true,
 			"requires": {
-				"@babel/runtime-corejs3": "^7.8.3"
+				"@babel/runtime-corejs3": "7.13.10"
 			}
 		},
 		"xtend": {
@@ -21169,16 +21677,16 @@
 			"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
 			"dev": true,
 			"requires": {
-				"cliui": "^5.0.0",
-				"find-up": "^3.0.0",
-				"get-caller-file": "^2.0.1",
-				"require-directory": "^2.1.1",
-				"require-main-filename": "^2.0.0",
-				"set-blocking": "^2.0.0",
-				"string-width": "^3.0.0",
-				"which-module": "^2.0.0",
-				"y18n": "^4.0.0",
-				"yargs-parser": "^13.1.2"
+				"cliui": "5.0.0",
+				"find-up": "3.0.0",
+				"get-caller-file": "2.0.5",
+				"require-directory": "2.1.1",
+				"require-main-filename": "2.0.0",
+				"set-blocking": "2.0.0",
+				"string-width": "3.1.0",
+				"which-module": "2.0.0",
+				"y18n": "4.0.0",
+				"yargs-parser": "13.1.2"
 			},
 			"dependencies": {
 				"ansi-regex": {
@@ -21199,9 +21707,9 @@
 					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
 					"dev": true,
 					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
+						"emoji-regex": "7.0.3",
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "5.2.0"
 					}
 				},
 				"strip-ansi": {
@@ -21210,7 +21718,7 @@
 					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
 					"dev": true,
 					"requires": {
-						"ansi-regex": "^4.1.0"
+						"ansi-regex": "4.1.0"
 					}
 				}
 			}
@@ -21221,8 +21729,8 @@
 			"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
 			"dev": true,
 			"requires": {
-				"camelcase": "^5.0.0",
-				"decamelize": "^1.2.0"
+				"camelcase": "5.3.1",
+				"decamelize": "1.2.0"
 			},
 			"dependencies": {
 				"camelcase": {
@@ -21238,7 +21746,7 @@
 			"resolved": "https://registry.npmjs.org/zscroller/-/zscroller-0.4.8.tgz",
 			"integrity": "sha512-G5NiNLKx2+QhhvZi2yV1jjVXY50otktxkseX2hG2N/eixohOUk0AY8ZpbAxNqS9oJS/NxItCsowupy2tsXxAMw==",
 			"requires": {
-				"babel-runtime": "6.x"
+				"babel-runtime": "6.26.0"
 			}
 		}
 	}
diff --git a/web/package.json b/web/package.json
index 094ff8b235..35427f3d81 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,20 +1,22 @@
 {
 	"name": "hollaex-kit",
-	"version": "2.0.14",
+	"version": "2.1.0",
 	"private": true,
 	"dependencies": {
 		"@ant-design/compatible": "1.0.5",
 		"@ant-design/icons": "4.2.2",
 		"@material/button": "0.7.0",
+		"@paciolan/remote-component": "2.11.0",
 		"antd": "4.6.2",
 		"antd-mobile": "2.2.3",
+		"array-move": "3.0.1",
 		"awesome-phonenumber": "2.43.0",
 		"axios": "0.21.1",
-		"babel-polyfill": "6.26.0",
 		"bchaddrjs": "0.3.2",
 		"bluebird": "3.5.5",
 		"classnames": "2.2.6",
 		"color": "3.1.3",
+		"core-js": "3.6.5",
 		"country-data": "0.0.31",
 		"d3-axis": "1.0.12",
 		"d3-scale": "2.2.2",
@@ -77,6 +79,7 @@
 		"redux-persist": "4.10.2",
 		"redux-promise-middleware": "6.1.0",
 		"redux-thunk": "2.3.0",
+		"regenerator-runtime": "0.13.7",
 		"reselect": "4.0.0",
 		"rsvp": "4.8.5",
 		"universal-cookie": "4.0.2",
diff --git a/web/public/assets/acounts/paperclip-attach-01.svg b/web/public/assets/acounts/paperclip-attach-01.svg
new file mode 100644
index 0000000000..dc56c5dca4
--- /dev/null
+++ b/web/public/assets/acounts/paperclip-attach-01.svg
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 50 50" overflow="visible" xml:space="preserve">
+<g id="Icon_1_">
+	<g>
+		<path fill="#FFFFFF" d="M43.5,22.7L24.6,40.1c-3.8,3.5-10,3.5-13.8,0c-3.8-3.5-3.8-9.2,0-12.7L30.6,9.2C33,7,36.8,7,39.2,9.2
+			c2.4,2.2,2.4,5.7,0,7.9L19.4,35.3c-0.9,0.9-2.5,0.9-3.4,0C15,34.5,15,33,16,32.2l16.4-15l-2.6-2.4l-16.4,15
+			c-2.4,2.2-2.4,5.7,0,7.9c2.4,2.2,6.2,2.2,8.6,0l19.8-18.2c3.8-3.5,3.8-9.2,0-12.7c-3.8-3.5-10-3.5-13.8,0L8.2,25
+			C3,29.9,3,37.6,8.2,42.4s13.7,4.8,18.9,0L46.1,25L43.5,22.7z"/>
+	</g>
+</g>
+</svg>
diff --git a/web/public/assets/acounts/unknown-error-icon-01.svg b/web/public/assets/acounts/unknown-error-icon-01.svg
new file mode 100644
index 0000000000..f0e1964281
--- /dev/null
+++ b/web/public/assets/acounts/unknown-error-icon-01.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 170 170" overflow="visible" xml:space="preserve">
+<g>
+	<g id="XMLID_1_">
+		<g id="XMLID_10_">
+			<path class="unknown-error-icon" id="XMLID_19_" fill="#FFFFFF" d="M90.8,89.7c0.2-1,0.3-2.1,0.2-3.1c-0.1-1.6-0.4-3.3-0.9-4.9c-0.7-2.1-1.9-4.2-3.4-6.1
+				c-2.3-3-5.5-5.8-9.4-7.9c-1.7-0.9-3.7-0.4-4.7,1.2c-0.1,0.1-0.1,0.2-0.2,0.3c-0.6,1.2-0.5,2.5,0.1,3.6c0.3,0.5,0.8,1,1.4,1.3
+				c3.5,1.9,6.3,4.4,8,7.1c1.5,2.4,2.2,4.9,1.8,7.2c-0.4,2,1,3.9,2.9,4.2c0.2,0,0.4,0.1,0.6,0.1C89,92.7,90.5,91.4,90.8,89.7z"/>
+			<path class="unknown-error-icon" id="XMLID_15_" fill="#FFFFFF" d="M12.1,115.8c-1.4,1.5-1.3,3.8,0.2,5.1l4.1,3.8c0.7,0.6,1.6,1,2.5,1c1,0,1.9-0.4,2.7-1.2
+				c1.2-1.3,1.3-3.3,0.2-4.7l5.5-6.2c6.7,4.5,14.4,8.5,22.6,11.8c5.8,2.3,11.6,4.2,17.3,5.7l-1.4,7.7c-1.8,0-3.3,1.3-3.5,3.1
+				c-0.3,2,1.1,3.8,3.1,4.1l5.6,0.8c0.2,0,0.4,0,0.5,0c1.8,0,3.3-1.3,3.6-3.1c0.2-1.6-0.7-3.1-2.1-3.8l1.3-7.3
+				c5.9,1.1,11.7,1.7,17,1.7c15.3,0,25.6-4.7,29.1-13.3c3.3-8.1-0.2-18-9.9-28.1c-2.4-2.5-5.2-5-8.3-7.4
+				c-1.6-12.2-10.6-23.9-24.2-29.4c-5.1-2.1-10.5-3.1-15.8-3.1c-8.4,0-16.1,2.7-22,7.3c-3-0.3-5.9-0.5-8.7-0.5
+				c-15.3,0-25.6,4.7-29.1,13.3c-3.3,8.1,0.2,18,9.9,28.1c2.7,2.8,5.7,5.5,9.1,8.1l-4.9,5.6C15,114.3,13.2,114.5,12.1,115.8z
+				 M52.5,118.7c-14.4-5.9-26.9-13.8-35.1-22.4C9.9,88.5,6.9,81.1,9,75.9c2.3-5.6,10.4-8.8,22.4-8.8c0.8,0,1.6,0,2.4,0.1
+				c-1.1,1.6-2,3.3-2.7,5.1c-3.8,9.3,8.7,23.1,27.8,30.9c7.9,3.2,16.4,5,23.8,5c9.3,0,15.7-2.8,17.7-7.7c0.7-1.8,1.2-3.7,1.6-5.6
+				c1.1,1,2.2,2.1,3.3,3.2c7.4,7.8,10.5,15.2,8.4,20.4c-2.3,5.6-10.4,8.8-22.4,8.8C79.7,127.2,66,124.2,52.5,118.7z M94.6,84.6
+				c0.3,1.6,0.5,3.2,0.5,4.8c0,2.8-0.5,5.6-1.5,8.3c-0.5,1.3-3.9,3.2-11,3.2c-6.5,0-13.9-1.6-21-4.5c-17.1-6.9-25.2-18-23.8-21.5
+				c1.1-2.6,2.7-5,4.7-7c1.1-1.1,2.4-2.2,3.8-3.1c1.6-1.1,3.4-1.9,5.2-2.7c3.3-1.2,6.9-1.9,10.7-1.9c4.4,0,8.8,0.9,13.1,2.6
+				c8.2,3.3,14.3,9.3,17.5,16.1C93.6,80.9,94.2,82.7,94.6,84.6z"/>
+			
+				<ellipse class="unknown-error-icon" id="XMLID_14_" transform="matrix(5.309943e-02 -0.9986 0.9986 5.309943e-02 -17.2234 210.2498)" fill="#FFFFFF" cx="102.3" cy="114.2" rx="3.6" ry="3.7"/>
+			
+				<ellipse class="unknown-error-icon" id="XMLID_13_" transform="matrix(5.309943e-02 -0.9986 0.9986 5.309943e-02 -57.221 91.9193)" fill="#FFFFFF" cx="19.9" cy="76.1" rx="3.6" ry="3.7"/>
+			
+				<ellipse class="unknown-error-icon" id="XMLID_12_" transform="matrix(5.309943e-02 -0.9986 0.9986 5.309943e-02 -49.2616 178.0342)" fill="#FFFFFF" cx="69.2" cy="115" rx="3.6" ry="3.7"/>
+			
+				<ellipse class="unknown-error-icon" id="XMLID_11_" transform="matrix(5.309943e-02 -0.9986 0.9986 5.309943e-02 -65.8937 129.2512)" fill="#FFFFFF" cx="35.2" cy="99.4" rx="3.6" ry="3.7"/>
+		</g>
+	</g>
+	<g>
+		<path class="unknown-error-icon" fill="#FFFFFF" d="M124.9,23.1c-21.7,0-39.7,15.7-43.4,36.3c10.1,6.2,16.6,16,18,26.2c3.1,2.4,5.8,4.9,8.3,7.4
+			c5.8,6.1,9.4,12.1,10.6,17.7c2.1,0.3,4.3,0.5,6.5,0.5c24.3,0,44.1-19.7,44.1-44.1S149.2,23.1,124.9,23.1z M124.1,94.2h-4.4v-8h4.4
+			V94.2z M139.9,59.9c-0.6,1.4-1.3,2.5-2.3,3.5c-0.9,1-2,1.9-3.2,2.6c-1.2,0.7-2.4,1.4-3.7,2.1c-0.9,0.5-1.7,1-2.5,1.5
+			c-0.8,0.5-1.5,1.2-2.2,2c-0.6,0.8-1.2,1.8-1.5,3c-0.4,1.2-0.6,2.7-0.6,4.5h-4.3c0-3.3,0.5-5.9,1.5-7.8c1-1.9,2.6-3.6,4.8-4.8
+			c1-0.6,2.1-1.2,3.3-1.8c1.2-0.6,2.3-1.4,3.4-2.3c1-0.9,1.9-2,2.6-3.2c0.7-1.2,1.1-2.8,1.1-4.6c0-1.6-0.3-3.1-0.9-4.2
+			c-0.6-1.2-1.3-2.2-2.3-3c-0.9-0.8-2-1.4-3.2-1.8c-1.2-0.4-2.5-0.6-3.8-0.6c-2.7,0-5.1,0.7-7.2,2.2c-2.1,1.5-3.7,3.3-4.8,5.4
+			l-3.5-2.2c0.7-1.5,1.6-2.9,2.7-4.1c1.1-1.2,2.3-2.2,3.7-3c1.4-0.8,2.8-1.4,4.4-1.9c1.6-0.4,3.2-0.6,4.8-0.6c1.8,0,3.6,0.3,5.4,0.9
+			c1.7,0.6,3.3,1.5,4.7,2.6c1.4,1.2,2.5,2.7,3.3,4.5c0.8,1.8,1.2,3.9,1.2,6.3C140.8,56.9,140.5,58.6,139.9,59.9z"/>
+	</g>
+</g>
+</svg>
diff --git a/web/public/assets/icons/ada-icon.svg b/web/public/assets/icons/ada-icon.svg
deleted file mode 100644
index d5d588db85..0000000000
--- a/web/public/assets/icons/ada-icon.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z" class="ada-icon"/>
-		</g>
-	</g>
-</g>
-<g>
-	<path d="M38.2,15.7c0.9-0.5,2.1,0.7,1.6,1.6c-0.3,0.8-1.4,1-2,0.4C37.2,17.2,37.4,16,38.2,15.7 M28,16.8
-		c0.6-0.2,1.3,0.3,1.2,0.9c0.1,0.7-0.8,1.2-1.4,0.9C27.1,18.3,27.2,17.1,28,16.8 M48.9,18.6c-0.9-0.1-1-1.5-0.2-1.8
-		c0.7-0.3,1.3,0.3,1.4,0.9C50,18.3,49.5,18.8,48.9,18.6 M30.3,21.2c1-0.6,2.3,0.3,2.2,1.4c-0.1,1.1-1.6,1.8-2.4,1
-		C29.3,23,29.4,21.6,30.3,21.2 M45,21.8c0.4-1.1,2.2-1.1,2.7-0.1c0.5,0.8-0.1,1.9-1,2.2C45.6,24.1,44.5,22.9,45,21.8 M37,23.9
-		c0-1,0.9-1.7,1.8-1.7c0.6,0.1,1.3,0.4,1.5,1c0.5,0.8,0.1,2-0.8,2.4c-0.4,0.2-0.9,0.1-1.3,0.1C37.5,25.3,36.9,24.6,37,23.9
-		 M21.8,25.3c0.9-0.5,2.1,0.4,1.7,1.4c-0.2,0.8-1.3,1.2-1.9,0.6C20.9,26.8,21,25.6,21.8,25.3 M54.4,25.3c0.7-0.6,2,0.1,1.9,1
-		c0.1,0.9-1,1.5-1.8,1.1C53.7,27,53.6,25.7,54.4,25.3 M41.3,27c1.2-0.4,2.7,0.1,3.4,1.2c0.9,1.3,0.4,3.4-1,4.2
-		c-1.5,0.9-3.7,0.1-4.2-1.5C38.8,29.3,39.7,27.4,41.3,27 M34,27.1c1.4-0.6,3.2-0.1,3.9,1.3c0.8,1.4,0.2,3.3-1.2,4
-		c-1.4,0.8-3.4,0.2-4-1.3C31.9,29.7,32.6,27.8,34,27.1 M26.8,29.6c0.1-0.9,0.9-1.5,1.8-1.5c0.9,0.1,1.6,0.8,1.7,1.7
-		c-0.1,0.9-0.8,1.8-1.7,1.8C27.5,31.7,26.6,30.6,26.8,29.6 M48.2,28.3c1.1-0.6,2.6,0.3,2.5,1.5c0.1,1.3-1.6,2.2-2.7,1.5
-		C46.9,30.6,47,28.8,48.2,28.3 M31.1,32.9c1.3-0.3,2.7,0.2,3.3,1.4c0.7,1.2,0.4,2.8-0.7,3.7c-1.4,1.3-3.9,0.8-4.6-1
-		C28.4,35.4,29.4,33.3,31.1,32.9 M44.8,32.9c1.2-0.4,2.7,0.1,3.3,1.2c0.9,1.3,0.5,3.2-0.8,4c-1.4,1-3.5,0.5-4.2-1
-		C42.2,35.6,43.1,33.4,44.8,32.9 M22.9,34.4c1.1-0.4,2.3,0.8,1.9,1.9c-0.3,1-1.7,1.4-2.4,0.6C21.6,36.2,21.9,34.7,22.9,34.4
-		 M52.6,35.9c0-0.9,0.6-1.7,1.6-1.8c0.7,0.1,1.5,0.7,1.4,1.5c0.1,1.1-1.2,1.8-2.1,1.3C53,36.8,52.8,36.4,52.6,35.9 M17.6,34.9
-		c0.7-0.3,1.5,0.3,1.3,1c0,0.8-1.3,1.1-1.7,0.5C16.8,35.9,17,35.1,17.6,34.9z M59,34.9c0.5-0.3,1.2-0.1,1.4,0.4
-		c0.3,0.6-0.3,1.4-0.9,1.3C58.6,36.7,58.3,35.3,59,34.9 M34.7,38.8c1.7-0.5,3.6,1,3.6,2.8c0.1,1.8-1.7,3.4-3.5,3
-		c-1.4-0.2-2.4-1.5-2.4-2.9C32.4,40.4,33.4,39.1,34.7,38.8 M41.5,38.8c1.8-0.5,3.7,1,3.6,2.8c0.1,1.8-1.7,3.3-3.4,3
-		c-1.6-0.2-2.8-2-2.4-3.6C39.6,40,40.5,39.1,41.5,38.8 M28.3,39.9c1.2-0.2,2.4,1.1,1.9,2.3c-0.4,1.2-2.1,1.6-2.9,0.6
-		C26.3,41.8,27,40.1,28.3,39.9 M48.4,40c1.1-0.5,2.4,0.5,2.3,1.7c0,1.3-1.6,2.2-2.7,1.4C46.9,42.4,47.1,40.4,48.4,40 M54,45.6
-		c-0.4-0.8,0.3-1.8,1.2-1.7c0.4,0,0.7,0.3,1,0.6c0.1,0.5,0.2,1-0.2,1.4C55.5,46.6,54.3,46.4,54,45.6 M21.8,44.2
-		c0.8-0.5,2,0.3,1.8,1.2c-0.1,0.8-1.2,1.3-1.9,0.9C21,45.8,21,44.6,21.8,44.2 M38,45.9c1.1-0.5,2.4,0.5,2.3,1.6
-		c0.1,1.3-1.6,2.2-2.7,1.4C36.5,48.3,36.7,46.4,38,45.9 M30.5,47.7c0.9-0.5,2.1,0.4,2.1,1.4c0,0.8-0.8,1.6-1.6,1.4
-		c-0.7,0-1.1-0.6-1.4-1.2C29.6,48.6,29.9,47.9,30.5,47.7 M45.7,47.7c0.9-0.6,2.3,0.3,2.2,1.3c0,1.1-1.5,1.9-2.4,1.1
-		C44.7,49.6,44.8,48.2,45.7,47.7 M48.4,54.2c-0.4-0.6,0.1-1.4,0.8-1.5c0.5,0.1,1.1,0.5,1,1.2C50.1,54.7,48.8,55,48.4,54.2
-		 M27.4,53.7c0.2-0.5,0.6-1,1.2-0.9c0.9,0.1,1.1,1.4,0.4,1.8C28.2,55,27.4,54.4,27.4,53.7 M37.5,54.3c0.2-0.7,1.1-1.1,1.8-0.7
-		c0.4,0.2,0.5,0.6,0.6,1c-0.1,0.2-0.1,0.4-0.2,0.6c-0.3,0.3-0.6,0.6-1,0.6C37.9,55.9,37.2,55,37.5,54.3" class="ada-icon"/>
-</g>
-</svg>
diff --git a/web/public/assets/icons/bch-icon.svg b/web/public/assets/icons/bch-icon.svg
deleted file mode 100644
index 3434651dd1..0000000000
--- a/web/public/assets/icons/bch-icon.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 129.7 86.85" style="enable-background:new 0 0 129.7 86.85;" xml:space="preserve">
-<g>
-	<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-		<path d="M372.56-185.94c-75.82,0-137.42,61.6-137.42,137.42S296.74,88.9,372.56,88.9s137.42-61.6,137.42-137.42
-			S448.37-185.94,372.56-185.94z M372.56-172.2c68.39,0,123.68,55.29,123.68,123.68S440.95,75.16,372.56,75.16
-			S248.88,19.87,248.88-48.52S304.18-172.2,372.56-172.2z" class="bch-icon"/>
-	</g>
-	<path d="M61.45,62.55l3.68-1.12l1.39,4.58c0.33,1.09,1.49,1.71,2.58,1.37c1.09-0.33,1.71-1.49,1.37-2.58l-1.39-4.58l1.31-0.39
-		l1.39,4.58c0.33,1.09,1.49,1.71,2.58,1.37c1.09-0.33,1.71-1.49,1.37-2.58l-1.39-4.58l0.52-0.16c4.62-1.4,7.23-6.29,5.83-10.9
-		l-0.23-0.77c-0.99-3.26-3.72-5.52-6.87-6.07c1.17-2.02,1.53-4.49,0.8-6.89c-1.25-4.12-5.27-6.64-9.41-6.14l-1.43-4.71
-		c-0.33-1.09-1.49-1.71-2.58-1.37c-1.09,0.33-1.71,1.49-1.37,2.58l1.39,4.58l-1.31,0.39l-1.39-4.58c-0.33-1.09-1.49-1.71-2.58-1.37
-		c-1.09,0.33-1.71,1.49-1.37,2.58l1.39,4.58l-3.68,1.12c-1.09,0.33-1.71,1.49-1.37,2.58l3.87,12.78c0.04,0.13,0.09,0.25,0.15,0.38
-		c0.01,0.13,0.04,0.26,0.08,0.39l4.11,13.55C59.21,62.26,60.36,62.88,61.45,62.55z M55.22,34.85l9.46-2.87
-		c2.43-0.74,5.02,0.64,5.76,3.08s-0.64,5.02-3.08,5.76l-9.46,2.87L55.22,34.85z M59.31,48.4l11.42-3.46
-		c2.43-0.73,5.02,0.64,5.76,3.08l0.23,0.77c0.74,2.43-0.64,5.02-3.08,5.76l-11.42,3.46L59.31,48.4z" class="bch-icon"/>
-</g>
-<path d="M55.45,6.61V2.46H5.89H2.02v4.15v74.65v4.15h53.43v-4.15c-19.25,0-34.81-16.69-34.81-37.33
-	C20.64,23.29,36.2,6.61,55.45,6.61z M16.77,43.93c0,16.4,8.91,30.6,21.82,37.33H5.89V6.61h32.7C25.68,13.33,16.77,27.53,16.77,43.93
-	z" class="bch-icon"/>
-<path d="M75.27,81.26v4.15h49.56h3.87v-4.15V6.61V2.46H75.27v4.15c19.25,0,34.81,16.69,34.81,37.33
-	C110.08,64.58,94.52,81.26,75.27,81.26z M113.95,43.93c0-16.4-8.91-30.6-21.82-37.33h32.7v74.65h-32.7
-	C105.04,74.54,113.95,60.34,113.95,43.93z" class="bch-icon"/>
-</svg>
diff --git a/web/public/assets/icons/bnb-icon.svg b/web/public/assets/icons/bnb-icon.svg
deleted file mode 100644
index faca0de359..0000000000
--- a/web/public/assets/icons/bnb-icon.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z" class="bnb-icon"/>
-		</g>
-	</g>
-</g>
-<rect x="57" y="33.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -8.0613 52.1541)" width="3.8" height="3.8" class="bnb-icon"/>
-<rect x="36.9" y="33.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -13.9704 37.8883)" width="3.8" height="3.8" class="bnb-icon"/>
-<rect x="16.7" y="33.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -19.8795 23.6225)" width="3.8" height="3.8" class="bnb-icon"/>
-<polygon points="52.6,26.8 38.8,13 36.1,15.7 36.1,15.7 25,26.8 27.7,29.4 38.8,18.3 49.9,29.5 " class="bnb-icon"/>
-<polygon points="52.6,44.8 50,42.1 38.8,53.3 27.5,42.1 24.9,44.8 36.1,56 36.1,56 38.8,58.6 41.4,56 41.4,56 " class="bnb-icon"/>
-</svg>
diff --git a/web/public/assets/icons/btc-icon-01.svg b/web/public/assets/icons/btc-icon-01.svg
deleted file mode 100644
index e4ffb84cfb..0000000000
--- a/web/public/assets/icons/btc-icon-01.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 22.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" style="enable-background:new 0 0 77.5 71.5;" xml:space="preserve">
-<g>
-	<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-		<path class="btc0" d="M272.7-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.9-199.5,272.7-199.5z M272.7-187.5
-			c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S213-187.5,272.7-187.5z"/>
-	</g>
-	<path class="btc1" d="M31.1,49.9h3.3V54c0,1,0.8,1.8,1.8,1.8c1,0,1.8-0.8,1.8-1.8v-4.1h1.2V54c0,1,0.8,1.8,1.8,1.8s1.8-0.8,1.8-1.8v-4.1h0.5
-		c4.2,0,7.6-3.4,7.6-7.6v-0.7c0-3-1.7-5.5-4.2-6.8c1.5-1.4,2.4-3.3,2.4-5.5c0-3.7-2.7-6.8-6.3-7.5v-4.3c0-1-0.8-1.8-1.8-1.8
-		c-1,0-1.8,0.8-1.8,1.8v4.1H38v-4.1c0-1-0.8-1.8-1.8-1.8s-1.8,0.8-1.8,1.8v4.1h-3.3c-1,0-1.8,0.8-1.8,1.8v11.6c0,0.1,0,0.2,0,0.3
-		c0,0.1,0,0.2,0,0.3v12.3C29.3,49.1,30.1,49.9,31.1,49.9z M32.9,25.4h8.6c2.2,0,4,1.8,4,4s-1.8,4-4,4h-8.6V25.4z M32.9,37.6h10.3
-		c2.2,0,4,1.8,4,4v0.7c0,2.2-1.8,4-4,4H32.9V37.6z"/>
-</g>
-</svg>
diff --git a/web/public/assets/icons/dai-icon.svg b/web/public/assets/icons/dai-icon.svg
deleted file mode 100644
index 17b4777046..0000000000
--- a/web/public/assets/icons/dai-icon.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z" class="dai-icon"/>
-		</g>
-	</g>
-</g>
-<path d="M58.1,31.1h-3.3c-2.4-7.3-9.5-9.8-13.7-10H26.6v10h-3.2v3.5h3.2v3.7h-3.2v3.5h3.2v10.1h1.8l11.9,0
-	c4.4-0.1,12.1-2.5,14.5-10.1h3.3v-3.5h-2.6c0.1-0.6,0.1-1.1,0.1-1.7c0-0.7,0-1.4-0.1-2h2.6V31.1z M30.1,24.6l10.9,0
-	c0.4,0,7.3,0.5,10,6.5H30.1V24.6z M40.2,48.4H30.1v-6.6H51C48.2,48,40.6,48.3,40.2,48.4z M52.1,36.6c0,0.6,0,1.2-0.1,1.7H30.1v-3.7
-	H52C52.1,35.2,52.1,35.9,52.1,36.6z" class="dai-icon"/>
-</svg>
diff --git a/web/public/assets/icons/eos-icon.svg b/web/public/assets/icons/eos-icon.svg
deleted file mode 100644
index ce7af830df..0000000000
--- a/web/public/assets/icons/eos-icon.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z" class="eos-icon"/>
-		</g>
-	</g>
-</g>
-<path d="M38.8,60.6C38.8,60.6,38.7,60.6,38.8,60.6c-0.3,0-0.5-0.1-0.7-0.2l-15.5-9.7c-0.2-0.1-0.4-0.3-0.5-0.5
-	c0-0.1-0.1-0.2-0.1-0.3c0,0,0,0,0,0c0,0,0,0,0,0c0-0.2-0.1-0.3,0-0.5c0,0,0-0.1,0-0.1l5-23c0-0.1,0.1-0.2,0.1-0.3c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0l0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0-0.1,0.1-0.1,0.1-0.2l10.4-14.2c0.3-0.3,0.6-0.5,1.1-0.5c0,0,0,0,0,0c0.4,0,0.8,0.2,1.1,0.5
-	l10.4,14.2c0,0.1,0.1,0.1,0.1,0.2c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0.1,0.1,0.1,0.2,0.1,0.3l5,23c0,0,0,0.1,0,0.1c0,0.2,0,0.4,0,0.5c0,0.1-0.1,0.2-0.1,0.3c0,0,0,0,0,0c0,0,0,0,0,0
-	c-0.1,0.2-0.3,0.4-0.5,0.5c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0c0,0,0,0,0,0
-	c0,0,0,0,0,0l-15.5,9.7C39.2,60.5,39,60.6,38.8,60.6z M27.8,50.9l8.6,5.4l-1.7-5.4H27.8z M42.8,50.9l-1.7,5.4l8.6-5.4H42.8z
-	 M37.4,50.9l1.3,4.1l1.3-4.1H37.4z M43.6,48.3H52l-5.4-9.4L43.6,48.3z M36.6,48.3h4.3l4-12.5l-6.1-10.8l-6.1,10.8L36.6,48.3z
-	 M25.5,48.3h8.4l-3-9.4L25.5,48.3z M28.6,31.6l-2.2,9.9l3.4-6L28.6,31.6z M47.7,35.4l3.4,6l-2.2-9.9L47.7,35.4z M29.8,26.8l1.8,5.6
-	l5.9-10.4v-5.7L29.8,26.8z M40.1,21.9L46,32.3l1.8-5.6l-7.7-10.5V21.9z" class="eos-icon"/>
-</svg>
diff --git a/web/public/assets/icons/eth-icon-01.svg b/web/public/assets/icons/eth-icon-01.svg
deleted file mode 100644
index edc6142f97..0000000000
--- a/web/public/assets/icons/eth-icon-01.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" style="enable-background:new 0 0 77.5 71.5;" xml:space="preserve">
-<g transform="translate(-82.393755,-105.33571)">
-	<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-		<path class="eth0" d="M583.6,198.7c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S649.8,198.7,583.6,198.7z M583.6,210.7
-			c59.7,0,108,48.3,108,108s-48.3,108-108,108c-59.7,0-108-48.3-108-108S523.8,210.7,583.6,210.7z"/>
-		<path class="eth1" d="M583.5,235.9c-1.6,0-3,1-3.7,2.4l-44.4,74.6c-0.7,0.8-1.1,1.8-1.1,2.9c0,1.9,1.2,3.5,3,4l43.6,26.7c1.5,1.2,3.7,1.2,5.2,0
-			l43.9-26.9c0.8-0.3,1.5-0.9,1.9-1.6l0,0l0,0c0.1-0.1,0.1-0.2,0.2-0.3c0-0.1,0.1-0.2,0.1-0.3c0,0,0,0,0-0.1c0.2-0.5,0.3-1,0.3-1.5
-			v-0.1c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.3l0,0c-0.1-0.8-0.4-1.6-0.9-2.2l-44.5-74.8C586.7,236.8,585.2,235.9,583.5,235.9
-			L583.5,235.9z M541.5,334.2c-2.7,0.1-4.6,2.7-3.8,5.3l0,0c0,0.1,0.1,0.2,0.1,0.3c0,0.1,0.1,0.2,0.1,0.3l0,0
-			c0.1,0.3,0.3,0.6,0.5,0.8l41.5,58.3c1.6,2.8,5.6,2.9,7.2,0l41.6-58.5c0-0.1,0.1-0.1,0.1-0.2c0,0,0,0,0-0.1
-			c2.4-3.8-2.2-8.1-5.9-5.6l-39.5,24.3L544.1,335C543.3,334.5,542.4,334.2,541.5,334.2L541.5,334.2z"/>
-	</g>
-</g>
-</svg>
diff --git a/web/public/assets/icons/eur-icon.svg b/web/public/assets/icons/eur-icon.svg
deleted file mode 100644
index de2a154930..0000000000
--- a/web/public/assets/icons/eur-icon.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" xml:space="preserve">
-<style type="text/css">
-	.eur {fill:#00A551}
-</style>
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path class="eur" d="M272-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.2-199.5,272-199.5z M272-187.5
-				c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.3-187.5,272-187.5z"/>
-		</g>
-	</g>
-	<g>
-		<path class="eur" d="M26.3,37.2h2.2v-2.6h-2.8l0.6-3.9h2.6c0.3-1.5,0.7-2.8,1.2-4.1c0.6-1.3,1.3-2.4,2.2-3.4c0.9-0.9,2-1.7,3.3-2.3
-			c1.3-0.6,2.8-0.8,4.5-0.8c3.1,0,5.4,0.7,6.9,2.2c1.5,1.4,2.5,3.6,2.8,6.5l-5.4,0.9c-0.3-1.5-0.8-2.6-1.4-3.3c-0.6-0.6-1.7-1-3.1-1
-			c-1.4,0-2.5,0.5-3.3,1.5c-0.8,1-1.3,2.3-1.7,3.8h6.9l-0.6,3.9h-6.7v2.6h6.5l-0.6,3.9h-5.3c0.3,1.5,0.9,2.7,1.6,3.7
-			c0.8,0.9,1.8,1.4,3.2,1.4c1.5,0,2.7-0.4,3.4-1.1c0.7-0.7,1.2-1.9,1.4-3.4h5.6c-0.2,3.2-1.2,5.6-2.9,7.3c-1.7,1.7-4.2,2.5-7.6,2.5
-			c-1.6,0-3.1-0.2-4.3-0.7s-2.3-1.2-3.2-2.1c-0.9-0.9-1.6-2-2.1-3.2c-0.5-1.3-0.9-2.7-1.2-4.3h-3.2L26.3,37.2z"/>
-	</g>
-</g>
-</svg>
diff --git a/web/public/assets/icons/krw-icon-01.svg b/web/public/assets/icons/krw-icon-01.svg
deleted file mode 100644
index 53880b7695..0000000000
--- a/web/public/assets/icons/krw-icon-01.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" style="enable-background:new 0 0 77.5 71.5;" xml:space="preserve">
-<style type="text/css">
-	.krw-icon{fill:#F9EE02;}
-</style>
-<g>
-	<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-		<path class="krw-icon" d="M272.7-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.9-199.5,272.7-199.5z
-			 M272.7-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S213-187.5,272.7-187.5z"/>
-	</g>
-</g>
-<path class="krw-icon" d="M58.4,36.9h-5.1l3.7-14h-3.6l-3.6,14h-5.1l-4.3-14H37l-4.1,14h-5l-3.6-14h-3.6l3.7,14h-3.9v1.8H25l3.5,13.1h3.3
-	l3.8-13.1h6.5L46,51.7h3.3l3.5-13.1h5.6V36.9z M31.8,40.4c-0.7,2.3-1.2,4.7-1.6,7.1c-0.3-2-0.7-4.3-1.4-6.8l-0.5-2h4L31.8,40.4z
-	 M36.1,36.9l1.3-4.4c0.6-2.1,1.1-4,1.4-5.7c0,0.3,0.2,1,0.5,2.3c0.3,1.3,0.7,2.4,0.9,3.2l1.3,4.5H36.1z M49,40.6
-	c-0.7,2.7-1.2,5-1.4,6.8c-0.4-2.6-1-4.9-1.6-6.9l-0.6-1.9h4.1L49,40.6z"/>
-</svg>
diff --git a/web/public/assets/icons/ltc-icon.svg b/web/public/assets/icons/ltc-icon.svg
deleted file mode 100644
index 67bccbd31b..0000000000
--- a/web/public/assets/icons/ltc-icon.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path class="ltc-icon" d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z"/>
-		</g>
-	</g>
-</g>
-<polygon class="ltc-icon" points="32,49.6 35.4,37.9 44.1,35.2 45,31.7 36.4,34.3 42.2,14.5 38.6,14.5 32.4,35.6 24.6,37.9 23.7,41.5 
-	31.3,39.1 27.1,53.3 52.3,53.3 53.3,49.6 "/>
-</svg>
diff --git a/web/public/assets/icons/trx-icon.svg b/web/public/assets/icons/trx-icon.svg
deleted file mode 100644
index 048fe0aa81..0000000000
--- a/web/public/assets/icons/trx-icon.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z" class="trx-icon"/>
-		</g>
-	</g>
-</g>
-<path d="M60.6,27.9c-1.9-1.3-3.9-2.7-5.8-4.1c0,0-0.1-0.1-0.1-0.1c-0.2-0.2-0.5-0.3-0.8-0.4l0,0
-	c-5.2-1.3-10.5-2.5-15.6-3.8c-4.6-1.1-9.3-2.3-13.9-3.4c-0.1,0-0.2-0.1-0.4-0.1c-0.4-0.1-0.9-0.2-1.4-0.2c-0.2,0-0.3,0.1-0.4,0.2
-	L22,16.1c-0.2,0.2-0.3,0.4-0.4,0.6l0,0.1v0.5l0,0.1c2.9,8.2,5.9,16.6,8.9,24.7c2.2,6.2,4.6,12.7,6.8,19c0.1,0.4,0.5,0.7,1,0.8h0.1
-	c0.5,0,0.9-0.2,1.1-0.6L48,48.7c2.1-3,4.2-6.1,6.2-9.1c0.8-1.2,1.7-2.5,2.5-3.7c1.4-2,2.8-4.2,4.3-6.2l0.1-0.1v-0.1
-	C61.2,29.1,61.2,28.3,60.6,27.9 M50.6,32.4c-2,1-4,2.1-6.1,3.2c1.2-1.3,2.4-2.6,3.6-3.9c1.5-1.6,3.1-3.3,4.6-4.9l0,0
-	c0.1-0.2,0.3-0.3,0.5-0.5c0.1-0.1,0.2-0.2,0.4-0.4c0.8,0.5,1.6,1.1,2.4,1.7c0.6,0.4,1.1,0.8,1.7,1.2C55.2,30,52.9,31.2,50.6,32.4
-	 M45.4,31.9c-1.5,1.7-3.1,3.4-4.7,5.1c-3.1-3.7-6.2-7.5-9.2-11.1c-1.4-1.7-2.8-3.3-4.1-5l0,0c-0.3-0.4-0.6-0.7-0.9-1.1
-	c-0.2-0.2-0.4-0.5-0.6-0.7c1.2,0.3,2.5,0.6,3.7,0.9c1.1,0.3,2.2,0.5,3.3,0.8c6.2,1.5,12.5,3,18.7,4.5C49.5,27.5,47.4,29.7,45.4,31.9
-	 M40,52.9c0.1-1.1,0.2-2.3,0.4-3.4c0.1-0.9,0.2-1.9,0.3-2.7c0.2-1.4,0.3-2.9,0.4-4.4l0-0.3c0.1-0.9,0.2-1.9,0.3-2.8
-	c0.1-0.1,0.2-0.1,0.4-0.2c0.2-0.1,0.3-0.1,0.5-0.2c2.5-1.3,5-2.6,7.5-3.9c2.5-1.3,5-2.6,7.6-3.9c-2.3,3.3-4.6,6.7-6.9,10
-	c-1.9,2.8-3.9,5.7-5.9,8.6c-0.8,1.1-1.6,2.3-2.3,3.4c-0.9,1.2-1.7,2.5-2.6,3.8C39.7,55.4,39.9,54.1,40,52.9 M25,21.5
-	c-0.1-0.4-0.3-0.8-0.4-1.2c2.9,3.5,5.8,7,8.7,10.5c1.5,1.8,2.9,3.5,4.4,5.3c0.3,0.3,0.6,0.7,0.9,1c0.4,0.4,0.7,0.9,1.1,1.3
-	c-0.1,1.1-0.2,2.2-0.4,3.3c-0.1,0.8-0.2,1.5-0.2,2.3v0c0,0.5-0.1,1-0.2,1.4c-0.1,0.7-0.2,2.1-0.2,2.1l0,0.1
-	c-0.2,2.2-0.4,4.4-0.7,6.5c-0.1,0.9-0.2,1.8-0.3,2.7c-0.1-0.2-0.1-0.3-0.2-0.5c-0.2-0.4-0.3-0.9-0.5-1.3L36,52
-	C32.3,41.8,28.7,31.7,25,21.5" class="trx-icon"/>
-</svg>
diff --git a/web/public/assets/icons/tusd-icon.svg b/web/public/assets/icons/tusd-icon.svg
deleted file mode 100644
index caa57a4dae..0000000000
--- a/web/public/assets/icons/tusd-icon.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z" class="tusd-icon"/>
-		</g>
-	</g>
-</g>
-<g>
-	<polygon points="46.7,21.1 40.2,21.1 38.5,21.1 30.3,21.1 30.3,24.6 36.8,24.6 36.8,36.1 40.2,36.1 40.2,24.6 
-		46.7,24.6 	" class="tusd-icon"/>
-</g>
-<g>
-	<path d="M26.7,49.7h-2.4v-7h-2.2v-2h6.8v2h-2.2V49.7z" class="tusd-icon"/>
-	<path d="M37.8,40.7v5.4c0,1.2-0.3,2.1-1,2.7s-1.6,1-2.9,1c-1.2,0-2.2-0.3-2.8-0.9c-0.7-0.6-1-1.5-1-2.7v-5.5h2.4V46
-		c0,0.6,0.1,1.1,0.4,1.4c0.2,0.3,0.6,0.4,1.1,0.4c0.5,0,0.9-0.1,1.1-0.4c0.2-0.3,0.3-0.8,0.3-1.4v-5.3H37.8z"  class="tusd-icon"/>
-	<path d="M45.6,47c0,0.6-0.1,1.1-0.4,1.5c-0.3,0.4-0.7,0.8-1.2,1c-0.5,0.2-1.2,0.4-1.9,0.4c-0.6,0-1.1,0-1.5-0.1
-		s-0.8-0.2-1.3-0.4v-2.2c0.5,0.2,0.9,0.4,1.4,0.6c0.5,0.1,1,0.2,1.4,0.2c0.4,0,0.6-0.1,0.8-0.2c0.2-0.1,0.3-0.3,0.3-0.5
-		c0-0.1,0-0.2-0.1-0.3c-0.1-0.1-0.2-0.2-0.3-0.3c-0.1-0.1-0.5-0.3-1.2-0.6c-0.6-0.3-1-0.5-1.3-0.8c-0.3-0.3-0.5-0.5-0.7-0.9
-		c-0.1-0.3-0.2-0.7-0.2-1.1c0-0.8,0.3-1.5,0.9-1.9c0.6-0.5,1.4-0.7,2.5-0.7c0.9,0,1.9,0.2,2.8,0.6l-0.7,1.9
-		c-0.8-0.4-1.6-0.6-2.2-0.6c-0.3,0-0.5,0.1-0.7,0.2c-0.1,0.1-0.2,0.2-0.2,0.4c0,0.2,0.1,0.3,0.3,0.5c0.2,0.1,0.7,0.4,1.5,0.8
-		c0.8,0.3,1.3,0.7,1.6,1.1C45.4,45.9,45.6,46.4,45.6,47z"  class="tusd-icon"/>
-	<path d="M54.6,45c0,1.5-0.4,2.7-1.2,3.5c-0.8,0.8-2,1.2-3.5,1.2H47v-9h3.1c1.4,0,2.6,0.4,3.3,1.1
-		C54.2,42.6,54.6,43.6,54.6,45z M52.1,45.1c0-0.8-0.2-1.4-0.5-1.8s-0.8-0.6-1.5-0.6h-0.7v5h0.5c0.7,0,1.3-0.2,1.6-0.6
-		C51.9,46.6,52.1,46,52.1,45.1z" class="tusd-icon"/>
-</g>
-</svg>
diff --git a/web/public/assets/icons/usdt-icon.svg b/web/public/assets/icons/usdt-icon.svg
deleted file mode 100644
index 7ec8d57611..0000000000
--- a/web/public/assets/icons/usdt-icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" xml:space="preserve">
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path fill="#2BB673" d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z"/>
-		</g>
-	</g>
-	<path fill="#2BB673" d="M54.1,36.7c0-1.9-5.2-3.5-12.1-3.9l0-3h8.6v-6.3H27.2v6.3h8.6v3.1c-6.8,0.4-11.8,2-11.8,3.8
-		c0,1.9,5.1,3.5,11.8,3.8v10.9h6.3V40.6C49,40.2,54.1,38.6,54.1,36.7z M39,38.6c-7.4,0-13.4-1.1-13.4-2.6c0-1.2,4.3-2.2,10.1-2.5
-		v0.7h0v2.9c1,0.1,2.1,0.1,3.3,0.1c1,0,2.1,0,3-0.1v-3.7c5.9,0.3,10.4,1.3,10.4,2.5C52.4,37.4,46.4,38.6,39,38.6z"/>
-</g>
-</svg>
diff --git a/web/public/assets/icons/xht-icon.svg b/web/public/assets/icons/xht-icon.svg
deleted file mode 100644
index f420f57237..0000000000
--- a/web/public/assets/icons/xht-icon.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" style="enable-background:new 0 0 77.5 71.5;" xml:space="preserve">
-<style type="text/css">
-	.xht-icon{fill:#FFFFFF !important;}
-	.xht-icon-1{fill:#000000 !important;}
-</style>
-<path class="xht-icon-1" d="M49.1,9H28L5.9,35.9L28,62.8h21.2l22-26.9L49.1,9L49.1,9z"/>
-<path class="xht-icon" d="M45.3,53H31.7l-14-17.1l14.1-17.1h13.5l14.1,17.1L45.3,53z M32.3,52h12.5L58,35.9L44.8,19.8H32.3L19.1,35.9
-	L32.3,52z"/>
-<path class="xht-icon" d="M41.8,44h-6.4l-0.1-0.1l-6.6-8l6.6-8.1h6.4l0.1,0.1l6.6,8L41.8,44z M35.6,43.5h5.9l6.2-7.6l-6.2-7.6h-5.9
-	l-6.2,7.6L35.6,43.5z"/>
-<path class="xht-icon" d="M47.1,13.5l18.4,22.4L47.1,58.3H30L11.7,35.9L30,13.5H47.1 M48.5,10.4h-20L7.6,35.9l20.9,25.5h20l20.9-25.5
-	L48.5,10.4L48.5,10.4z"/>
-</svg>
diff --git a/web/public/assets/icons/xlm-icon.svg b/web/public/assets/icons/xlm-icon.svg
deleted file mode 100644
index c43b57ebcf..0000000000
--- a/web/public/assets/icons/xlm-icon.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.1.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-	 x="0px" y="0px" viewBox="0 0 77.5 71.5" overflow="visible" xml:space="preserve">
-<g>
-	<path class="xlm-icon" d="M14.8,40.6c-0.4-1.7-0.6-3.5-0.6-5.3C14.2,21.8,25,11,38.5,11c5,0,9.7,1.5,13.6,4.1l3.1-1.7
-		c-4.6-3.5-10.4-5.6-16.6-5.6C23.3,7.8,11,20.1,11,35.3c0,2.3,0.3,4.6,0.9,6.8l-5.2,2.7V48l63.6-32.7v-3.2L14.8,40.6z"/>
-	<path class="xlm-icon" d="M6.7,59.4l55.7-28.6c0.3,1.5,0.4,3,0.4,4.5c0,13.4-10.9,24.3-24.3,24.3c-4.7,0-9-1.3-12.7-3.6l-3.3,1.6
-		c4.5,3.3,10.1,5.2,16,5.2C53.6,62.8,66,50.4,66,35.3c0-2.1-0.2-4.1-0.7-6.1l5-2.6v-3.4L6.7,55.9V59.4z"/>
-</g>
-</svg>
diff --git a/web/public/assets/icons/xmr-icon.svg b/web/public/assets/icons/xmr-icon.svg
deleted file mode 100644
index 700a533497..0000000000
--- a/web/public/assets/icons/xmr-icon.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" style="enable-background:new 0 0 77.5 71.5;" xml:space="preserve">
-<style type="text/css">
-	.xmr-icon{fill:#000000;}
-</style>
-<polygon class="xmr-icon" points="66.9,48.4 52.2,48.4 52.2,30.8 38.5,44.4 24.9,30.8 24.9,48.4 10,48.4 10,44.4 20.9,44.4 20.9,21.2 
-	38.5,38.8 56.2,21.1 56.2,44.4 66.9,44.4 "/>
-<g>
-	<g>
-		<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-			<path class="xmr-icon" d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z
-				 M271.9-187.5c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z"/>
-		</g>
-	</g>
-</g>
-</svg>
diff --git a/web/public/assets/icons/xrp-icon-01.svg b/web/public/assets/icons/xrp-icon-01.svg
deleted file mode 100644
index e9f896337e..0000000000
--- a/web/public/assets/icons/xrp-icon-01.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 77.5 71.5" style="enable-background:new 0 0 77.5 71.5;" xml:space="preserve">
-<g>
-	<g transform="matrix(0.26458333,0,0,0.26458333,-33.403463,56.772625)">
-		<path class="xrp-icon" d="M271.9-199.5c-66.2,0-120,53.8-120,120s53.8,120,120,120s120-53.8,120-120S338.1-199.5,271.9-199.5z M271.9-187.5
-			c59.7,0,108,48.3,108,108s-48.3,108-108,108s-108-48.3-108-108S212.2-187.5,271.9-187.5z"/>
-	</g>
-</g>
-<path class="xrp-icon" d="M20.6,50.6h5.1l8.5-8.4c0,0,1.7-1.6,4.3-1.6c2.6,0,4.2,1.6,4.2,1.6l8.6,8.5h5.2L45.8,40c0,0-2.8-3-7.2-3s-7,2.9-7,2.9
-	L20.6,50.6z"/>
-<path class="xrp-icon" d="M56.5,20.8h-5.1l-8.5,8.4c0,0-1.7,1.6-4.3,1.6s-4.2-1.6-4.2-1.6l-8.6-8.5h-5.2l10.8,10.6c0,0,2.8,3,7.2,3s7-2.9,7-2.9
-	L56.5,20.8z"/>
-</svg>
diff --git a/web/public/assets/images/gear-homepage-edit-sections-01.svg b/web/public/assets/images/gear-homepage-edit-sections-01.svg
new file mode 100644
index 0000000000..0b4ce02aeb
--- /dev/null
+++ b/web/public/assets/images/gear-homepage-edit-sections-01.svg
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 90 90" overflow="visible" xml:space="preserve">
+<g id="Group_4005" transform="translate(-1795 -489)">
+	<g transform="matrix(1, 0, 0, 1, 1795, 489)">
+		<circle id="Ellipse_674-2" fill="#FFF9FA" cx="45" cy="45" r="42"/>
+	</g>
+	<path id="Subtraction_62" fill="#0000FF" d="M1840,576c-23.2,0-42-18.8-42-42c0-16.9,10.1-32.1,25.6-38.7c21.4-9,46,1,55.1,22.4
+		c9,21.4-1,46-22.4,55C1851.2,574.9,1845.6,576,1840,576z M1831.4,552.2L1831.4,552.2c0.9,0.5,1.9,0.9,2.9,1.2v3.6
+		c0,0.7,0.5,1.4,1.2,1.5c3.2,0.7,6.6,0.7,9.8,0c0.7-0.1,1.2-0.8,1.2-1.5v-3.6c1-0.3,2-0.7,2.9-1.2l2.5,2.5c0.5,0.5,1.3,0.6,1.9,0.2
+		c2.8-1.8,5.1-4.2,6.9-6.9c0.4-0.6,0.3-1.4-0.2-1.9l-2.5-2.5c0.5-0.9,0.9-1.9,1.2-2.9h3.6c0.7,0,1.4-0.5,1.5-1.2
+		c0.7-3.2,0.7-6.6,0-9.8c-0.1-0.7-0.8-1.2-1.5-1.2h-3.6c-0.3-1-0.7-2-1.2-2.9l2.5-2.5c0.5-0.5,0.6-1.3,0.2-1.9
+		c-1.8-2.8-4.2-5.1-6.9-6.9c-0.6-0.4-1.4-0.3-1.9,0.2l-2.5,2.5c-0.9-0.5-1.9-0.9-2.9-1.2V512c0-0.7-0.5-1.4-1.2-1.5
+		c-3.2-0.7-6.6-0.7-9.8,0c-0.7,0.1-1.2,0.8-1.2,1.5v3.6c-1,0.3-2,0.7-2.9,1.2l-2.5-2.5c-0.5-0.5-1.3-0.6-1.9-0.2
+		c-2.8,1.8-5.1,4.2-6.9,6.9c-0.4,0.6-0.3,1.4,0.2,1.9l2.5,2.5c-0.5,0.9-0.9,1.9-1.2,2.9h-3.6c-0.7,0-1.4,0.5-1.5,1.2
+		c-0.7,3.2-0.7,6.6,0,9.8c0.1,0.7,0.8,1.2,1.5,1.2h3.6c0.3,1,0.7,2,1.2,2.9l-2.5,2.5c-0.5,0.5-0.6,1.3-0.2,1.9
+		c1.8,2.8,4.2,5.1,6.9,6.9c0.6,0.4,1.4,0.3,1.9-0.2L1831.4,552.2z M1840.5,555.9c-1,0-2-0.1-3.1-0.2v-3.4c0-0.7-0.5-1.3-1.1-1.5
+		c-1.5-0.4-3-1-4.3-1.8c-0.6-0.4-1.4-0.3-1.9,0.2l-2.4,2.4c-1.6-1.2-3.1-2.7-4.3-4.3l2.4-2.4c0.5-0.5,0.6-1.3,0.2-1.9
+		c-0.8-1.4-1.4-2.8-1.8-4.3c-0.2-0.7-0.8-1.2-1.5-1.1h-3.4c-0.3-2-0.3-4.1,0-6.1h3.4c0.7,0,1.3-0.5,1.5-1.1c0.4-1.5,1-3,1.8-4.3
+		c0.4-0.6,0.3-1.4-0.2-1.9l-2.4-2.4c1.2-1.6,2.7-3.1,4.3-4.3l2.4,2.4c0.5,0.5,1.3,0.6,1.9,0.2c1.4-0.8,2.8-1.4,4.3-1.8
+		c0.7-0.2,1.2-0.8,1.2-1.5v-3.4c2-0.3,4.1-0.3,6.1,0v3.4c0,0.7,0.5,1.3,1.1,1.5c1.5,0.4,3,1,4.3,1.8c0.6,0.4,1.4,0.3,1.9-0.2
+		l2.4-2.4c1.6,1.2,3.1,2.7,4.3,4.3l-2.4,2.4c-0.5,0.5-0.6,1.3-0.2,1.9c0.8,1.4,1.4,2.8,1.8,4.3c0.2,0.7,0.8,1.1,1.5,1.1h3.4
+		c0.3,2,0.3,4.1,0,6.1h-3.4c-0.7,0-1.3,0.5-1.5,1.2c-0.4,1.5-1,3-1.8,4.3c-0.4,0.6-0.3,1.4,0.2,1.9l2.4,2.4
+		c-1.2,1.6-2.7,3.1-4.3,4.3l-2.4-2.4c-0.5-0.5-1.3-0.6-1.9-0.2c-1.4,0.8-2.8,1.4-4.3,1.8c-0.7,0.2-1.1,0.8-1.1,1.5v3.4
+		C1842.5,555.9,1841.5,555.9,1840.5,555.9L1840.5,555.9z M1840.5,526.8c-4.2,0-7.7,3.4-7.7,7.7c0,4.2,3.4,7.7,7.7,7.7
+		s7.7-3.4,7.7-7.7l0,0C1848.1,530.3,1844.7,526.8,1840.5,526.8L1840.5,526.8z M1840.5,539.1c-2.5,0-4.6-2.1-4.6-4.6
+		c0-2.5,2.1-4.6,4.6-4.6s4.6,2.1,4.6,4.6l0,0C1845.1,537,1843,539.1,1840.5,539.1L1840.5,539.1z"/>
+</g>
+</svg>
diff --git a/web/public/assets/images/hollaex-background.png b/web/public/assets/images/hollaex-background.png
new file mode 100644
index 0000000000..7854eebd83
Binary files /dev/null and b/web/public/assets/images/hollaex-background.png differ
diff --git a/web/public/assets/images/home-page.svg b/web/public/assets/images/home-page.svg
new file mode 100644
index 0000000000..7840fc8203
--- /dev/null
+++ b/web/public/assets/images/home-page.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.2.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 50 50" overflow="visible" xml:space="preserve">
+<g id="Group_3630" transform="translate(0 0)">
+	<path id="Path_4341" fill="#FFFFFF" d="M4.4,42.2h41.2c0.4,0,0.7-0.3,0.7-0.7V8.5c0-0.4-0.3-0.7-0.7-0.7H4.4C4,7.8,3.7,8.1,3.7,8.5
+		v33.1C3.7,41.9,4,42.2,4.4,42.2z M5.1,40.8V17.6h39.8v23.3H5.1z M44.9,9.1v7.1H5.1V9.2L44.9,9.1z"/>
+	<path id="Path_4342" fill="#FFFFFF" d="M6.8,13.5h24c0.4,0,0.7-0.3,0.7-0.7s-0.3-0.7-0.7-0.7h-24c-0.4,0-0.7,0.3-0.7,0.7
+		S6.4,13.5,6.8,13.5z"/>
+	<path id="Path_4343" fill="#FFFFFF" d="M42.5,13.5h0.3c0.4,0,0.7-0.3,0.7-0.7v-0.3c0-0.4-0.3-0.7-0.7-0.7h-0.3
+		c-0.4,0-0.7,0.3-0.7,0.7v0.3C41.8,13.2,42.1,13.5,42.5,13.5z"/>
+	<path id="Path_4344" fill="#FFFFFF" d="M38.5,13.5h0.3c0.4,0,0.7-0.3,0.7-0.7v-0.3c0-0.4-0.3-0.7-0.7-0.7h-0.3
+		c-0.4,0-0.7,0.3-0.7,0.7v0.3C37.8,13.2,38.1,13.5,38.5,13.5C38.5,13.5,38.5,13.5,38.5,13.5z"/>
+	<path id="Path_4345" fill="#FFFFFF" d="M34.2,13.5h0.3c0.4,0,0.7-0.3,0.7-0.7v-0.3c0-0.4-0.3-0.7-0.7-0.7h-0.3
+		c-0.4,0-0.7,0.3-0.7,0.7v0.3C33.5,13.2,33.8,13.5,34.2,13.5z"/>
+	<path id="Path_4346" fill="#FFFFFF" d="M34.6,26.2l-9-6.7c-0.5-0.4-1.1-0.4-1.6,0l-8.6,6.7c-0.5,0.4-0.6,1.1-0.2,1.6
+		c0,0,0,0.1,0.1,0.1c0.2,0.2,0.4,0.3,0.7,0.4v9.7c0,0.4,0.3,0.7,0.7,0.7h6.1c0.4,0,0.7-0.3,0.7-0.7v-4.4h3.3l0.1,4.4
+		c0,0.4,0.3,0.7,0.7,0.7h6c0.4,0,0.7-0.3,0.7-0.7v-9.6c0.3,0,0.6-0.2,0.8-0.4c0.2-0.2,0.3-0.6,0.3-0.9
+		C35.1,26.7,34.9,26.4,34.6,26.2z M33,26.8c-0.2,0.1-0.4,0.4-0.4,0.6v9.9H28l0-4.4c0-0.4-0.3-0.7-0.7-0.7h-4.7
+		c-0.4,0-0.7,0.3-0.7,0.7v4.4h-4.7v-9.8c0-0.3-0.1-0.5-0.4-0.6c0,0,0,0,0,0l0,0l8-6.2l8.3,6.2C33,26.8,33,26.8,33,26.8L33,26.8z"/>
+</g>
+</svg>
diff --git a/web/public/assets/images/quick-trade-01.svg b/web/public/assets/images/quick-trade-01.svg
new file mode 100644
index 0000000000..46c025ca7c
--- /dev/null
+++ b/web/public/assets/images/quick-trade-01.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+
+<!-- Page 1 -->
+<svg x="0" y="0" width="275" height="275" viewBox="0 0 275 275" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+style="display: block;margin-left: auto;margin-right: auto;">
+<defs>
+
+<style type="text/css"><![CDATA[
+
+.quick-trade-1{
+fill: none;
+stroke: #1F1F1E;
+stroke-width: 8.5525;
+stroke-linecap: butt;
+stroke-linejoin: miter;
+}
+.quick-trade-2{
+fill: #F69322;
+}
+.quick-trade-3{
+fill: none;
+stroke: #F69322;
+stroke-width: 1.2573612;
+stroke-linecap: butt;
+stroke-linejoin: miter;
+}
+.quick-trade-4{
+fill: #211E1E;
+}
+
+
+]]></style>
+
+</defs>
+<path d="M141.5,134.9l-56.7,0L165.1,19.7l-14.3,83.2l57.8,0L130.2,214.7l11.3,-79.8Z" class="quick-trade-1" />
+<path d="M189.5,224.1c0,0,-21.4,22.1,-57,22.1c-35.6,0,-57.1,-14,-60.1,-26.2c-1.9,14.2,-3,18.2,1.3,26.1c4.2,7.9,22.8,24.2,59,24.2c36.1,0,54.3,-12.7,55.7,-33.8c1.5,-21.1,1.1,-12.4,1.1,-12.4Z" class="quick-trade-2" />
+<path d="M189.5,224.1c0,0,-21.4,22.1,-57,22.1c-35.6,0,-57.1,-14,-60.1,-26.2c-1.9,14.2,-3,18.2,1.3,26.1c4.2,7.9,22.8,24.2,59,24.2c36.1,0,54.3,-12.7,55.7,-33.8c1.5,-21.1,1.1,-12.4,1.1,-12.4Z" class="quick-trade-3" />
+<path d="M80.7,235.3l0,13c-3.1,-3.8,-4.9,-7.9,-4.8,-12.2l0,-5.7c1.5,1.8,3.1,3.4,4.8,4.9m104.4,-4.9l0,5.7c0,4.5,-1.7,8.6,-5,12.7l0,-13.3c1.1,-0.9,2.2,-2,3.2,-3c0.6,-0.6,1.3,-1.3,1.8,-2.1m-18.9,28.5l0,-15.3c2.5,-0.9,4.7,-2.2,6.9,-3.4l0,14.8c-0.9,0.7,-2,1.3,-3.2,2c-1.2,0.7,-2.5,1.3,-3.7,1.9m-7,-12.7l0,15.8c-2.7,1,-5.4,1.7,-8.5,2.3l0,-15.7c3.1,-0.9,5.8,-1.6,8.5,-2.4m-15.5,3.2l0,16.1c-3.2,0.5,-6.4,0.7,-9.8,0.8l0,-16c3.5,-0.3,6.7,-0.5,9.8,-0.9m-26.6,0c3.2,0.5,6.5,0.6,9.9,0.9l0,16c-3.3,-0.1,-6.7,-0.3,-9.9,-0.8Zm-29.4,5.2l0,-14.5c2.2,1.2,4.4,2.4,6.9,3.4l0,15.3c-2.5,-1.2,-4.7,-2.7,-6.9,-4.2m13.9,7l0,-15.5c2.6,0.9,5.6,1.6,8.4,2.2l0,15.8c-2.9,-0.7,-5.6,-1.5,-8.4,-2.5m81.7,-5.9c5.6,-5.7,8.8,-12.3,8.8,-19.5l0,-22.9c0,-7.4,-3.5,-14.7,-10.2,-20.8c-1.5,-1.3,-3.6,-1.1,-4.9,0.2c-1.3,1.5,-1.3,3.7,0.2,4.9c5.2,4.7,7.9,10.2,8,15.7c0,16.5,-25,30.2,-54.6,30.2C101,243.5,76,229.6,76,213.3C76,199.5,93.6,187,118,183.8c2,-0.2,3.2,-1.9,3,-3.9c-0.2,-2,-2,-3.2,-3.9,-3C88.7,180.6,69,195.7,68.8,213.3l0,22.9c0,21,27.2,37.3,61.7,37.3c22.6,-0.2,42.2,-7.2,52.8,-17.8Z" class="quick-trade-4" />
+
+</svg>
diff --git a/web/public/assets/images/spinner.gif b/web/public/assets/images/spinner.gif
new file mode 100644
index 0000000000..1448c29d54
Binary files /dev/null and b/web/public/assets/images/spinner.gif differ
diff --git a/web/public/assets/images/upload-01.svg b/web/public/assets/images/upload-01.svg
new file mode 100644
index 0000000000..a7fd1fb69f
--- /dev/null
+++ b/web/public/assets/images/upload-01.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" viewBox="0 0 25 25" overflow="visible" xml:space="preserve">
+<path id="Subtraction_61" fill="#0000FF" d="M17.8,22.9H7.2c-2.9,0-5.2-2.3-5.2-5.2V7.2c0-2.9,2.3-5.2,5.2-5.2h10.5
+	c2.9,0,5.2,2.3,5.2,5.2v10.5C22.9,20.6,20.6,22.9,17.8,22.9z M6.2,14.7c-0.4,0-0.6,0.3-0.6,0.6v3c0,0,0,0.1,0,0.1
+	c0,0.3,0.3,0.6,0.6,0.6h12.2c0.3,0,0.6-0.2,0.6-0.5c0-0.1,0-0.1,0-0.2v-3c0-0.2-0.1-0.3-0.2-0.5c-0.1-0.1-0.3-0.2-0.5-0.2
+	c-0.4,0-0.6,0.3-0.6,0.6v2.4H6.8v-2.4C6.8,15,6.6,14.7,6.2,14.7z M11.7,7.1V14c0,0.2,0.1,0.4,0.2,0.5c0.1,0.1,0.3,0.2,0.5,0.2
+	c0.4,0,0.7-0.3,0.7-0.7V7.1L15.1,9c0.1,0.1,0.3,0.2,0.5,0.2c0.4,0,0.7-0.3,0.7-0.7c0-0.2-0.1-0.4-0.2-0.5L13,4.8l0,0
+	c-0.1-0.1-0.3-0.2-0.4-0.2h0h0h-0.1c0,0-0.1,0-0.1,0h0h0c-0.2,0-0.3,0.1-0.4,0.2l0,0c0,0,0,0,0,0L8.8,7.9C8.5,8.2,8.5,8.7,8.8,9
+	C9,9.1,9.1,9.2,9.3,9.2c0.2,0,0.4-0.1,0.5-0.2L11.7,7.1L11.7,7.1z"/>
+</svg>
diff --git a/web/public/bank_verification.js b/web/public/bank_verification.js
new file mode 100644
index 0000000000..53747051b3
--- /dev/null
+++ b/web/public/bank_verification.js
@@ -0,0 +1 @@
+!function(t,e){for(var n in e)t[n]=e[n]}(exports,function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=108)}([function(t,e){t.exports=require("react")},function(t,e){t.exports=require("classnames")},function(t,e,n){var r=n(4),o=n(20),i=n(11),c=n(10),a=n(57),f=function(t,e,n){var u,s,l,p,d=t&f.F,_=t&f.G,v=t&f.S,m=t&f.P,b=t&f.B,y=_?r:v?r[e]||(r[e]={}):(r[e]||{}).prototype,h=_?o:o[e]||(o[e]={}),g=h.prototype||(h.prototype={});for(u in _&&(n=e),n)l=((s=!d&&y&&void 0!==y[u])?y:n)[u],p=b&&s?a(l,r):m&&"function"==typeof l?a(Function.call,l):l,y&&c(y,u,l,t&f.U),h[u]!=l&&i(h,u,p),m&&g[u]!=l&&(g[u]=l)};r.core=o,f.F=1,f.G=2,f.S=4,f.P=8,f.B=16,f.W=32,f.U=64,f.R=128,t.exports=f},function(t,e,n){t.exports=!n(5)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e,n){var r=n(23)("wks"),o=n(19),i=n(4).Symbol,c="function"==typeof i;(t.exports=function(t){return r[t]||(r[t]=c&&i[t]||(c?i:o)("Symbol."+t))}).store=r},function(t,e,n){var r=n(8),o=n(52),i=n(35),c=Object.defineProperty;e.f=n(3)?Object.defineProperty:function(t,e,n){if(r(t),e=i(e,!0),r(n),o)try{return c(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(9);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(4),o=n(11),i=n(12),c=n(19)("src"),a=n(71),f=(""+a).split("toString");n(20).inspectSource=function(t){return a.call(t)},(t.exports=function(t,e,n,a){var u="function"==typeof n;u&&(i(n,"name")||o(n,"name",e)),t[e]!==n&&(u&&(i(n,c)||o(n,c,t[e]?""+t[e]:f.join(String(e)))),t===r?t[e]=n:a?t[e]?t[e]=n:o(t,e,n):(delete t[e],o(t,e,n)))})(Function.prototype,"toString",(function(){return"function"==typeof this&&this[c]||a.call(this)}))},function(t,e,n){var r=n(7),o=n(18);t.exports=n(3)?function(t,e,n){return r.f(t,e,o(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(40),o=n(41);t.exports=function(t){return r(o(t))}},function(t,e){t.exports=require("redux-form")},function(t,e,n){var r=n(59),o=n(43);t.exports=Object.keys||function(t){return r(t,o)}},function(t,e){function n(){return t.exports=n=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},n.apply(this,arguments)}t.exports=n},function(t,e){function n(e){return t.exports=n=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},n(e)}t.exports=n},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e){var n=t.exports={version:"2.6.12"};"number"==typeof __e&&(__e=n)},function(t,e,n){var r=n(41);t.exports=function(t){return Object(r(t))}},function(t,e){t.exports=require("react-device-detect")},function(t,e,n){var r=n(20),o=n(4),i=o["__core-js_shared__"]||(o["__core-js_shared__"]={});(t.exports=function(t,e){return i[t]||(i[t]=void 0!==e?e:{})})("versions",[]).push({version:r.version,mode:n(24)?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(t,e){t.exports=!1},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e){e.f={}.propertyIsEnumerable},function(t,e,n){"use strict";var r=n(5);t.exports=function(t,e){return!!t&&r((function(){e?t.call(null,(function(){}),1):t.call(null)}))}},function(t,e){t.exports=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}},function(t,e){function n(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}t.exports=function(t,e,r){return e&&n(t.prototype,e),r&&n(t,r),t}},function(t,e,n){var r=n(79);t.exports=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&r(t,e)}},function(t,e,n){var r=n(48),o=n(80);t.exports=function(t,e){return!e||"object"!==r(e)&&"function"!=typeof e?o(t):e}},function(t,e){t.exports=require("react-redux")},function(t,e){t.exports=require("react-svg")},function(t,e,n){var r=n(98);t.exports=function(t,e){if(null==t)return{};var n,o,i=r(t,e);if(Object.getOwnPropertySymbols){var c=Object.getOwnPropertySymbols(t);for(o=0;o<c.length;o++)n=c[o],e.indexOf(n)>=0||Object.prototype.propertyIsEnumerable.call(t,n)&&(i[n]=t[n])}return i}},function(t,e,n){var r=n(9);t.exports=function(t,e){if(!r(t))return t;var n,o;if(e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;if("function"==typeof(n=t.valueOf)&&!r(o=n.call(t)))return o;if(!e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){"use strict";var r=n(72),o={};o[n(6)("toStringTag")]="z",o+""!="[object z]"&&n(10)(Object.prototype,"toString",(function(){return"[object "+r(this)+"]"}),!0)},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e,n){var r=n(8),o=n(58),i=n(43),c=n(42)("IE_PROTO"),a=function(){},f=function(){var t,e=n(53)("iframe"),r=i.length;for(e.style.display="none",n(74).appendChild(e),e.src="javascript:",(t=e.contentWindow.document).open(),t.write("<script>document.F=Object<\/script>"),t.close(),f=t.F;r--;)delete f.prototype[i[r]];return f()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[c]=t):n=f(),void 0===e?n:o(n,e)}},function(t,e,n){var r=n(37);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e){t.exports=function(t){if(null==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e,n){var r=n(23)("keys"),o=n(19);t.exports=function(t){return r[t]||(r[t]=o(t))}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e,n){var r=n(59),o=n(43).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,o)}},function(t,e,n){var r=n(57),o=n(40),i=n(21),c=n(61),a=n(90);t.exports=function(t,e){var n=1==t,f=2==t,u=3==t,s=4==t,l=6==t,p=5==t||l,d=e||a;return function(e,a,_){for(var v,m,b=i(e),y=o(b),h=r(a,_,3),g=c(y.length),x=0,E=n?d(e,g):f?d(e,0):void 0;g>x;x++)if((p||x in y)&&(m=h(v=y[x],x,b),t))if(n)E[x]=m;else if(m)switch(t){case 3:return!0;case 5:return v;case 6:return x;case 2:E.push(v)}else if(s)return!1;return l?-1:u||s?s:E}}},function(t,e,n){var r=n(7).f,o=n(12),i=n(6)("toStringTag");t.exports=function(t,e,n){t&&!o(t=n?t:t.prototype,i)&&r(t,i,{configurable:!0,value:e})}},function(t,e){t.exports={}},function(t,e){function n(e){return"function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?t.exports=n=function(t){return typeof t}:t.exports=n=function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},n(e)}t.exports=n},function(t,e,n){"use strict";var r=n(68),o=n.n(r)()((function(t){return t[1]}));o.push([t.i,":root {\n    /*_________________________________*/\n\n    /*COLOR MANAGEMENT*/\n\n    /*_________________________________*/\n\n    --base_background: #ffffff;\n    --base_top-bar-navigation: #000000;\n    --base_secondary-navigation-bar: #f2f2f3;\n    --base_wallet-sidebar-and-popup: #ffffff;\n    --base_footer: #000000;\n\n    --labels_important-active-labels-text-graphics: #000000;\n    --labels_secondary-inactive-label-text-graphics: #808080;\n    --calculated_important-border: #000000b3;\n    --calculated_secondary-border: #00000054;\n    --calculated_footer_border: #ffffff26;\n    --calculated_super-pale_label-text-graphics: #00000026;\n    --labels_fields: #f0f1f1;\n    --labels_inactive-button: #535353;\n\n    --trading_selling-related-elements: #ee4036;\n    --trading_buying-related-elements: #00a69c;\n\n    --specials_buttons-links-and-highlights: #0066b4;\n    --specials_chat-messages: #98ccb2;\n    --specials_my-username-in-chat: #ffff00;\n    --specials_checks-okay-done: #008000;\n    --specials_pending-waiting-caution: #f6921e;\n    --specials_notifications-alerts-warnings: #ed1c24;\n\n    /*_________________________________*/\n\n    /*Calculated colors*/\n\n    /*_________________________________*/\n\n    --calculated_market-card_gradient_background: #ffffff;\n    --calculated_trading_selling-sparkline-fill: #ee40364d;\n    --calculated_trading_buying-sparkline-fill: #00a69c4d;\n    --calculated_trading_selling-orderbook-bar: #ee40361f;\n    --calculated_trading_buying-orderbook-bar: #00a69c1f;\n    --calculated_trading_buying-related-text: #000000;\n    --calculated_trading_selling-related-text: #ffffff;\n    --calculated_base_modal-overlay: #ffffffbf;\n    --calculated_landing_background: #ffffff59;\n    --calculated_landing_markets_table: #ffffffc2;\n    --calculated_specials_highlight-box: #0066b41a;\n    --calculated_base_top-bar-navigation_text: #ffffff;\n    --calculated_base_top-bar-navigation_text-inactive: #ffffffb3;\n    --calculated_base_footer_text: #ffffff;\n    --calculated_trad-view_watermark: #0000001a;\n    --calculated_trad-view_axis: #00000080;\n    --calculated_trad-view_text: #000000cc;\n    --calculated_specials_notifications-alerts-inactive: #ed1c24bf;\n    --calculated_specials_notifications-alerts-text: #ffffff;\n    --calculated_specials_notifications-pending-text: #ffffff;\n    --calculated_specials_notifications-success-text: #ffffff;\n\n    /*_________________________________*/\n\n    /*_____Remaining_____*/\n    --dark-accordion-arrow-active: #ffffff;\n\n    /*______coins______*/\n    --coin-eur: #06773d;\n    --coin-eur-text: #ffffff;\n    --coin-usd: #01592e;\n    --coin-usd-text: #ffffff;\n    --coin-jpy: #e0dfc7;\n    --coin-jpy-text: #000000;\n    --coin-gbp: #482e6e;\n    --coin-gbp-text: #ffffff;\n    --coin-chf: #ed1c24;\n    --coin-chf-text: #ffffff;\n    --coin-cad: #d7ce58;\n    --coin-cad-text: #000000;\n    --coin-aud: #19441f;\n    --coin-aud-text: #ffffff;\n    --coin-nzd: #b3498c;\n    --coin-nzd-text: #ffffff;\n    --coin-zar: #d8d3a0;\n    --coin-zar-text: #000000;\n    --coin-hkd: #f48f9b;\n    --coin-hkd-text: #000000;\n    --coin-krw: #f9ee02;\n    --coin-krw-text: #000000;\n    --coin-cny: #ec008c;\n    --coin-cny-text: #ffffff;\n    --coin-sgd: #720f15;\n    --coin-sgd-text: #ffffff;\n    --coin-btc: #f7941d;\n    --coin-btc-text: #000000;\n    --coin-eth: #3e4ea1;\n    --coin-eth-text: #ffffff;\n    --coin-ltc: #bcbec0;\n    --coin-ltc-text: #000000;\n    --coin-bch: #8dc541;\n    --coin-bch-text: #000000;\n    --coin-xrp: #414042;\n    --coin-xrp-text: #ffffff;\n    --coin-xht: #000000;\n    --coin-xht-text: #ffffff;\n    --coin-eos: #58595b;\n    --coin-eos-text: #ffffff;\n    --coin-bnb: #f1ba2a;\n    --coin-bnb-text: #000000;\n    --coin-link: #1b75bc;\n    --coin-link-text: #ffffff;\n    --coin-trx: #a22d25;\n    --coin-trx-text: #ffffff;\n    --coin-ada: #3667b2;\n    --coin-ada-text: #ffffff;\n    --coin-matic: #2aaae2;\n    --coin-matic-text: #ffffff;\n    --coin-neo: #bcbec0;\n    --coin-neo-text: #000000;\n    --coin-etc: #009444;\n    --coin-etc-text: #000000;\n    --coin-xlm: #808285;\n    --coin-xlm-text: #ffffff;\n    --coin-xmr: #f15a29;\n    --coin-xmr-text: #ffffff;\n    --coin-zec: #fbb040;\n    --coin-zec-text: #000000;\n    --coin-one: #939598;\n    --coin-one-text: #ffffff;\n    --coin-pax: #163526;\n    --coin-pax-text: #ffffff;\n    --coin-usdc: #4d7d91;\n    --coin-usdc-text: #ffffff;\n    --coin-usdt: #2bb673;\n    --coin-usdt-text: #ffffff;\n    --coin-vet: #454c7d;\n    --coin-vet-text: #ffffff;\n    --coin-btt: #c49a6c;\n    --coin-btt-text: #ffffff;\n    --coin-qtum: #96daf7;\n    --coin-qtum-text: #000000;\n    --coin-algo: #594a42;\n    --coin-algo-text: #ffffff;\n    --coin-rvn: #662d91;\n    --coin-rvn-text: #ffffff;\n    --coin-iota: #603913;\n    --coin-iota-text: #ffffff;\n    --coin-dash: #417ec1;\n    --coin-dash-text: #ffffff;\n    --coin-bsv: #a09032;\n    --coin-bsv-text: #ffffff;\n    --coin-ont: #00a79d;\n    --coin-ont-text: #ffffff;\n    --coin-atom: #796184;\n    --coin-atom-text: #ffffff;\n    --coin-celr: #726658;\n    --coin-celr-text: #ffffff;\n    --coin-omg: #8e7fbb;\n    --coin-omg-text: #ffffff;\n    --coin-hot: #8b5e3c;\n    --coin-hot-text: #ffffff;\n    --coin-tusd: #002868;\n    --coin-tusd-text: #ffffff;\n    --coin-dai: #f3c27a;\n    --coin-dai-text: #000000;\n}\n\n\nh1 {\n    color: var(--labels_important-active-labels-text-graphics)\n}",""]),e.a=o},function(t,e){t.exports=require("redux")},function(t,e,n){"use strict";n(70);var r=n(8),o=n(54),i=n(3),c=/./.toString,a=function(t){n(10)(RegExp.prototype,"toString",t,!0)};n(5)((function(){return"/a/b"!=c.call({source:"a",flags:"b"})}))?a((function(){var t=r(this);return"/".concat(t.source,"/","flags"in t?t.flags:!i&&t instanceof RegExp?o.call(t):void 0)})):"toString"!=c.name&&a((function(){return c.call(this)}))},function(t,e,n){t.exports=!n(3)&&!n(5)((function(){return 7!=Object.defineProperty(n(53)("div"),"a",{get:function(){return 7}}).a}))},function(t,e,n){var r=n(9),o=n(4).document,i=r(o)&&r(o.createElement);t.exports=function(t){return i?o.createElement(t):{}}},function(t,e,n){"use strict";var r=n(8);t.exports=function(){var t=r(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},function(t,e,n){var r=Date.prototype,o=r.toString,i=r.getTime;new Date(NaN)+""!="Invalid Date"&&n(10)(r,"toString",(function(){var t=i.call(this);return t==t?o.call(this):"Invalid Date"}))},function(t,e,n){var r=n(2),o=n(39),i=n(38),c=n(8),a=n(9),f=n(5),u=n(75),s=(n(4).Reflect||{}).construct,l=f((function(){function t(){}return!(s((function(){}),[],t)instanceof t)})),p=!f((function(){s((function(){}))}));r(r.S+r.F*(l||p),"Reflect",{construct:function(t,e){i(t),c(e);var n=arguments.length<3?t:i(arguments[2]);if(p&&!l)return s(t,e,n);if(t==n){switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3])}var r=[null];return r.push.apply(r,e),new(u.apply(t,r))}var f=n.prototype,d=o(a(f)?f:Object.prototype),_=Function.apply.call(t,d,e);return a(_)?_:d}})},function(t,e,n){var r=n(38);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r=n(7),o=n(8),i=n(15);t.exports=n(3)?Object.defineProperties:function(t,e){o(t);for(var n,c=i(e),a=c.length,f=0;a>f;)r.f(t,n=c[f++],e[n]);return t}},function(t,e,n){var r=n(12),o=n(13),i=n(60)(!1),c=n(42)("IE_PROTO");t.exports=function(t,e){var n,a=o(t),f=0,u=[];for(n in a)n!=c&&r(a,n)&&u.push(n);for(;e.length>f;)r(a,n=e[f++])&&(~i(u,n)||u.push(n));return u}},function(t,e,n){var r=n(13),o=n(61),i=n(73);t.exports=function(t){return function(e,n,c){var a,f=r(e),u=o(f.length),s=i(c,u);if(t&&n!=n){for(;u>s;)if((a=f[s++])!=a)return!0}else for(;u>s;s++)if((t||s in f)&&f[s]===n)return t||s||0;return!t&&-1}}},function(t,e,n){var r=n(62),o=Math.min;t.exports=function(t){return t>0?o(r(t),9007199254740991):0}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(26),o=n(18),i=n(13),c=n(35),a=n(12),f=n(52),u=Object.getOwnPropertyDescriptor;e.f=n(3)?u:function(t,e){if(t=i(t),e=c(e,!0),f)try{return u(t,e)}catch(t){}if(a(t,e))return o(!r.f.call(t,e),t[e])}},function(t,e,n){var r=n(37);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){e.f=n(6)},function(t,e,n){"use strict";var r=n(100),o=n(101),i=n(47),c=n(13);t.exports=n(102)(Array,"Array",(function(t,e){this._t=c(t),this._i=0,this._k=e}),(function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,o(1)):o(0,"keys"==e?n:"values"==e?t[n]:[n,t[n]])}),"values"),i.Arguments=i.Array,r("keys"),r("values"),r("entries")},function(t,e,n){"use strict";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},i=function(){var t={};return function(e){if(void 0===t[e]){var n=document.querySelector(e);if(window.HTMLIFrameElement&&n instanceof window.HTMLIFrameElement)try{n=n.contentDocument.head}catch(t){n=null}t[e]=n}return t[e]}}(),c=[];function a(t){for(var e=-1,n=0;n<c.length;n++)if(c[n].identifier===t){e=n;break}return e}function f(t,e){for(var n={},r=[],o=0;o<t.length;o++){var i=t[o],f=e.base?i[0]+e.base:i[0],u=n[f]||0,s="".concat(f," ").concat(u);n[f]=u+1;var l=a(s),p={css:i[1],media:i[2],sourceMap:i[3]};-1!==l?(c[l].references++,c[l].updater(p)):c.push({identifier:s,updater:m(p,e),references:1}),r.push(s)}return r}function u(t){var e=document.createElement("style"),r=t.attributes||{};if(void 0===r.nonce){var o=n.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(t){e.setAttribute(t,r[t])})),"function"==typeof t.insert)t.insert(e);else{var c=i(t.insert||"head");if(!c)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");c.appendChild(e)}return e}var s,l=(s=[],function(t,e){return s[t]=e,s.filter(Boolean).join("\n")});function p(t,e,n,r){var o=n?"":r.media?"@media ".concat(r.media," {").concat(r.css,"}"):r.css;if(t.styleSheet)t.styleSheet.cssText=l(e,o);else{var i=document.createTextNode(o),c=t.childNodes;c[e]&&t.removeChild(c[e]),c.length?t.insertBefore(i,c[e]):t.appendChild(i)}}function d(t,e,n){var r=n.css,o=n.media,i=n.sourceMap;if(o?t.setAttribute("media",o):t.removeAttribute("media"),i&&"undefined"!=typeof btoa&&(r+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i))))," */")),t.styleSheet)t.styleSheet.cssText=r;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(r))}}var _=null,v=0;function m(t,e){var n,r,o;if(e.singleton){var i=v++;n=_||(_=u(e)),r=p.bind(null,n,i,!1),o=p.bind(null,n,i,!0)}else n=u(e),r=d.bind(null,n,e),o=function(){!function(t){if(null===t.parentNode)return!1;t.parentNode.removeChild(t)}(n)};return r(t),function(e){if(e){if(e.css===t.css&&e.media===t.media&&e.sourceMap===t.sourceMap)return;r(t=e)}else o()}}t.exports=function(t,e){(e=e||{}).singleton||"boolean"==typeof e.singleton||(e.singleton=o());var n=f(t=t||[],e);return function(t){if(t=t||[],"[object Array]"===Object.prototype.toString.call(t)){for(var r=0;r<n.length;r++){var o=a(n[r]);c[o].references--}for(var i=f(t,e),u=0;u<n.length;u++){var s=a(n[u]);0===c[s].references&&(c[s].updater(),c.splice(s,1))}n=i}}}},function(t,e,n){"use strict";t.exports=function(t){var e=[];return e.toString=function(){return this.map((function(e){var n=t(e);return e[2]?"@media ".concat(e[2]," {").concat(n,"}"):n})).join("")},e.i=function(t,n,r){"string"==typeof t&&(t=[[null,t,""]]);var o={};if(r)for(var i=0;i<this.length;i++){var c=this[i][0];null!=c&&(o[c]=!0)}for(var a=0;a<t.length;a++){var f=[].concat(t[a]);r&&o[f[0]]||(n&&(f[2]?f[2]="".concat(n," and ").concat(f[2]):f[2]=n),e.push(f))}},e}},function(t,e){t.exports=function(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},function(t,e,n){n(3)&&"g"!=/./g.flags&&n(7).f(RegExp.prototype,"flags",{configurable:!0,get:n(54)})},function(t,e,n){t.exports=n(23)("native-function-to-string",Function.toString)},function(t,e,n){var r=n(37),o=n(6)("toStringTag"),i="Arguments"==r(function(){return arguments}());t.exports=function(t){var e,n,c;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),o))?n:i?r(e):"Object"==(c=r(e))&&"function"==typeof e.callee?"Arguments":c}},function(t,e,n){var r=n(62),o=Math.max,i=Math.min;t.exports=function(t,e){return(t=r(t))<0?o(t+e,0):i(t,e)}},function(t,e,n){var r=n(4).document;t.exports=r&&r.documentElement},function(t,e,n){"use strict";var r=n(38),o=n(9),i=n(76),c=[].slice,a={},f=function(t,e,n){if(!(e in a)){for(var r=[],o=0;o<e;o++)r[o]="a["+o+"]";a[e]=Function("F,a","return new F("+r.join(",")+")")}return a[e](t,n)};t.exports=Function.bind||function(t){var e=r(this),n=c.call(arguments,1),a=function(){var r=n.concat(c.call(arguments));return this instanceof a?f(e,r.length,r):i(e,r,t)};return o(e.prototype)&&(a.prototype=e.prototype),a}},function(t,e){t.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},function(t,e,n){var r=n(2);r(r.S+r.F,"Object",{assign:n(78)})},function(t,e,n){"use strict";var r=n(3),o=n(15),i=n(25),c=n(26),a=n(21),f=n(40),u=Object.assign;t.exports=!u||n(5)((function(){var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=u({},t)[n]||Object.keys(u({},e)).join("")!=r}))?function(t,e){for(var n=a(t),u=arguments.length,s=1,l=i.f,p=c.f;u>s;)for(var d,_=f(arguments[s++]),v=l?o(_).concat(l(_)):o(_),m=v.length,b=0;m>b;)d=v[b++],r&&!p.call(_,d)||(n[d]=_[d]);return n}:u},function(t,e){function n(e,r){return t.exports=n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},n(e,r)}t.exports=n},function(t,e){t.exports=function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}},function(t,e,n){"use strict";n(82)("bold",(function(t){return function(){return t(this,"b","","")}}))},function(t,e,n){var r=n(2),o=n(5),i=n(41),c=/"/g,a=function(t,e,n,r){var o=String(i(t)),a="<"+e;return""!==n&&(a+=" "+n+'="'+String(r).replace(c,"&quot;")+'"'),a+">"+o+"</"+e+">"};t.exports=function(t,e){var n={};n[t]=e(a),r(r.P+r.F*o((function(){var e=""[t]('"');return e!==e.toLowerCase()||e.split('"').length>3})),"String",n)}},function(t,e,n){"use strict";var r=n(2),o=n(60)(!1),i=[].indexOf,c=!!i&&1/[1].indexOf(1,-0)<0;r(r.P+r.F*(c||!n(27)(i)),"Array",{indexOf:function(t){return c?i.apply(this,arguments)||0:o(this,t,arguments[1])}})},function(t,e,n){var r=n(2);r(r.S+r.F*!n(3),"Object",{defineProperty:n(7).f})},function(t,e,n){var r=n(2);r(r.S+r.F*!n(3),"Object",{defineProperties:n(58)})},function(t,e,n){var r=n(2),o=n(87),i=n(13),c=n(63),a=n(88);r(r.S,"Object",{getOwnPropertyDescriptors:function(t){for(var e,n,r=i(t),f=c.f,u=o(r),s={},l=0;u.length>l;)void 0!==(n=f(r,e=u[l++]))&&a(s,e,n);return s}})},function(t,e,n){var r=n(44),o=n(25),i=n(8),c=n(4).Reflect;t.exports=c&&c.ownKeys||function(t){var e=r.f(i(t)),n=o.f;return n?e.concat(n(t)):e}},function(t,e,n){"use strict";var r=n(7),o=n(18);t.exports=function(t,e,n){e in t?r.f(t,e,o(0,n)):t[e]=n}},function(t,e,n){"use strict";var r=n(2),o=n(45)(0),i=n(27)([].forEach,!0);r(r.P+r.F*!i,"Array",{forEach:function(t){return o(this,t,arguments[1])}})},function(t,e,n){var r=n(91);t.exports=function(t,e){return new(r(t))(e)}},function(t,e,n){var r=n(9),o=n(64),i=n(6)("species");t.exports=function(t){var e;return o(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!o(e.prototype)||(e=void 0),r(e)&&null===(e=e[i])&&(e=void 0)),void 0===e?Array:e}},function(t,e,n){"use strict";var r=n(2),o=n(45)(2);r(r.P+r.F*!n(27)([].filter,!0),"Array",{filter:function(t){return o(this,t,arguments[1])}})},function(t,e,n){"use strict";var r=n(4),o=n(12),i=n(3),c=n(2),a=n(10),f=n(94).KEY,u=n(5),s=n(23),l=n(46),p=n(19),d=n(6),_=n(65),v=n(95),m=n(96),b=n(64),y=n(8),h=n(9),g=n(21),x=n(13),E=n(35),O=n(18),N=n(39),S=n(97),I=n(63),C=n(25),w=n(7),A=n(15),T=I.f,R=w.f,j=S.f,F=r.Symbol,P=r.JSON,k=P&&P.stringify,L=d("_hidden"),M=d("toPrimitive"),U={}.propertyIsEnumerable,B=s("symbol-registry"),D=s("symbols"),V=s("op-symbols"),K=Object.prototype,W="function"==typeof F&&!!C.f,G=r.QObject,H=!G||!G.prototype||!G.prototype.findChild,z=i&&u((function(){return 7!=N(R({},"a",{get:function(){return R(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=T(K,e);r&&delete K[e],R(t,e,n),r&&t!==K&&R(K,e,r)}:R,q=function(t){var e=D[t]=N(F.prototype);return e._k=t,e},X=W&&"symbol"==typeof F.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof F},J=function(t,e,n){return t===K&&J(V,e,n),y(t),e=E(e,!0),y(n),o(D,e)?(n.enumerable?(o(t,L)&&t[L][e]&&(t[L][e]=!1),n=N(n,{enumerable:O(0,!1)})):(o(t,L)||R(t,L,O(1,{})),t[L][e]=!0),z(t,e,n)):R(t,e,n)},Q=function(t,e){y(t);for(var n,r=m(e=x(e)),o=0,i=r.length;i>o;)J(t,n=r[o++],e[n]);return t},Y=function(t){var e=U.call(this,t=E(t,!0));return!(this===K&&o(D,t)&&!o(V,t))&&(!(e||!o(this,t)||!o(D,t)||o(this,L)&&this[L][t])||e)},Z=function(t,e){if(t=x(t),e=E(e,!0),t!==K||!o(D,e)||o(V,e)){var n=T(t,e);return!n||!o(D,e)||o(t,L)&&t[L][e]||(n.enumerable=!0),n}},$=function(t){for(var e,n=j(x(t)),r=[],i=0;n.length>i;)o(D,e=n[i++])||e==L||e==f||r.push(e);return r},tt=function(t){for(var e,n=t===K,r=j(n?V:x(t)),i=[],c=0;r.length>c;)!o(D,e=r[c++])||n&&!o(K,e)||i.push(D[e]);return i};W||(a((F=function(){if(this instanceof F)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===K&&e.call(V,n),o(this,L)&&o(this[L],t)&&(this[L][t]=!1),z(this,t,O(1,n))};return i&&H&&z(K,t,{configurable:!0,set:e}),q(t)}).prototype,"toString",(function(){return this._k})),I.f=Z,w.f=J,n(44).f=S.f=$,n(26).f=Y,C.f=tt,i&&!n(24)&&a(K,"propertyIsEnumerable",Y,!0),_.f=function(t){return q(d(t))}),c(c.G+c.W+c.F*!W,{Symbol:F});for(var et="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),nt=0;et.length>nt;)d(et[nt++]);for(var rt=A(d.store),ot=0;rt.length>ot;)v(rt[ot++]);c(c.S+c.F*!W,"Symbol",{for:function(t){return o(B,t+="")?B[t]:B[t]=F(t)},keyFor:function(t){if(!X(t))throw TypeError(t+" is not a symbol!");for(var e in B)if(B[e]===t)return e},useSetter:function(){H=!0},useSimple:function(){H=!1}}),c(c.S+c.F*!W,"Object",{create:function(t,e){return void 0===e?N(t):Q(N(t),e)},defineProperty:J,defineProperties:Q,getOwnPropertyDescriptor:Z,getOwnPropertyNames:$,getOwnPropertySymbols:tt});var it=u((function(){C.f(1)}));c(c.S+c.F*it,"Object",{getOwnPropertySymbols:function(t){return C.f(g(t))}}),P&&c(c.S+c.F*(!W||u((function(){var t=F();return"[null]"!=k([t])||"{}"!=k({a:t})||"{}"!=k(Object(t))}))),"JSON",{stringify:function(t){for(var e,n,r=[t],o=1;arguments.length>o;)r.push(arguments[o++]);if(n=e=r[1],(h(e)||void 0!==t)&&!X(t))return b(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!X(e))return e}),r[1]=e,k.apply(P,r)}}),F.prototype[M]||n(11)(F.prototype,M,F.prototype.valueOf),l(F,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},function(t,e,n){var r=n(19)("meta"),o=n(9),i=n(12),c=n(7).f,a=0,f=Object.isExtensible||function(){return!0},u=!n(5)((function(){return f(Object.preventExtensions({}))})),s=function(t){c(t,r,{value:{i:"O"+ ++a,w:{}}})},l=t.exports={KEY:r,NEED:!1,fastKey:function(t,e){if(!o(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!i(t,r)){if(!f(t))return"F";if(!e)return"E";s(t)}return t[r].i},getWeak:function(t,e){if(!i(t,r)){if(!f(t))return!0;if(!e)return!1;s(t)}return t[r].w},onFreeze:function(t){return u&&l.NEED&&f(t)&&!i(t,r)&&s(t),t}}},function(t,e,n){var r=n(4),o=n(20),i=n(24),c=n(65),a=n(7).f;t.exports=function(t){var e=o.Symbol||(o.Symbol=i?{}:r.Symbol||{});"_"==t.charAt(0)||t in e||a(e,t,{value:c.f(t)})}},function(t,e,n){var r=n(15),o=n(25),i=n(26);t.exports=function(t){var e=r(t),n=o.f;if(n)for(var c,a=n(t),f=i.f,u=0;a.length>u;)f.call(t,c=a[u++])&&e.push(c);return e}},function(t,e,n){var r=n(13),o=n(44).f,i={}.toString,c="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return c&&"[object Window]"==i.call(t)?function(t){try{return o(t)}catch(t){return c.slice()}}(t):o(r(t))}},function(t,e){t.exports=function(t,e){if(null==t)return{};var n,r,o={},i=Object.keys(t);for(r=0;r<i.length;r++)n=i[r],e.indexOf(n)>=0||(o[n]=t[n]);return o}},function(t,e,n){for(var r=n(66),o=n(15),i=n(10),c=n(4),a=n(11),f=n(47),u=n(6),s=u("iterator"),l=u("toStringTag"),p=f.Array,d={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},_=o(d),v=0;v<_.length;v++){var m,b=_[v],y=d[b],h=c[b],g=h&&h.prototype;if(g&&(g[s]||a(g,s,p),g[l]||a(g,l,b),f[b]=p,y))for(m in r)g[m]||i(g,m,r[m],!0)}},function(t,e,n){var r=n(6)("unscopables"),o=Array.prototype;null==o[r]&&n(11)(o,r,{}),t.exports=function(t){o[r][t]=!0}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){"use strict";var r=n(24),o=n(2),i=n(10),c=n(11),a=n(47),f=n(103),u=n(46),s=n(104),l=n(6)("iterator"),p=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,_,v,m,b){f(n,e,_);var y,h,g,x=function(t){if(!p&&t in S)return S[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},E=e+" Iterator",O="values"==v,N=!1,S=t.prototype,I=S[l]||S["@@iterator"]||v&&S[v],C=I||x(v),w=v?O?x("entries"):C:void 0,A="Array"==e&&S.entries||I;if(A&&(g=s(A.call(new t)))!==Object.prototype&&g.next&&(u(g,E,!0),r||"function"==typeof g[l]||c(g,l,d)),O&&I&&"values"!==I.name&&(N=!0,C=function(){return I.call(this)}),r&&!b||!p&&!N&&S[l]||c(S,l,C),a[e]=C,a[E]=d,v)if(y={values:O?C:x("values"),keys:m?C:x("keys"),entries:w},b)for(h in y)h in S||i(S,h,y[h]);else o(o.P+o.F*(p||N),e,y);return y}},function(t,e,n){"use strict";var r=n(39),o=n(18),i=n(46),c={};n(11)(c,n(6)("iterator"),(function(){return this})),t.exports=function(t,e,n){t.prototype=r(c,{next:o(1,n)}),i(t,e+" Iterator")}},function(t,e,n){var r=n(12),o=n(21),i=n(42)("IE_PROTO"),c=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=o(t),r(t,i)?t[i]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?c:null}},function(t,e,n){var r=n(21),o=n(15);n(106)("keys",(function(){return function(t){return o(r(t))}}))},function(t,e,n){var r=n(2),o=n(20),i=n(5);t.exports=function(t,e){var n=(o.Object||{})[t]||Object[t],c={};c[t]=e(n),r(r.S+r.F*i((function(){n(1)})),"Object",c)}},function(t,e,n){"use strict";var r=n(2),o=n(45)(1);r(r.P+r.F*!n(27)([].map,!0),"Array",{map:function(t){return o(this,t,arguments[1])}})},function(t,e,n){"use strict";n.r(e);var r=n(0),o=n.n(r),i=(n(51),n(55),n(36),n(56),n(77),n(28)),c=n.n(i),a=n(29),f=n.n(a),u=n(30),s=n.n(u),l=n(31),p=n.n(l),d=n(17),_=n.n(d),v=n(32),m=n(14),b=n(22),y=(n(81),n(1)),h=n.n(y),g=function(t){var e=t.label,n=t.onClick,r=t.type,i=t.disabled,c=t.className,a=t.autoFocus,f=void 0!==a&&a;return o.a.createElement("button",{type:r,onClick:n,className:h()("exir-button","mdc-button","mdc-button--unelevated","exir-button-font",{disabled:i},c),disabled:i,autoFocus:f},e)};g.defaultProps={type:"submit",disabled:!1,className:""};n(83);var x=n(33),E=function(t){var e=t.icon,n=t.alt,r=t.wrapperClassName,i=t.imageWrapperClassName,c=t.svgWrapperClassName,a=t.beforeInjection,f=void 0===a?function(){}:a,u=e.indexOf(".svg")>0;return o.a.createElement("span",null,e&&u&&o.a.createElement(x.ReactSVG,{src:e,className:h()(r,c),beforeInjection:f,fallback:function(){return o.a.createElement("img",{src:e,alt:n,className:h()(r,c)})}}),e&&!u&&o.a.createElement("img",{src:e,alt:n,className:h()(r,i,"object-fit-contain")}))};E.defaultProps={icon:"",iconId:"",stringId:"",alt:"",wrapperClassName:"",imageWrapperClassName:"",svgWrapperClassName:"",showUpload:!0};var O=function(t){var e=t.text,n=t.iconPath,r=t.textType,i=t.underline,c=t.className,a=t.imageWrapperClassName,f=void 0===a?"":a;return o.a.createElement("div",{className:h()("icon_title-wrapper",{underline:i},c)},n&&o.a.createElement(E,{icon:n,alt:e,wrapperClassName:f,imageWrapperClassName:"icon_title-image",svgWrapperClassName:"icon_title-svg",showUpload:!1}),o.a.createElement("div",{className:h()("icon_title-text","text-center",r)},e))};O.defaultProps={iconPath:"",textType:"",underline:!1};var N=function(t){var e=t.title,n=t.children,r=t.openContactForm,i=t.icon,c=t.strings,a=void 0===c?{}:c,f=t.icons,u=void 0===f?{}:f;return o.a.createElement("div",{className:"header_title-wrapper d-flex flex-column w-100 f-1"},o.a.createElement("div",{className:"d-flex"},!!i&&o.a.createElement("div",{className:"mr-2"},o.a.createElement(E,{icon:i,wrapperClassName:"header_title-icon"})),o.a.createElement("div",null,o.a.createElement("div",{className:"d-flex justify-content-between w-100 f-1"},o.a.createElement("div",{className:"header_title-text font-weight-bold"},e),!!r&&o.a.createElement("div",{className:"header_title-action"},o.a.createElement(I,{stringId:"NEED_HELP_TEXT",text:a.NEED_HELP_TEXT,status:"information",iconId:"BLUE_QUESTION",iconPath:u.BLUE_QUESTION,onClick:r}))),n&&o.a.createElement("div",{className:"header_title-children"},n))))},S=function(t){switch(t){case"success":return"notification-success";case"warning":return"notification-warning";case"information":return"notification-info";case"disabled":return"notification-disabled";case"loading":return"notification-loading";default:return""}},I=function(t){var e=t.text,n=t.stringId,r=t.status,i=t.onClick,c=t.iconId,a=t.iconPath,f=t.className,u=t.reverseImage,s=t.textPosition,l=t.iconPosition,p=t.showPointer,d=t.rotate,_=t.rotateIfLtr,v=t.rotateIfRtl,m=t.showActionText,y=t.disable,g=void 0!==y&&y;return o.a.createElement("div",{className:h()("action_notification-wrapper",{pointer:!g&&p,left:"left"===s,right:"right"===s,"icon_on-right":"right"===l,"icon_on-left":"left"===l,disabled:g},f),onClick:function(t){var e=t.target.dataset,n=void 0===e?{}:e,r=n.stringId,o=n.iconId;if(!g&&!r&&!o&&i)return i()}},(m||!b.isMobile)&&o.a.createElement("div",{className:h()("action_notification-text",S(r))},e),o.a.createElement(E,{iconId:c,stringId:n,icon:a,alt:e,svgWrapperClassName:"action_notification-svg",imageWrapperClassName:h()("action_notification-image",{rotate_ltr:_,rotate_rtl:v,rotate:d,reverse:u})}))};I.defaultProps={text:"",status:"information",iconPath:"",className:"",reverseImage:!1,textPosition:"right",iconPosition:"right",showPointer:!0,rotate:!1,rotateIfRtl:!1,rotateIfLtr:!1};var C=n(67),w=n.n(C),A=n(49),T={insert:"head",singleton:!1},R=(w()(A.a,T),A.a.locals,n(84),n(85),n(86),n(89),n(92),n(93),n(16)),j=n.n(R),F=n(69),P=n.n(F),k=n(34),L=n.n(k),M=(n(99),n(66),n(105),n(107),n(48)),U=n.n(M);function B(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_()(t);if(e){var o=_()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return p()(this,n)}}var D=function(t){var e=t.label,n=void 0===e?"":e,r=t.valid,i=void 0!==r&&r,c=t.hasValue,a=void 0!==c&&c,f=t.focused,u=void 0!==f&&f,s=t.children,l=t.hideUnderline,p=void 0!==l&&l,d=t.contentClassName,_=void 0===d?"":d,v=t.hideCheck,m=void 0!==v&&v,b=t.outlineClassName,y=void 0===b?"":b,g=t.staticIcons,E=void 0===g?{}:g;return o.a.createElement("div",{className:h()("field-content")},o.a.createElement("div",{className:"d-flex"},n&&o.a.createElement("div",{className:"field-label"},n)),o.a.createElement("div",{className:h()("field-children",{valid:i,custom:p},_)},s,!m&&i&&a&&o.a.createElement(x.ReactSVG,{src:E.BLACK_CHECK,className:"field-valid"})),!p&&o.a.createElement("span",{className:h()("field-content-outline",y,{focused:u})}))},V=function(t){var e=t.error,n=t.displayError,r=t.className,i=t.staticIcons,c=void 0===i?{}:i,a=t.getErrorLocalized;return o.a.createElement("div",{className:h()("field-error-content",r,{"field-error-hidden":!n})},e&&o.a.createElement("img",{src:c.RED_WARNING,className:"field-error-icon",alt:"error"}),e&&o.a.createElement("span",{className:"field-error-text"},a(e)))},K=function(t){s()(n,t);var e=B(n);function n(){return c()(this,n),e.apply(this,arguments)}return f()(n,[{key:"render",value:function(){var t=this.props,e=t.children,n=t.label,r=t.stringId,i=t.input.value,c=t.meta,a=c.active,f=void 0!==a&&a,u=c.error,s=void 0===u?"":u,l=c.touched,p=void 0!==l&&l,d=c.invalid,_=void 0!==d&&d,v=t.focused,m=void 0!==v&&v,b=t.fullWidth,y=void 0!==b&&b,g=t.visited,x=void 0!==g&&g,E=t.hideUnderline,O=void 0!==E&&E,N=t.className,S=void 0===N?"":N,C=t.onClick,w=void 0===C?function(){}:C,A=t.notification,T=t.hideCheck,R=void 0!==T&&T,F=t.outlineClassName,P=void 0===F?"":F,k=t.getErrorLocalized,L=void 0===k?function(t){return t}:k,M=t.staticIcons,B=void 0===M?{}:M,K=!(f||m)&&(x||p)&&s,W=i||!1===i;return o.a.createElement("div",{className:h()("field-wrapper",S,{error:K,inline:!y,"with-notification":!!A,"field-valid":!_})},o.a.createElement(D,{stringId:r,label:n,valid:!_,hasValue:W,focused:f||m,hideUnderline:O,hideCheck:R,outlineClassName:P,onClick:w,staticIcons:B},e,A&&"object"===U()(A)&&o.a.createElement(I,j()({},A,{className:h()("pr-0 pl-0 no_bottom",{"with-tick-icon":y&&!_&&!R}),showActionText:!0}))),o.a.createElement(V,{displayError:K,error:s,staticIcons:B,getErrorLocalized:L}))}}]),n}(r.Component);K.defaultProps={meta:{},input:{value:""}};var W=K,G=function(t){var e,n,r,i,c,a=t.input,f=t.type,u=t.placeholder,s=t.meta,l=s.touched,p=s.error,d=s.active,_=(t.onClick,t.fullWidth,t.information,t.notification,t.options),v=(t.hideCheck,t.outlineClassName,t.stringId,L()(t,["input","type","placeholder","meta","onClick","fullWidth","information","notification","options","hideCheck","outlineClassName","stringId"])),m=l&&p&&!d;return o.a.createElement(W,t,o.a.createElement("div",{style:{display:"flex"}},_&&(n=(e=_).icon,r=void 0===n?"":n,i=e.label,c=void 0===i?"":i,o.a.createElement("div",null,o.a.createElement("img",{className:"input_icon",src:r,alt:c}))),o.a.createElement("input",j()({placeholder:u,className:h()("input_field-input",{error:m}),type:f},a,v))))};function H(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function z(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?H(Object(n),!0).forEach((function(e){P()(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):H(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}var q=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=arguments.length>1?arguments[1]:void 0;return o.a.createElement("div",null,Object.keys(t).map((function(n){var r=t[n],i=r.type,c=r.validate,a=void 0===c?[]:c,f=L()(r,["type","validate"]),u=z({callback:e,key:n,name:n,type:i,validate:a},f);switch(i){case"text":default:return o.a.createElement(m.Field,j()({component:G},u))}})))};function X(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_()(t);if(e){var o=_()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return p()(this,n)}}var J=function(t,e){return function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return n.length>t?e:void 0}},Q=function(t){return t?void 0:"required"},Y=function(t){s()(n,t);var e=X(n);function n(){var t;c()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i<r;i++)o[i]=arguments[i];return(t=e.call.apply(e,[this].concat(o))).state={formFields:{}},t.generateFormFields=function(){var e=t.props.strings,n=void 0===e?{}:e,r={};r.bank_name={type:"text",stringId:"USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_LABEL,USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_PLACEHOLDER",label:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_LABEL"],placeholder:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_PLACEHOLDER"],validate:[Q],fullWidth:b.isMobile},r.account_number={type:"text",stringId:"USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_LABEL,USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_PLACEHOLDER,USER_VERIFICATION.BANK_ACCOUNT_FORM.VALIDATIONS.ACCOUNT_NUMBER_MAX_LENGTH",label:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_LABEL"],placeholder:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_PLACEHOLDER"],validate:[Q,J(50,n["USER_VERIFICATION.BANK_ACCOUNT_FORM.VALIDATIONS.ACCOUNT_NUMBER_MAX_LENGTH"])],maxLength:50,fullWidth:b.isMobile},t.setState({formFields:r})},t.handleSubmit=function(e){var n=Object.assign({},e),r=t.props.verifyBankData;return(void 0===r?function(){}:r)(n).then((function(e){var n=e.data;t.props.moveToNextStep("bank",{bank_data:n}),t.props.setActivePageContent("email")})).catch((function(t){var e={_error:t.message};throw t.response&&t.response.data&&(e._error=t.response.data.message),new m.SubmissionError(e)}))},t.onGoBack=function(){t.props.setActivePageContent("email"),t.props.handleBack("bank")},t}return f()(n,[{key:"componentDidMount",value:function(){this.generateFormFields()}},{key:"render",value:function(){var t=this.props,e=t.handleSubmit,n=t.pristine,r=t.submitting,i=t.valid,c=t.error,a=t.openContactForm,f=t.icon,u=t.iconId,s=t.strings,l=void 0===s?{}:s,p=t.icons,d=void 0===p?{}:p,_=t.getErrorLocalized,v=void 0===_?function(){}:_,m=this.state.formFields;return o.a.createElement("div",{className:"presentation_container apply_rtl verification_container"},o.a.createElement(O,{stringId:"USER_VERIFICATION.BANK_VERIFICATION",text:l["USER_VERIFICATION.BANK_VERIFICATION"],textType:"title"}),o.a.createElement("form",{className:"d-flex flex-column w-100 verification_content-form-wrapper"},o.a.createElement(N,{stringId:"USER_VERIFICATION.TITLE_BANK_ACCOUNT",title:l["USER_VERIFICATION.TITLE_BANK_ACCOUNT"],iconId:u,icon:f,openContactForm:a,strings:l,icons:d},o.a.createElement("div",{className:"my-2"},l["USER_VERIFICATION.BANK_VERIFICATION_TEXT_1"]),o.a.createElement("div",{className:"my-2"},l["USER_VERIFICATION.BANK_VERIFICATION_TEXT_2"]),o.a.createElement("ul",{className:"pl-4"},o.a.createElement("li",{className:"my-1"},l["USER_VERIFICATION.BASE_WITHDRAWAL"]),o.a.createElement("li",{className:"my-1"},l["USER_VERIFICATION.BASE_DEPOSITS"]),o.a.createElement("li",{className:"my-1"},l["USER_VERIFICATION.WARNING.LIST_ITEM_3"]))),q(m),c&&o.a.createElement("div",{className:"warning_text"},v(c)),o.a.createElement("div",{className:"d-flex"},o.a.createElement("div",{className:"w-50"},o.a.createElement(g,{label:l["USER_VERIFICATION.GO_BACK"],onClick:this.onGoBack})),o.a.createElement("div",{className:"separator"}),o.a.createElement("div",{className:"w-50"},o.a.createElement(g,{label:l.SUBMIT,type:"button",onClick:e(this.handleSubmit),disabled:n||r||!i||!!c})))))}}]),n}(r.Component),Z=Object(m.reduxForm)({form:"BankVerification"})(Y),$=Object(v.connect)((function(){return{}}))(Z),tt=n(50),et=Object(tt.combineReducers)({form:m.reducer}),nt=Object(tt.createStore)(et);e.default=function(t){return o.a.createElement(v.Provider,{store:nt},o.a.createElement($,t))}}]));
\ No newline at end of file
diff --git a/web/public/bank_verification_home.js b/web/public/bank_verification_home.js
new file mode 100644
index 0000000000..bcf42cc678
--- /dev/null
+++ b/web/public/bank_verification_home.js
@@ -0,0 +1 @@
+!function(n,t){for(var e in t)n[e]=t[e]}(exports,function(n){var t={};function e(r){if(t[r])return t[r].exports;var o=t[r]={i:r,l:!1,exports:{}};return n[r].call(o.exports,o,o.exports,e),o.l=!0,o.exports}return e.m=n,e.c=t,e.d=function(n,t,r){e.o(n,t)||Object.defineProperty(n,t,{enumerable:!0,get:r})},e.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},e.t=function(n,t){if(1&t&&(n=e(n)),8&t)return n;if(4&t&&"object"==typeof n&&n&&n.__esModule)return n;var r=Object.create(null);if(e.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:n}),2&t&&"string"!=typeof n)for(var o in n)e.d(r,o,function(t){return n[t]}.bind(null,o));return r},e.n=function(n){var t=n&&n.__esModule?function(){return n.default}:function(){return n};return e.d(t,"a",t),t},e.o=function(n,t){return Object.prototype.hasOwnProperty.call(n,t)},e.p="",e(e.s=47)}([function(n,t){n.exports=require("react")},function(n,t){n.exports=require("classnames")},function(n,t){var e=n.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=e)},function(n,t,e){var r=e(2),o=e(6),i=e(11),a=e(30),c=e(14),f=function(n,t,e){var u,l,s,_,d=n&f.F,p=n&f.G,v=n&f.S,b=n&f.P,m=n&f.B,x=p?r:v?r[t]||(r[t]={}):(r[t]||{}).prototype,g=p?o:o[t]||(o[t]={}),h=g.prototype||(g.prototype={});for(u in p&&(e=t),e)s=((l=!d&&x&&void 0!==x[u])?x:e)[u],_=m&&l?c(s,r):b&&"function"==typeof s?c(Function.call,s):s,x&&a(x,u,s,n&f.U),g[u]!=s&&i(g,u,_),b&&h[u]!=s&&(h[u]=s)};r.core=o,f.F=1,f.G=2,f.S=4,f.P=8,f.B=16,f.W=32,f.U=64,f.R=128,n.exports=f},function(n,t){n.exports=function(n){return"object"==typeof n?null!==n:"function"==typeof n}},function(n,t){n.exports=function(n){try{return!!n()}catch(n){return!0}}},function(n,t){var e=n.exports={version:"2.6.12"};"number"==typeof __e&&(__e=e)},function(n,t,e){n.exports=!e(5)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},function(n,t){n.exports=function(n){if(null==n)throw TypeError("Can't call method on  "+n);return n}},function(n,t,e){"use strict";var r=e(5);n.exports=function(n,t){return!!n&&r((function(){t?n.call(null,(function(){}),1):n.call(null)}))}},function(n,t,e){"use strict";var r=e(22),o=e.n(r)()((function(n){return n[1]}));o.push([n.i,":root {\n    /*_________________________________*/\n\n    /*COLOR MANAGEMENT*/\n\n    /*_________________________________*/\n\n    --base_background: #ffffff;\n    --base_top-bar-navigation: #000000;\n    --base_secondary-navigation-bar: #f2f2f3;\n    --base_wallet-sidebar-and-popup: #ffffff;\n    --base_footer: #000000;\n\n    --labels_important-active-labels-text-graphics: #000000;\n    --labels_secondary-inactive-label-text-graphics: #808080;\n    --calculated_important-border: #000000b3;\n    --calculated_secondary-border: #00000054;\n    --calculated_footer_border: #ffffff26;\n    --calculated_super-pale_label-text-graphics: #00000026;\n    --labels_fields: #f0f1f1;\n    --labels_inactive-button: #535353;\n\n    --trading_selling-related-elements: #ee4036;\n    --trading_buying-related-elements: #00a69c;\n\n    --specials_buttons-links-and-highlights: #0066b4;\n    --specials_chat-messages: #98ccb2;\n    --specials_my-username-in-chat: #ffff00;\n    --specials_checks-okay-done: #008000;\n    --specials_pending-waiting-caution: #f6921e;\n    --specials_notifications-alerts-warnings: #ed1c24;\n\n    /*_________________________________*/\n\n    /*Calculated colors*/\n\n    /*_________________________________*/\n\n    --calculated_market-card_gradient_background: #ffffff;\n    --calculated_trading_selling-sparkline-fill: #ee40364d;\n    --calculated_trading_buying-sparkline-fill: #00a69c4d;\n    --calculated_trading_selling-orderbook-bar: #ee40361f;\n    --calculated_trading_buying-orderbook-bar: #00a69c1f;\n    --calculated_trading_buying-related-text: #000000;\n    --calculated_trading_selling-related-text: #ffffff;\n    --calculated_base_modal-overlay: #ffffffbf;\n    --calculated_landing_background: #ffffff59;\n    --calculated_landing_markets_table: #ffffffc2;\n    --calculated_specials_highlight-box: #0066b41a;\n    --calculated_base_top-bar-navigation_text: #ffffff;\n    --calculated_base_top-bar-navigation_text-inactive: #ffffffb3;\n    --calculated_base_footer_text: #ffffff;\n    --calculated_trad-view_watermark: #0000001a;\n    --calculated_trad-view_axis: #00000080;\n    --calculated_trad-view_text: #000000cc;\n    --calculated_specials_notifications-alerts-inactive: #ed1c24bf;\n    --calculated_specials_notifications-alerts-text: #ffffff;\n    --calculated_specials_notifications-pending-text: #ffffff;\n    --calculated_specials_notifications-success-text: #ffffff;\n\n    /*_________________________________*/\n\n    /*_____Remaining_____*/\n    --dark-accordion-arrow-active: #ffffff;\n\n    /*______coins______*/\n    --coin-eur: #06773d;\n    --coin-eur-text: #ffffff;\n    --coin-usd: #01592e;\n    --coin-usd-text: #ffffff;\n    --coin-jpy: #e0dfc7;\n    --coin-jpy-text: #000000;\n    --coin-gbp: #482e6e;\n    --coin-gbp-text: #ffffff;\n    --coin-chf: #ed1c24;\n    --coin-chf-text: #ffffff;\n    --coin-cad: #d7ce58;\n    --coin-cad-text: #000000;\n    --coin-aud: #19441f;\n    --coin-aud-text: #ffffff;\n    --coin-nzd: #b3498c;\n    --coin-nzd-text: #ffffff;\n    --coin-zar: #d8d3a0;\n    --coin-zar-text: #000000;\n    --coin-hkd: #f48f9b;\n    --coin-hkd-text: #000000;\n    --coin-krw: #f9ee02;\n    --coin-krw-text: #000000;\n    --coin-cny: #ec008c;\n    --coin-cny-text: #ffffff;\n    --coin-sgd: #720f15;\n    --coin-sgd-text: #ffffff;\n    --coin-btc: #f7941d;\n    --coin-btc-text: #000000;\n    --coin-eth: #3e4ea1;\n    --coin-eth-text: #ffffff;\n    --coin-ltc: #bcbec0;\n    --coin-ltc-text: #000000;\n    --coin-bch: #8dc541;\n    --coin-bch-text: #000000;\n    --coin-xrp: #414042;\n    --coin-xrp-text: #ffffff;\n    --coin-xht: #000000;\n    --coin-xht-text: #ffffff;\n    --coin-eos: #58595b;\n    --coin-eos-text: #ffffff;\n    --coin-bnb: #f1ba2a;\n    --coin-bnb-text: #000000;\n    --coin-link: #1b75bc;\n    --coin-link-text: #ffffff;\n    --coin-trx: #a22d25;\n    --coin-trx-text: #ffffff;\n    --coin-ada: #3667b2;\n    --coin-ada-text: #ffffff;\n    --coin-matic: #2aaae2;\n    --coin-matic-text: #ffffff;\n    --coin-neo: #bcbec0;\n    --coin-neo-text: #000000;\n    --coin-etc: #009444;\n    --coin-etc-text: #000000;\n    --coin-xlm: #808285;\n    --coin-xlm-text: #ffffff;\n    --coin-xmr: #f15a29;\n    --coin-xmr-text: #ffffff;\n    --coin-zec: #fbb040;\n    --coin-zec-text: #000000;\n    --coin-one: #939598;\n    --coin-one-text: #ffffff;\n    --coin-pax: #163526;\n    --coin-pax-text: #ffffff;\n    --coin-usdc: #4d7d91;\n    --coin-usdc-text: #ffffff;\n    --coin-usdt: #2bb673;\n    --coin-usdt-text: #ffffff;\n    --coin-vet: #454c7d;\n    --coin-vet-text: #ffffff;\n    --coin-btt: #c49a6c;\n    --coin-btt-text: #ffffff;\n    --coin-qtum: #96daf7;\n    --coin-qtum-text: #000000;\n    --coin-algo: #594a42;\n    --coin-algo-text: #ffffff;\n    --coin-rvn: #662d91;\n    --coin-rvn-text: #ffffff;\n    --coin-iota: #603913;\n    --coin-iota-text: #ffffff;\n    --coin-dash: #417ec1;\n    --coin-dash-text: #ffffff;\n    --coin-bsv: #a09032;\n    --coin-bsv-text: #ffffff;\n    --coin-ont: #00a79d;\n    --coin-ont-text: #ffffff;\n    --coin-atom: #796184;\n    --coin-atom-text: #ffffff;\n    --coin-celr: #726658;\n    --coin-celr-text: #ffffff;\n    --coin-omg: #8e7fbb;\n    --coin-omg-text: #ffffff;\n    --coin-hot: #8b5e3c;\n    --coin-hot-text: #ffffff;\n    --coin-tusd: #002868;\n    --coin-tusd-text: #ffffff;\n    --coin-dai: #f3c27a;\n    --coin-dai-text: #000000;\n}\n\n\nh1 {\n    color: var(--labels_important-active-labels-text-graphics)\n}",""]),t.a=o},function(n,t,e){var r=e(24),o=e(29);n.exports=e(7)?function(n,t,e){return r.f(n,t,o(1,e))}:function(n,t,e){return n[t]=e,n}},function(n,t){var e=0,r=Math.random();n.exports=function(n){return"Symbol(".concat(void 0===n?"":n,")_",(++e+r).toString(36))}},function(n,t,e){var r=e(6),o=e(2),i=o["__core-js_shared__"]||(o["__core-js_shared__"]={});(n.exports=function(n,t){return i[n]||(i[n]=void 0!==t?t:{})})("versions",[]).push({version:r.version,mode:e(33)?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(n,t,e){var r=e(34);n.exports=function(n,t,e){if(r(n),void 0===t)return n;switch(e){case 1:return function(e){return n.call(t,e)};case 2:return function(e,r){return n.call(t,e,r)};case 3:return function(e,r,o){return n.call(t,e,r,o)}}return function(){return n.apply(t,arguments)}}},function(n,t,e){var r=e(14),o=e(16),i=e(35),a=e(18),c=e(36);n.exports=function(n,t){var e=1==n,f=2==n,u=3==n,l=4==n,s=6==n,_=5==n||s,d=t||c;return function(t,c,p){for(var v,b,m=i(t),x=o(m),g=r(c,p,3),h=a(x.length),y=0,E=e?d(t,h):f?d(t,0):void 0;h>y;y++)if((_||y in x)&&(b=g(v=x[y],y,m),n))if(e)E[y]=b;else if(b)switch(n){case 3:return!0;case 5:return v;case 6:return y;case 2:E.push(v)}else if(l)return!1;return s?-1:u||l?l:E}}},function(n,t,e){var r=e(17);n.exports=Object("z").propertyIsEnumerable(0)?Object:function(n){return"String"==r(n)?n.split(""):Object(n)}},function(n,t){var e={}.toString;n.exports=function(n){return e.call(n).slice(8,-1)}},function(n,t,e){var r=e(19),o=Math.min;n.exports=function(n){return n>0?o(r(n),9007199254740991):0}},function(n,t){var e=Math.ceil,r=Math.floor;n.exports=function(n){return isNaN(n=+n)?0:(n>0?r:e)(n)}},function(n,t){n.exports=require("react-svg")},function(n,t,e){"use strict";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},i=function(){var n={};return function(t){if(void 0===n[t]){var e=document.querySelector(t);if(window.HTMLIFrameElement&&e instanceof window.HTMLIFrameElement)try{e=e.contentDocument.head}catch(n){e=null}n[t]=e}return n[t]}}(),a=[];function c(n){for(var t=-1,e=0;e<a.length;e++)if(a[e].identifier===n){t=e;break}return t}function f(n,t){for(var e={},r=[],o=0;o<n.length;o++){var i=n[o],f=t.base?i[0]+t.base:i[0],u=e[f]||0,l="".concat(f," ").concat(u);e[f]=u+1;var s=c(l),_={css:i[1],media:i[2],sourceMap:i[3]};-1!==s?(a[s].references++,a[s].updater(_)):a.push({identifier:l,updater:b(_,t),references:1}),r.push(l)}return r}function u(n){var t=document.createElement("style"),r=n.attributes||{};if(void 0===r.nonce){var o=e.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(n){t.setAttribute(n,r[n])})),"function"==typeof n.insert)n.insert(t);else{var a=i(n.insert||"head");if(!a)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");a.appendChild(t)}return t}var l,s=(l=[],function(n,t){return l[n]=t,l.filter(Boolean).join("\n")});function _(n,t,e,r){var o=e?"":r.media?"@media ".concat(r.media," {").concat(r.css,"}"):r.css;if(n.styleSheet)n.styleSheet.cssText=s(t,o);else{var i=document.createTextNode(o),a=n.childNodes;a[t]&&n.removeChild(a[t]),a.length?n.insertBefore(i,a[t]):n.appendChild(i)}}function d(n,t,e){var r=e.css,o=e.media,i=e.sourceMap;if(o?n.setAttribute("media",o):n.removeAttribute("media"),i&&"undefined"!=typeof btoa&&(r+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i))))," */")),n.styleSheet)n.styleSheet.cssText=r;else{for(;n.firstChild;)n.removeChild(n.firstChild);n.appendChild(document.createTextNode(r))}}var p=null,v=0;function b(n,t){var e,r,o;if(t.singleton){var i=v++;e=p||(p=u(t)),r=_.bind(null,e,i,!1),o=_.bind(null,e,i,!0)}else e=u(t),r=d.bind(null,e,t),o=function(){!function(n){if(null===n.parentNode)return!1;n.parentNode.removeChild(n)}(e)};return r(n),function(t){if(t){if(t.css===n.css&&t.media===n.media&&t.sourceMap===n.sourceMap)return;r(n=t)}else o()}}n.exports=function(n,t){(t=t||{}).singleton||"boolean"==typeof t.singleton||(t.singleton=o());var e=f(n=n||[],t);return function(n){if(n=n||[],"[object Array]"===Object.prototype.toString.call(n)){for(var r=0;r<e.length;r++){var o=c(e[r]);a[o].references--}for(var i=f(n,t),u=0;u<e.length;u++){var l=c(e[u]);0===a[l].references&&(a[l].updater(),a.splice(l,1))}e=i}}}},function(n,t,e){"use strict";n.exports=function(n){var t=[];return t.toString=function(){return this.map((function(t){var e=n(t);return t[2]?"@media ".concat(t[2]," {").concat(e,"}"):e})).join("")},t.i=function(n,e,r){"string"==typeof n&&(n=[[null,n,""]]);var o={};if(r)for(var i=0;i<this.length;i++){var a=this[i][0];null!=a&&(o[a]=!0)}for(var c=0;c<n.length;c++){var f=[].concat(n[c]);r&&o[f[0]]||(e&&(f[2]?f[2]="".concat(e," and ").concat(f[2]):f[2]=e),t.push(f))}},t}},function(n,t,e){"use strict";var r=e(3),o=e(15)(1);r(r.P+r.F*!e(9)([].map,!0),"Array",{map:function(n){return o(this,n,arguments[1])}})},function(n,t,e){var r=e(25),o=e(26),i=e(28),a=Object.defineProperty;t.f=e(7)?Object.defineProperty:function(n,t,e){if(r(n),t=i(t,!0),r(e),o)try{return a(n,t,e)}catch(n){}if("get"in e||"set"in e)throw TypeError("Accessors not supported!");return"value"in e&&(n[t]=e.value),n}},function(n,t,e){var r=e(4);n.exports=function(n){if(!r(n))throw TypeError(n+" is not an object!");return n}},function(n,t,e){n.exports=!e(7)&&!e(5)((function(){return 7!=Object.defineProperty(e(27)("div"),"a",{get:function(){return 7}}).a}))},function(n,t,e){var r=e(4),o=e(2).document,i=r(o)&&r(o.createElement);n.exports=function(n){return i?o.createElement(n):{}}},function(n,t,e){var r=e(4);n.exports=function(n,t){if(!r(n))return n;var e,o;if(t&&"function"==typeof(e=n.toString)&&!r(o=e.call(n)))return o;if("function"==typeof(e=n.valueOf)&&!r(o=e.call(n)))return o;if(!t&&"function"==typeof(e=n.toString)&&!r(o=e.call(n)))return o;throw TypeError("Can't convert object to primitive value")}},function(n,t){n.exports=function(n,t){return{enumerable:!(1&n),configurable:!(2&n),writable:!(4&n),value:t}}},function(n,t,e){var r=e(2),o=e(11),i=e(31),a=e(12)("src"),c=e(32),f=(""+c).split("toString");e(6).inspectSource=function(n){return c.call(n)},(n.exports=function(n,t,e,c){var u="function"==typeof e;u&&(i(e,"name")||o(e,"name",t)),n[t]!==e&&(u&&(i(e,a)||o(e,a,n[t]?""+n[t]:f.join(String(t)))),n===r?n[t]=e:c?n[t]?n[t]=e:o(n,t,e):(delete n[t],o(n,t,e)))})(Function.prototype,"toString",(function(){return"function"==typeof this&&this[a]||c.call(this)}))},function(n,t){var e={}.hasOwnProperty;n.exports=function(n,t){return e.call(n,t)}},function(n,t,e){n.exports=e(13)("native-function-to-string",Function.toString)},function(n,t){n.exports=!1},function(n,t){n.exports=function(n){if("function"!=typeof n)throw TypeError(n+" is not a function!");return n}},function(n,t,e){var r=e(8);n.exports=function(n){return Object(r(n))}},function(n,t,e){var r=e(37);n.exports=function(n,t){return new(r(n))(t)}},function(n,t,e){var r=e(4),o=e(38),i=e(39)("species");n.exports=function(n){var t;return o(n)&&("function"!=typeof(t=n.constructor)||t!==Array&&!o(t.prototype)||(t=void 0),r(t)&&null===(t=t[i])&&(t=void 0)),void 0===t?Array:t}},function(n,t,e){var r=e(17);n.exports=Array.isArray||function(n){return"Array"==r(n)}},function(n,t,e){var r=e(13)("wks"),o=e(12),i=e(2).Symbol,a="function"==typeof i;(n.exports=function(n){return r[n]||(r[n]=a&&i[n]||(a?i:o)("Symbol."+n))}).store=r},function(n,t,e){"use strict";var r=e(3),o=e(15)(2);r(r.P+r.F*!e(9)([].filter,!0),"Array",{filter:function(n){return o(this,n,arguments[1])}})},function(n,t,e){"use strict";e(42)("bold",(function(n){return function(){return n(this,"b","","")}}))},function(n,t,e){var r=e(3),o=e(5),i=e(8),a=/"/g,c=function(n,t,e,r){var o=String(i(n)),c="<"+t;return""!==e&&(c+=" "+e+'="'+String(r).replace(a,"&quot;")+'"'),c+">"+o+"</"+t+">"};n.exports=function(n,t){var e={};e[n]=t(c),r(r.P+r.F*o((function(){var t=""[n]('"');return t!==t.toLowerCase()||t.split('"').length>3})),"String",e)}},function(n,t,e){"use strict";var r=e(3),o=e(44)(!1),i=[].indexOf,a=!!i&&1/[1].indexOf(1,-0)<0;r(r.P+r.F*(a||!e(9)(i)),"Array",{indexOf:function(n){return a?i.apply(this,arguments)||0:o(this,n,arguments[1])}})},function(n,t,e){var r=e(45),o=e(18),i=e(46);n.exports=function(n){return function(t,e,a){var c,f=r(t),u=o(f.length),l=i(a,u);if(n&&e!=e){for(;u>l;)if((c=f[l++])!=c)return!0}else for(;u>l;l++)if((n||l in f)&&f[l]===e)return n||l||0;return!n&&-1}}},function(n,t,e){var r=e(16),o=e(8);n.exports=function(n){return r(o(n))}},function(n,t,e){var r=e(19),o=Math.max,i=Math.min;n.exports=function(n,t){return(n=r(n))<0?o(n+t,0):i(n,t)}},function(n,t,e){"use strict";e.r(t);e(23),e(40);var r=e(0),o=e.n(r),i=(e(41),e(1)),a=e.n(i),c=function(n){n.stringId;var t=n.label,e=void 0===t?"":t,r=n.information,i=void 0===r?"":r,c=n.className,f=n.bold,u=void 0===f||f,l=n.disable,s=void 0!==l&&l;return o.a.createElement("div",{className:a()("d-flex","justify-content-start","align-items-center","panel-information-row",c,{"panel-information-row-disable":s})},o.a.createElement("span",{style:{wordBreak:"normal"}},u?o.a.createElement("b",null,e):e,":"," ",o.a.createElement("span",{className:"information-content"},i)))},f=function(n){var t=n.label,e=n.onClick,r=n.type,i=n.disabled,c=n.className,f=n.autoFocus,u=void 0!==f&&f;return o.a.createElement("button",{type:r,onClick:e,className:a()("exir-button","mdc-button","mdc-button--unelevated","exir-button-font",{disabled:i},c),disabled:i,autoFocus:u},t)};f.defaultProps={type:"submit",disabled:!1,className:""};e(43);var u=e(20),l=function(n){var t=n.icon,e=n.alt,r=n.wrapperClassName,i=n.imageWrapperClassName,c=n.svgWrapperClassName,f=n.beforeInjection,l=void 0===f?function(){}:f,s=t.indexOf(".svg")>0;return o.a.createElement("span",null,t&&s&&o.a.createElement(u.ReactSVG,{src:t,className:a()(r,c),beforeInjection:l,fallback:function(){return o.a.createElement("img",{src:t,alt:e,className:a()(r,c)})}}),t&&!s&&o.a.createElement("img",{src:t,alt:e,className:a()(r,i,"object-fit-contain")}))};l.defaultProps={icon:"",iconId:"",stringId:"",alt:"",wrapperClassName:"",imageWrapperClassName:"",svgWrapperClassName:"",showUpload:!0};var s=e(21),_=e.n(s),d=e(10),p={insert:"head",singleton:!1};_()(d.a,p),d.a.locals,t.default=function(n){var t=n.user,e=void 0===t?{}:t,r=n.setActivePageContent,i=void 0===r?function(){}:r,a=n.handleBack,u=void 0===a?function(){}:a,s=n.icons,_=void 0===s?{}:s,d=n.strings,p=void 0===d?{}:d,v=n.MAX_NUMBER_BANKS,b=void 0===v?1:v,m=e.bank_account;if(m&&m.length&&m.length!==m.filter((function(n){return 0===n.status})).length){var x=m[m.length-1],g=m.map((function(n,t){return 0!==n.status?o.a.createElement("div",{key:t,className:"d-flex my-4"},1===n.status&&o.a.createElement("div",{className:"d-flex align-items-center mr-3"},o.a.createElement(l,{iconId:"PENDING_TIMER",icon:_.PENDING_TIMER,wrapperClassName:"account-pending-icon"})),o.a.createElement("div",{className:"w-100"},o.a.createElement(c,{stringId:"USER_VERIFICATION.BANK_NAME",label:p["USER_VERIFICATION.BANK_NAME"],information:n.bank_name,className:"title-font",disable:!0}),o.a.createElement("div",{className:"d-flex"},o.a.createElement(c,{stringId:"USER_VERIFICATION.ACCOUNT_NUMBER",label:p["USER_VERIFICATION.ACCOUNT_NUMBER"],information:n.account_number,className:"mr-3 title-font",disable:!0})))):null}));return o.a.createElement("div",null,o.a.createElement("div",{className:"font-weight-bold text-lowercase"},p.formatString(p["USER_VERIFICATION.BANK_VERIFICATION_HELP_TEXT"],o.a.createElement("span",{className:"verification_link pointer",onClick:function(n){return u("document",n)}},p["USER_VERIFICATION.DOCUMENT_SUBMISSION"]))),g,3===x.status&&b>m.length?o.a.createElement("div",null,o.a.createElement(f,{label:p["USER_VERIFICATION.ADD_ANOTHER_BANK_ACCOUNT"],onClick:function(){return i("bank")}})):null)}return o.a.createElement("div",null,o.a.createElement(f,{label:p["USER_VERIFICATION.START_BANK_VERIFICATION"],onClick:function(){return i("bank")}}))}}]));
\ No newline at end of file
diff --git a/web/public/css/chart.css b/web/public/css/chart.css
index cbe43d4425..407d3c86d0 100644
--- a/web/public/css/chart.css
+++ b/web/public/css/chart.css
@@ -1,6 +1,6 @@
 
 .layout__area--top div {
-    background-color: var(--base_background) !important;
+    background-color: var(--base_wallet-sidebar-and-popup) !important;
 }
 
 .screen-container {
diff --git a/web/public/main.js b/web/public/main.js
new file mode 100644
index 0000000000..2145dc6609
--- /dev/null
+++ b/web/public/main.js
@@ -0,0 +1 @@
+!function(t,e){for(var n in e)t[n]=e[n]}(exports,function(t){var e={};function n(r){if(e[r])return e[r].exports;var o=e[r]={i:r,l:!1,exports:{}};return t[r].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=t,n.c=e,n.d=function(t,e,r){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:r})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(n.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(r,o,function(e){return t[e]}.bind(null,o));return r},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=108)}([function(t,e){t.exports=require("react")},function(t,e){t.exports=require("classnames")},function(t,e,n){var r=n(4),o=n(20),i=n(11),c=n(10),a=n(57),f=function(t,e,n){var u,s,l,p,d=t&f.F,_=t&f.G,v=t&f.S,m=t&f.P,b=t&f.B,y=_?r:v?r[e]||(r[e]={}):(r[e]||{}).prototype,h=_?o:o[e]||(o[e]={}),g=h.prototype||(h.prototype={});for(u in _&&(n=e),n)l=((s=!d&&y&&void 0!==y[u])?y:n)[u],p=b&&s?a(l,r):m&&"function"==typeof l?a(Function.call,l):l,y&&c(y,u,l,t&f.U),h[u]!=l&&i(h,u,p),m&&g[u]!=l&&(g[u]=l)};r.core=o,f.F=1,f.G=2,f.S=4,f.P=8,f.B=16,f.W=32,f.U=64,f.R=128,t.exports=f},function(t,e,n){t.exports=!n(5)((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a}))},function(t,e){var n=t.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},function(t,e){t.exports=function(t){try{return!!t()}catch(t){return!0}}},function(t,e,n){var r=n(23)("wks"),o=n(19),i=n(4).Symbol,c="function"==typeof i;(t.exports=function(t){return r[t]||(r[t]=c&&i[t]||(c?i:o)("Symbol."+t))}).store=r},function(t,e,n){var r=n(8),o=n(52),i=n(35),c=Object.defineProperty;e.f=n(3)?Object.defineProperty:function(t,e,n){if(r(t),e=i(e,!0),r(n),o)try{return c(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported!");return"value"in n&&(t[e]=n.value),t}},function(t,e,n){var r=n(9);t.exports=function(t){if(!r(t))throw TypeError(t+" is not an object!");return t}},function(t,e){t.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},function(t,e,n){var r=n(4),o=n(11),i=n(12),c=n(19)("src"),a=n(71),f=(""+a).split("toString");n(20).inspectSource=function(t){return a.call(t)},(t.exports=function(t,e,n,a){var u="function"==typeof n;u&&(i(n,"name")||o(n,"name",e)),t[e]!==n&&(u&&(i(n,c)||o(n,c,t[e]?""+t[e]:f.join(String(e)))),t===r?t[e]=n:a?t[e]?t[e]=n:o(t,e,n):(delete t[e],o(t,e,n)))})(Function.prototype,"toString",(function(){return"function"==typeof this&&this[c]||a.call(this)}))},function(t,e,n){var r=n(7),o=n(18);t.exports=n(3)?function(t,e,n){return r.f(t,e,o(1,n))}:function(t,e,n){return t[e]=n,t}},function(t,e){var n={}.hasOwnProperty;t.exports=function(t,e){return n.call(t,e)}},function(t,e,n){var r=n(40),o=n(41);t.exports=function(t){return r(o(t))}},function(t,e){t.exports=require("redux-form")},function(t,e,n){var r=n(59),o=n(43);t.exports=Object.keys||function(t){return r(t,o)}},function(t,e){function n(){return t.exports=n=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var n=arguments[e];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(t[r]=n[r])}return t},n.apply(this,arguments)}t.exports=n},function(t,e){function n(e){return t.exports=n=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)},n(e)}t.exports=n},function(t,e){t.exports=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}}},function(t,e){var n=0,r=Math.random();t.exports=function(t){return"Symbol(".concat(void 0===t?"":t,")_",(++n+r).toString(36))}},function(t,e){var n=t.exports={version:"2.6.12"};"number"==typeof __e&&(__e=n)},function(t,e,n){var r=n(41);t.exports=function(t){return Object(r(t))}},function(t,e){t.exports=require("react-device-detect")},function(t,e,n){var r=n(20),o=n(4),i=o["__core-js_shared__"]||(o["__core-js_shared__"]={});(t.exports=function(t,e){return i[t]||(i[t]=void 0!==e?e:{})})("versions",[]).push({version:r.version,mode:n(24)?"pure":"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})},function(t,e){t.exports=!1},function(t,e){e.f=Object.getOwnPropertySymbols},function(t,e){e.f={}.propertyIsEnumerable},function(t,e,n){"use strict";var r=n(5);t.exports=function(t,e){return!!t&&r((function(){e?t.call(null,(function(){}),1):t.call(null)}))}},function(t,e){t.exports=function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}},function(t,e){function n(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}t.exports=function(t,e,r){return e&&n(t.prototype,e),r&&n(t,r),t}},function(t,e,n){var r=n(79);t.exports=function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&r(t,e)}},function(t,e,n){var r=n(48),o=n(80);t.exports=function(t,e){return!e||"object"!==r(e)&&"function"!=typeof e?o(t):e}},function(t,e){t.exports=require("react-redux")},function(t,e){t.exports=require("react-svg")},function(t,e,n){var r=n(98);t.exports=function(t,e){if(null==t)return{};var n,o,i=r(t,e);if(Object.getOwnPropertySymbols){var c=Object.getOwnPropertySymbols(t);for(o=0;o<c.length;o++)n=c[o],e.indexOf(n)>=0||Object.prototype.propertyIsEnumerable.call(t,n)&&(i[n]=t[n])}return i}},function(t,e,n){var r=n(9);t.exports=function(t,e){if(!r(t))return t;var n,o;if(e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;if("function"==typeof(n=t.valueOf)&&!r(o=n.call(t)))return o;if(!e&&"function"==typeof(n=t.toString)&&!r(o=n.call(t)))return o;throw TypeError("Can't convert object to primitive value")}},function(t,e,n){"use strict";var r=n(72),o={};o[n(6)("toStringTag")]="z",o+""!="[object z]"&&n(10)(Object.prototype,"toString",(function(){return"[object "+r(this)+"]"}),!0)},function(t,e){var n={}.toString;t.exports=function(t){return n.call(t).slice(8,-1)}},function(t,e){t.exports=function(t){if("function"!=typeof t)throw TypeError(t+" is not a function!");return t}},function(t,e,n){var r=n(8),o=n(58),i=n(43),c=n(42)("IE_PROTO"),a=function(){},f=function(){var t,e=n(53)("iframe"),r=i.length;for(e.style.display="none",n(74).appendChild(e),e.src="javascript:",(t=e.contentWindow.document).open(),t.write("<script>document.F=Object<\/script>"),t.close(),f=t.F;r--;)delete f.prototype[i[r]];return f()};t.exports=Object.create||function(t,e){var n;return null!==t?(a.prototype=r(t),n=new a,a.prototype=null,n[c]=t):n=f(),void 0===e?n:o(n,e)}},function(t,e,n){var r=n(37);t.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==r(t)?t.split(""):Object(t)}},function(t,e){t.exports=function(t){if(null==t)throw TypeError("Can't call method on  "+t);return t}},function(t,e,n){var r=n(23)("keys"),o=n(19);t.exports=function(t){return r[t]||(r[t]=o(t))}},function(t,e){t.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},function(t,e,n){var r=n(59),o=n(43).concat("length","prototype");e.f=Object.getOwnPropertyNames||function(t){return r(t,o)}},function(t,e,n){var r=n(57),o=n(40),i=n(21),c=n(61),a=n(90);t.exports=function(t,e){var n=1==t,f=2==t,u=3==t,s=4==t,l=6==t,p=5==t||l,d=e||a;return function(e,a,_){for(var v,m,b=i(e),y=o(b),h=r(a,_,3),g=c(y.length),x=0,E=n?d(e,g):f?d(e,0):void 0;g>x;x++)if((p||x in y)&&(m=h(v=y[x],x,b),t))if(n)E[x]=m;else if(m)switch(t){case 3:return!0;case 5:return v;case 6:return x;case 2:E.push(v)}else if(s)return!1;return l?-1:u||s?s:E}}},function(t,e,n){var r=n(7).f,o=n(12),i=n(6)("toStringTag");t.exports=function(t,e,n){t&&!o(t=n?t:t.prototype,i)&&r(t,i,{configurable:!0,value:e})}},function(t,e){t.exports={}},function(t,e){function n(e){return"function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?t.exports=n=function(t){return typeof t}:t.exports=n=function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},n(e)}t.exports=n},function(t,e,n){"use strict";var r=n(68),o=n.n(r)()((function(t){return t[1]}));o.push([t.i,":root {\n    /*_________________________________*/\n\n    /*COLOR MANAGEMENT*/\n\n    /*_________________________________*/\n\n    --base_background: #ffffff;\n    --base_top-bar-navigation: #000000;\n    --base_secondary-navigation-bar: #f2f2f3;\n    --base_wallet-sidebar-and-popup: #ffffff;\n    --base_footer: #000000;\n\n    --labels_important-active-labels-text-graphics: #000000;\n    --labels_secondary-inactive-label-text-graphics: #808080;\n    --calculated_important-border: #000000b3;\n    --calculated_secondary-border: #00000054;\n    --calculated_footer_border: #ffffff26;\n    --calculated_super-pale_label-text-graphics: #00000026;\n    --labels_fields: #f0f1f1;\n    --labels_inactive-button: #535353;\n\n    --trading_selling-related-elements: #ee4036;\n    --trading_buying-related-elements: #00a69c;\n\n    --specials_buttons-links-and-highlights: #0066b4;\n    --specials_chat-messages: #98ccb2;\n    --specials_my-username-in-chat: #ffff00;\n    --specials_checks-okay-done: #008000;\n    --specials_pending-waiting-caution: #f6921e;\n    --specials_notifications-alerts-warnings: #ed1c24;\n\n    /*_________________________________*/\n\n    /*Calculated colors*/\n\n    /*_________________________________*/\n\n    --calculated_market-card_gradient_background: #ffffff;\n    --calculated_trading_selling-sparkline-fill: #ee40364d;\n    --calculated_trading_buying-sparkline-fill: #00a69c4d;\n    --calculated_trading_selling-orderbook-bar: #ee40361f;\n    --calculated_trading_buying-orderbook-bar: #00a69c1f;\n    --calculated_trading_buying-related-text: #000000;\n    --calculated_trading_selling-related-text: #ffffff;\n    --calculated_base_modal-overlay: #ffffffbf;\n    --calculated_landing_background: #ffffff59;\n    --calculated_landing_markets_table: #ffffffc2;\n    --calculated_specials_highlight-box: #0066b41a;\n    --calculated_base_top-bar-navigation_text: #ffffff;\n    --calculated_base_top-bar-navigation_text-inactive: #ffffffb3;\n    --calculated_base_footer_text: #ffffff;\n    --calculated_trad-view_watermark: #0000001a;\n    --calculated_trad-view_axis: #00000080;\n    --calculated_trad-view_text: #000000cc;\n    --calculated_specials_notifications-alerts-inactive: #ed1c24bf;\n    --calculated_specials_notifications-alerts-text: #ffffff;\n    --calculated_specials_notifications-pending-text: #ffffff;\n    --calculated_specials_notifications-success-text: #ffffff;\n\n    /*_________________________________*/\n\n    /*_____Remaining_____*/\n    --dark-accordion-arrow-active: #ffffff;\n\n    /*______coins______*/\n    --coin-eur: #06773d;\n    --coin-eur-text: #ffffff;\n    --coin-usd: #01592e;\n    --coin-usd-text: #ffffff;\n    --coin-jpy: #e0dfc7;\n    --coin-jpy-text: #000000;\n    --coin-gbp: #482e6e;\n    --coin-gbp-text: #ffffff;\n    --coin-chf: #ed1c24;\n    --coin-chf-text: #ffffff;\n    --coin-cad: #d7ce58;\n    --coin-cad-text: #000000;\n    --coin-aud: #19441f;\n    --coin-aud-text: #ffffff;\n    --coin-nzd: #b3498c;\n    --coin-nzd-text: #ffffff;\n    --coin-zar: #d8d3a0;\n    --coin-zar-text: #000000;\n    --coin-hkd: #f48f9b;\n    --coin-hkd-text: #000000;\n    --coin-krw: #f9ee02;\n    --coin-krw-text: #000000;\n    --coin-cny: #ec008c;\n    --coin-cny-text: #ffffff;\n    --coin-sgd: #720f15;\n    --coin-sgd-text: #ffffff;\n    --coin-btc: #f7941d;\n    --coin-btc-text: #000000;\n    --coin-eth: #3e4ea1;\n    --coin-eth-text: #ffffff;\n    --coin-ltc: #bcbec0;\n    --coin-ltc-text: #000000;\n    --coin-bch: #8dc541;\n    --coin-bch-text: #000000;\n    --coin-xrp: #414042;\n    --coin-xrp-text: #ffffff;\n    --coin-xht: #000000;\n    --coin-xht-text: #ffffff;\n    --coin-eos: #58595b;\n    --coin-eos-text: #ffffff;\n    --coin-bnb: #f1ba2a;\n    --coin-bnb-text: #000000;\n    --coin-link: #1b75bc;\n    --coin-link-text: #ffffff;\n    --coin-trx: #a22d25;\n    --coin-trx-text: #ffffff;\n    --coin-ada: #3667b2;\n    --coin-ada-text: #ffffff;\n    --coin-matic: #2aaae2;\n    --coin-matic-text: #ffffff;\n    --coin-neo: #bcbec0;\n    --coin-neo-text: #000000;\n    --coin-etc: #009444;\n    --coin-etc-text: #000000;\n    --coin-xlm: #808285;\n    --coin-xlm-text: #ffffff;\n    --coin-xmr: #f15a29;\n    --coin-xmr-text: #ffffff;\n    --coin-zec: #fbb040;\n    --coin-zec-text: #000000;\n    --coin-one: #939598;\n    --coin-one-text: #ffffff;\n    --coin-pax: #163526;\n    --coin-pax-text: #ffffff;\n    --coin-usdc: #4d7d91;\n    --coin-usdc-text: #ffffff;\n    --coin-usdt: #2bb673;\n    --coin-usdt-text: #ffffff;\n    --coin-vet: #454c7d;\n    --coin-vet-text: #ffffff;\n    --coin-btt: #c49a6c;\n    --coin-btt-text: #ffffff;\n    --coin-qtum: #96daf7;\n    --coin-qtum-text: #000000;\n    --coin-algo: #594a42;\n    --coin-algo-text: #ffffff;\n    --coin-rvn: #662d91;\n    --coin-rvn-text: #ffffff;\n    --coin-iota: #603913;\n    --coin-iota-text: #ffffff;\n    --coin-dash: #417ec1;\n    --coin-dash-text: #ffffff;\n    --coin-bsv: #a09032;\n    --coin-bsv-text: #ffffff;\n    --coin-ont: #00a79d;\n    --coin-ont-text: #ffffff;\n    --coin-atom: #796184;\n    --coin-atom-text: #ffffff;\n    --coin-celr: #726658;\n    --coin-celr-text: #ffffff;\n    --coin-omg: #8e7fbb;\n    --coin-omg-text: #ffffff;\n    --coin-hot: #8b5e3c;\n    --coin-hot-text: #ffffff;\n    --coin-tusd: #002868;\n    --coin-tusd-text: #ffffff;\n    --coin-dai: #f3c27a;\n    --coin-dai-text: #000000;\n}\n\n\nh1 {\n    color: var(--labels_important-active-labels-text-graphics)\n}",""]),e.a=o},function(t,e){t.exports=require("redux")},function(t,e,n){"use strict";n(70);var r=n(8),o=n(54),i=n(3),c=/./.toString,a=function(t){n(10)(RegExp.prototype,"toString",t,!0)};n(5)((function(){return"/a/b"!=c.call({source:"a",flags:"b"})}))?a((function(){var t=r(this);return"/".concat(t.source,"/","flags"in t?t.flags:!i&&t instanceof RegExp?o.call(t):void 0)})):"toString"!=c.name&&a((function(){return c.call(this)}))},function(t,e,n){t.exports=!n(3)&&!n(5)((function(){return 7!=Object.defineProperty(n(53)("div"),"a",{get:function(){return 7}}).a}))},function(t,e,n){var r=n(9),o=n(4).document,i=r(o)&&r(o.createElement);t.exports=function(t){return i?o.createElement(t):{}}},function(t,e,n){"use strict";var r=n(8);t.exports=function(){var t=r(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e}},function(t,e,n){var r=Date.prototype,o=r.toString,i=r.getTime;new Date(NaN)+""!="Invalid Date"&&n(10)(r,"toString",(function(){var t=i.call(this);return t==t?o.call(this):"Invalid Date"}))},function(t,e,n){var r=n(2),o=n(39),i=n(38),c=n(8),a=n(9),f=n(5),u=n(75),s=(n(4).Reflect||{}).construct,l=f((function(){function t(){}return!(s((function(){}),[],t)instanceof t)})),p=!f((function(){s((function(){}))}));r(r.S+r.F*(l||p),"Reflect",{construct:function(t,e){i(t),c(e);var n=arguments.length<3?t:i(arguments[2]);if(p&&!l)return s(t,e,n);if(t==n){switch(e.length){case 0:return new t;case 1:return new t(e[0]);case 2:return new t(e[0],e[1]);case 3:return new t(e[0],e[1],e[2]);case 4:return new t(e[0],e[1],e[2],e[3])}var r=[null];return r.push.apply(r,e),new(u.apply(t,r))}var f=n.prototype,d=o(a(f)?f:Object.prototype),_=Function.apply.call(t,d,e);return a(_)?_:d}})},function(t,e,n){var r=n(38);t.exports=function(t,e,n){if(r(t),void 0===e)return t;switch(n){case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}},function(t,e,n){var r=n(7),o=n(8),i=n(15);t.exports=n(3)?Object.defineProperties:function(t,e){o(t);for(var n,c=i(e),a=c.length,f=0;a>f;)r.f(t,n=c[f++],e[n]);return t}},function(t,e,n){var r=n(12),o=n(13),i=n(60)(!1),c=n(42)("IE_PROTO");t.exports=function(t,e){var n,a=o(t),f=0,u=[];for(n in a)n!=c&&r(a,n)&&u.push(n);for(;e.length>f;)r(a,n=e[f++])&&(~i(u,n)||u.push(n));return u}},function(t,e,n){var r=n(13),o=n(61),i=n(73);t.exports=function(t){return function(e,n,c){var a,f=r(e),u=o(f.length),s=i(c,u);if(t&&n!=n){for(;u>s;)if((a=f[s++])!=a)return!0}else for(;u>s;s++)if((t||s in f)&&f[s]===n)return t||s||0;return!t&&-1}}},function(t,e,n){var r=n(62),o=Math.min;t.exports=function(t){return t>0?o(r(t),9007199254740991):0}},function(t,e){var n=Math.ceil,r=Math.floor;t.exports=function(t){return isNaN(t=+t)?0:(t>0?r:n)(t)}},function(t,e,n){var r=n(26),o=n(18),i=n(13),c=n(35),a=n(12),f=n(52),u=Object.getOwnPropertyDescriptor;e.f=n(3)?u:function(t,e){if(t=i(t),e=c(e,!0),f)try{return u(t,e)}catch(t){}if(a(t,e))return o(!r.f.call(t,e),t[e])}},function(t,e,n){var r=n(37);t.exports=Array.isArray||function(t){return"Array"==r(t)}},function(t,e,n){e.f=n(6)},function(t,e,n){"use strict";var r=n(100),o=n(101),i=n(47),c=n(13);t.exports=n(102)(Array,"Array",(function(t,e){this._t=c(t),this._i=0,this._k=e}),(function(){var t=this._t,e=this._k,n=this._i++;return!t||n>=t.length?(this._t=void 0,o(1)):o(0,"keys"==e?n:"values"==e?t[n]:[n,t[n]])}),"values"),i.Arguments=i.Array,r("keys"),r("values"),r("entries")},function(t,e,n){"use strict";var r,o=function(){return void 0===r&&(r=Boolean(window&&document&&document.all&&!window.atob)),r},i=function(){var t={};return function(e){if(void 0===t[e]){var n=document.querySelector(e);if(window.HTMLIFrameElement&&n instanceof window.HTMLIFrameElement)try{n=n.contentDocument.head}catch(t){n=null}t[e]=n}return t[e]}}(),c=[];function a(t){for(var e=-1,n=0;n<c.length;n++)if(c[n].identifier===t){e=n;break}return e}function f(t,e){for(var n={},r=[],o=0;o<t.length;o++){var i=t[o],f=e.base?i[0]+e.base:i[0],u=n[f]||0,s="".concat(f," ").concat(u);n[f]=u+1;var l=a(s),p={css:i[1],media:i[2],sourceMap:i[3]};-1!==l?(c[l].references++,c[l].updater(p)):c.push({identifier:s,updater:m(p,e),references:1}),r.push(s)}return r}function u(t){var e=document.createElement("style"),r=t.attributes||{};if(void 0===r.nonce){var o=n.nc;o&&(r.nonce=o)}if(Object.keys(r).forEach((function(t){e.setAttribute(t,r[t])})),"function"==typeof t.insert)t.insert(e);else{var c=i(t.insert||"head");if(!c)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");c.appendChild(e)}return e}var s,l=(s=[],function(t,e){return s[t]=e,s.filter(Boolean).join("\n")});function p(t,e,n,r){var o=n?"":r.media?"@media ".concat(r.media," {").concat(r.css,"}"):r.css;if(t.styleSheet)t.styleSheet.cssText=l(e,o);else{var i=document.createTextNode(o),c=t.childNodes;c[e]&&t.removeChild(c[e]),c.length?t.insertBefore(i,c[e]):t.appendChild(i)}}function d(t,e,n){var r=n.css,o=n.media,i=n.sourceMap;if(o?t.setAttribute("media",o):t.removeAttribute("media"),i&&"undefined"!=typeof btoa&&(r+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i))))," */")),t.styleSheet)t.styleSheet.cssText=r;else{for(;t.firstChild;)t.removeChild(t.firstChild);t.appendChild(document.createTextNode(r))}}var _=null,v=0;function m(t,e){var n,r,o;if(e.singleton){var i=v++;n=_||(_=u(e)),r=p.bind(null,n,i,!1),o=p.bind(null,n,i,!0)}else n=u(e),r=d.bind(null,n,e),o=function(){!function(t){if(null===t.parentNode)return!1;t.parentNode.removeChild(t)}(n)};return r(t),function(e){if(e){if(e.css===t.css&&e.media===t.media&&e.sourceMap===t.sourceMap)return;r(t=e)}else o()}}t.exports=function(t,e){(e=e||{}).singleton||"boolean"==typeof e.singleton||(e.singleton=o());var n=f(t=t||[],e);return function(t){if(t=t||[],"[object Array]"===Object.prototype.toString.call(t)){for(var r=0;r<n.length;r++){var o=a(n[r]);c[o].references--}for(var i=f(t,e),u=0;u<n.length;u++){var s=a(n[u]);0===c[s].references&&(c[s].updater(),c.splice(s,1))}n=i}}}},function(t,e,n){"use strict";t.exports=function(t){var e=[];return e.toString=function(){return this.map((function(e){var n=t(e);return e[2]?"@media ".concat(e[2]," {").concat(n,"}"):n})).join("")},e.i=function(t,n,r){"string"==typeof t&&(t=[[null,t,""]]);var o={};if(r)for(var i=0;i<this.length;i++){var c=this[i][0];null!=c&&(o[c]=!0)}for(var a=0;a<t.length;a++){var f=[].concat(t[a]);r&&o[f[0]]||(n&&(f[2]?f[2]="".concat(n," and ").concat(f[2]):f[2]=n),e.push(f))}},e}},function(t,e){t.exports=function(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}},function(t,e,n){n(3)&&"g"!=/./g.flags&&n(7).f(RegExp.prototype,"flags",{configurable:!0,get:n(54)})},function(t,e,n){t.exports=n(23)("native-function-to-string",Function.toString)},function(t,e,n){var r=n(37),o=n(6)("toStringTag"),i="Arguments"==r(function(){return arguments}());t.exports=function(t){var e,n,c;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),o))?n:i?r(e):"Object"==(c=r(e))&&"function"==typeof e.callee?"Arguments":c}},function(t,e,n){var r=n(62),o=Math.max,i=Math.min;t.exports=function(t,e){return(t=r(t))<0?o(t+e,0):i(t,e)}},function(t,e,n){var r=n(4).document;t.exports=r&&r.documentElement},function(t,e,n){"use strict";var r=n(38),o=n(9),i=n(76),c=[].slice,a={},f=function(t,e,n){if(!(e in a)){for(var r=[],o=0;o<e;o++)r[o]="a["+o+"]";a[e]=Function("F,a","return new F("+r.join(",")+")")}return a[e](t,n)};t.exports=Function.bind||function(t){var e=r(this),n=c.call(arguments,1),a=function(){var r=n.concat(c.call(arguments));return this instanceof a?f(e,r.length,r):i(e,r,t)};return o(e.prototype)&&(a.prototype=e.prototype),a}},function(t,e){t.exports=function(t,e,n){var r=void 0===n;switch(e.length){case 0:return r?t():t.call(n);case 1:return r?t(e[0]):t.call(n,e[0]);case 2:return r?t(e[0],e[1]):t.call(n,e[0],e[1]);case 3:return r?t(e[0],e[1],e[2]):t.call(n,e[0],e[1],e[2]);case 4:return r?t(e[0],e[1],e[2],e[3]):t.call(n,e[0],e[1],e[2],e[3])}return t.apply(n,e)}},function(t,e,n){var r=n(2);r(r.S+r.F,"Object",{assign:n(78)})},function(t,e,n){"use strict";var r=n(3),o=n(15),i=n(25),c=n(26),a=n(21),f=n(40),u=Object.assign;t.exports=!u||n(5)((function(){var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=u({},t)[n]||Object.keys(u({},e)).join("")!=r}))?function(t,e){for(var n=a(t),u=arguments.length,s=1,l=i.f,p=c.f;u>s;)for(var d,_=f(arguments[s++]),v=l?o(_).concat(l(_)):o(_),m=v.length,b=0;m>b;)d=v[b++],r&&!p.call(_,d)||(n[d]=_[d]);return n}:u},function(t,e){function n(e,r){return t.exports=n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t},n(e,r)}t.exports=n},function(t,e){t.exports=function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}},function(t,e,n){"use strict";n(82)("bold",(function(t){return function(){return t(this,"b","","")}}))},function(t,e,n){var r=n(2),o=n(5),i=n(41),c=/"/g,a=function(t,e,n,r){var o=String(i(t)),a="<"+e;return""!==n&&(a+=" "+n+'="'+String(r).replace(c,"&quot;")+'"'),a+">"+o+"</"+e+">"};t.exports=function(t,e){var n={};n[t]=e(a),r(r.P+r.F*o((function(){var e=""[t]('"');return e!==e.toLowerCase()||e.split('"').length>3})),"String",n)}},function(t,e,n){"use strict";var r=n(2),o=n(60)(!1),i=[].indexOf,c=!!i&&1/[1].indexOf(1,-0)<0;r(r.P+r.F*(c||!n(27)(i)),"Array",{indexOf:function(t){return c?i.apply(this,arguments)||0:o(this,t,arguments[1])}})},function(t,e,n){var r=n(2);r(r.S+r.F*!n(3),"Object",{defineProperty:n(7).f})},function(t,e,n){var r=n(2);r(r.S+r.F*!n(3),"Object",{defineProperties:n(58)})},function(t,e,n){var r=n(2),o=n(87),i=n(13),c=n(63),a=n(88);r(r.S,"Object",{getOwnPropertyDescriptors:function(t){for(var e,n,r=i(t),f=c.f,u=o(r),s={},l=0;u.length>l;)void 0!==(n=f(r,e=u[l++]))&&a(s,e,n);return s}})},function(t,e,n){var r=n(44),o=n(25),i=n(8),c=n(4).Reflect;t.exports=c&&c.ownKeys||function(t){var e=r.f(i(t)),n=o.f;return n?e.concat(n(t)):e}},function(t,e,n){"use strict";var r=n(7),o=n(18);t.exports=function(t,e,n){e in t?r.f(t,e,o(0,n)):t[e]=n}},function(t,e,n){"use strict";var r=n(2),o=n(45)(0),i=n(27)([].forEach,!0);r(r.P+r.F*!i,"Array",{forEach:function(t){return o(this,t,arguments[1])}})},function(t,e,n){var r=n(91);t.exports=function(t,e){return new(r(t))(e)}},function(t,e,n){var r=n(9),o=n(64),i=n(6)("species");t.exports=function(t){var e;return o(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!o(e.prototype)||(e=void 0),r(e)&&null===(e=e[i])&&(e=void 0)),void 0===e?Array:e}},function(t,e,n){"use strict";var r=n(2),o=n(45)(2);r(r.P+r.F*!n(27)([].filter,!0),"Array",{filter:function(t){return o(this,t,arguments[1])}})},function(t,e,n){"use strict";var r=n(4),o=n(12),i=n(3),c=n(2),a=n(10),f=n(94).KEY,u=n(5),s=n(23),l=n(46),p=n(19),d=n(6),_=n(65),v=n(95),m=n(96),b=n(64),y=n(8),h=n(9),g=n(21),x=n(13),E=n(35),O=n(18),N=n(39),S=n(97),I=n(63),C=n(25),w=n(7),A=n(15),T=I.f,R=w.f,j=S.f,F=r.Symbol,P=r.JSON,k=P&&P.stringify,L=d("_hidden"),M=d("toPrimitive"),U={}.propertyIsEnumerable,B=s("symbol-registry"),D=s("symbols"),V=s("op-symbols"),K=Object.prototype,W="function"==typeof F&&!!C.f,G=r.QObject,H=!G||!G.prototype||!G.prototype.findChild,z=i&&u((function(){return 7!=N(R({},"a",{get:function(){return R(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=T(K,e);r&&delete K[e],R(t,e,n),r&&t!==K&&R(K,e,r)}:R,q=function(t){var e=D[t]=N(F.prototype);return e._k=t,e},X=W&&"symbol"==typeof F.iterator?function(t){return"symbol"==typeof t}:function(t){return t instanceof F},J=function(t,e,n){return t===K&&J(V,e,n),y(t),e=E(e,!0),y(n),o(D,e)?(n.enumerable?(o(t,L)&&t[L][e]&&(t[L][e]=!1),n=N(n,{enumerable:O(0,!1)})):(o(t,L)||R(t,L,O(1,{})),t[L][e]=!0),z(t,e,n)):R(t,e,n)},Q=function(t,e){y(t);for(var n,r=m(e=x(e)),o=0,i=r.length;i>o;)J(t,n=r[o++],e[n]);return t},Y=function(t){var e=U.call(this,t=E(t,!0));return!(this===K&&o(D,t)&&!o(V,t))&&(!(e||!o(this,t)||!o(D,t)||o(this,L)&&this[L][t])||e)},Z=function(t,e){if(t=x(t),e=E(e,!0),t!==K||!o(D,e)||o(V,e)){var n=T(t,e);return!n||!o(D,e)||o(t,L)&&t[L][e]||(n.enumerable=!0),n}},$=function(t){for(var e,n=j(x(t)),r=[],i=0;n.length>i;)o(D,e=n[i++])||e==L||e==f||r.push(e);return r},tt=function(t){for(var e,n=t===K,r=j(n?V:x(t)),i=[],c=0;r.length>c;)!o(D,e=r[c++])||n&&!o(K,e)||i.push(D[e]);return i};W||(a((F=function(){if(this instanceof F)throw TypeError("Symbol is not a constructor!");var t=p(arguments.length>0?arguments[0]:void 0),e=function(n){this===K&&e.call(V,n),o(this,L)&&o(this[L],t)&&(this[L][t]=!1),z(this,t,O(1,n))};return i&&H&&z(K,t,{configurable:!0,set:e}),q(t)}).prototype,"toString",(function(){return this._k})),I.f=Z,w.f=J,n(44).f=S.f=$,n(26).f=Y,C.f=tt,i&&!n(24)&&a(K,"propertyIsEnumerable",Y,!0),_.f=function(t){return q(d(t))}),c(c.G+c.W+c.F*!W,{Symbol:F});for(var et="hasInstance,isConcatSpreadable,iterator,match,replace,search,species,split,toPrimitive,toStringTag,unscopables".split(","),nt=0;et.length>nt;)d(et[nt++]);for(var rt=A(d.store),ot=0;rt.length>ot;)v(rt[ot++]);c(c.S+c.F*!W,"Symbol",{for:function(t){return o(B,t+="")?B[t]:B[t]=F(t)},keyFor:function(t){if(!X(t))throw TypeError(t+" is not a symbol!");for(var e in B)if(B[e]===t)return e},useSetter:function(){H=!0},useSimple:function(){H=!1}}),c(c.S+c.F*!W,"Object",{create:function(t,e){return void 0===e?N(t):Q(N(t),e)},defineProperty:J,defineProperties:Q,getOwnPropertyDescriptor:Z,getOwnPropertyNames:$,getOwnPropertySymbols:tt});var it=u((function(){C.f(1)}));c(c.S+c.F*it,"Object",{getOwnPropertySymbols:function(t){return C.f(g(t))}}),P&&c(c.S+c.F*(!W||u((function(){var t=F();return"[null]"!=k([t])||"{}"!=k({a:t})||"{}"!=k(Object(t))}))),"JSON",{stringify:function(t){for(var e,n,r=[t],o=1;arguments.length>o;)r.push(arguments[o++]);if(n=e=r[1],(h(e)||void 0!==t)&&!X(t))return b(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!X(e))return e}),r[1]=e,k.apply(P,r)}}),F.prototype[M]||n(11)(F.prototype,M,F.prototype.valueOf),l(F,"Symbol"),l(Math,"Math",!0),l(r.JSON,"JSON",!0)},function(t,e,n){var r=n(19)("meta"),o=n(9),i=n(12),c=n(7).f,a=0,f=Object.isExtensible||function(){return!0},u=!n(5)((function(){return f(Object.preventExtensions({}))})),s=function(t){c(t,r,{value:{i:"O"+ ++a,w:{}}})},l=t.exports={KEY:r,NEED:!1,fastKey:function(t,e){if(!o(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!i(t,r)){if(!f(t))return"F";if(!e)return"E";s(t)}return t[r].i},getWeak:function(t,e){if(!i(t,r)){if(!f(t))return!0;if(!e)return!1;s(t)}return t[r].w},onFreeze:function(t){return u&&l.NEED&&f(t)&&!i(t,r)&&s(t),t}}},function(t,e,n){var r=n(4),o=n(20),i=n(24),c=n(65),a=n(7).f;t.exports=function(t){var e=o.Symbol||(o.Symbol=i?{}:r.Symbol||{});"_"==t.charAt(0)||t in e||a(e,t,{value:c.f(t)})}},function(t,e,n){var r=n(15),o=n(25),i=n(26);t.exports=function(t){var e=r(t),n=o.f;if(n)for(var c,a=n(t),f=i.f,u=0;a.length>u;)f.call(t,c=a[u++])&&e.push(c);return e}},function(t,e,n){var r=n(13),o=n(44).f,i={}.toString,c="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[];t.exports.f=function(t){return c&&"[object Window]"==i.call(t)?function(t){try{return o(t)}catch(t){return c.slice()}}(t):o(r(t))}},function(t,e){t.exports=function(t,e){if(null==t)return{};var n,r,o={},i=Object.keys(t);for(r=0;r<i.length;r++)n=i[r],e.indexOf(n)>=0||(o[n]=t[n]);return o}},function(t,e,n){for(var r=n(66),o=n(15),i=n(10),c=n(4),a=n(11),f=n(47),u=n(6),s=u("iterator"),l=u("toStringTag"),p=f.Array,d={CSSRuleList:!0,CSSStyleDeclaration:!1,CSSValueList:!1,ClientRectList:!1,DOMRectList:!1,DOMStringList:!1,DOMTokenList:!0,DataTransferItemList:!1,FileList:!1,HTMLAllCollection:!1,HTMLCollection:!1,HTMLFormElement:!1,HTMLSelectElement:!1,MediaList:!0,MimeTypeArray:!1,NamedNodeMap:!1,NodeList:!0,PaintRequestList:!1,Plugin:!1,PluginArray:!1,SVGLengthList:!1,SVGNumberList:!1,SVGPathSegList:!1,SVGPointList:!1,SVGStringList:!1,SVGTransformList:!1,SourceBufferList:!1,StyleSheetList:!0,TextTrackCueList:!1,TextTrackList:!1,TouchList:!1},_=o(d),v=0;v<_.length;v++){var m,b=_[v],y=d[b],h=c[b],g=h&&h.prototype;if(g&&(g[s]||a(g,s,p),g[l]||a(g,l,b),f[b]=p,y))for(m in r)g[m]||i(g,m,r[m],!0)}},function(t,e,n){var r=n(6)("unscopables"),o=Array.prototype;null==o[r]&&n(11)(o,r,{}),t.exports=function(t){o[r][t]=!0}},function(t,e){t.exports=function(t,e){return{value:e,done:!!t}}},function(t,e,n){"use strict";var r=n(24),o=n(2),i=n(10),c=n(11),a=n(47),f=n(103),u=n(46),s=n(104),l=n(6)("iterator"),p=!([].keys&&"next"in[].keys()),d=function(){return this};t.exports=function(t,e,n,_,v,m,b){f(n,e,_);var y,h,g,x=function(t){if(!p&&t in S)return S[t];switch(t){case"keys":case"values":return function(){return new n(this,t)}}return function(){return new n(this,t)}},E=e+" Iterator",O="values"==v,N=!1,S=t.prototype,I=S[l]||S["@@iterator"]||v&&S[v],C=I||x(v),w=v?O?x("entries"):C:void 0,A="Array"==e&&S.entries||I;if(A&&(g=s(A.call(new t)))!==Object.prototype&&g.next&&(u(g,E,!0),r||"function"==typeof g[l]||c(g,l,d)),O&&I&&"values"!==I.name&&(N=!0,C=function(){return I.call(this)}),r&&!b||!p&&!N&&S[l]||c(S,l,C),a[e]=C,a[E]=d,v)if(y={values:O?C:x("values"),keys:m?C:x("keys"),entries:w},b)for(h in y)h in S||i(S,h,y[h]);else o(o.P+o.F*(p||N),e,y);return y}},function(t,e,n){"use strict";var r=n(39),o=n(18),i=n(46),c={};n(11)(c,n(6)("iterator"),(function(){return this})),t.exports=function(t,e,n){t.prototype=r(c,{next:o(1,n)}),i(t,e+" Iterator")}},function(t,e,n){var r=n(12),o=n(21),i=n(42)("IE_PROTO"),c=Object.prototype;t.exports=Object.getPrototypeOf||function(t){return t=o(t),r(t,i)?t[i]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?c:null}},function(t,e,n){var r=n(21),o=n(15);n(106)("keys",(function(){return function(t){return o(r(t))}}))},function(t,e,n){var r=n(2),o=n(20),i=n(5);t.exports=function(t,e){var n=(o.Object||{})[t]||Object[t],c={};c[t]=e(n),r(r.S+r.F*i((function(){n(1)})),"Object",c)}},function(t,e,n){"use strict";var r=n(2),o=n(45)(1);r(r.P+r.F*!n(27)([].map,!0),"Array",{map:function(t){return o(this,t,arguments[1])}})},function(t,e,n){"use strict";n.r(e);var r=n(0),o=n.n(r),i=(n(51),n(55),n(36),n(56),n(77),n(28)),c=n.n(i),a=n(29),f=n.n(a),u=n(30),s=n.n(u),l=n(31),p=n.n(l),d=n(17),_=n.n(d),v=n(32),m=n(14),b=n(22),y=(n(81),n(1)),h=n.n(y),g=function(t){var e=t.label,n=t.onClick,r=t.type,i=t.disabled,c=t.className,a=t.autoFocus,f=void 0!==a&&a;return o.a.createElement("button",{type:r,onClick:n,className:h()("exir-button","mdc-button","mdc-button--unelevated","exir-button-font",{disabled:i},c),disabled:i,autoFocus:f},e)};g.defaultProps={type:"submit",disabled:!1,className:""};n(83);var x=n(33),E=function(t){var e=t.icon,n=t.alt,r=t.wrapperClassName,i=t.imageWrapperClassName,c=t.svgWrapperClassName,a=t.beforeInjection,f=void 0===a?function(){}:a,u=e.indexOf(".svg")>0;return o.a.createElement("span",null,e&&u&&o.a.createElement(x.ReactSVG,{src:e,className:h()(r,c),beforeInjection:f,fallback:function(){return o.a.createElement("img",{src:e,alt:n,className:h()(r,c)})}}),e&&!u&&o.a.createElement("img",{src:e,alt:n,className:h()(r,i,"object-fit-contain")}))};E.defaultProps={icon:"",iconId:"",stringId:"",alt:"",wrapperClassName:"",imageWrapperClassName:"",svgWrapperClassName:"",showUpload:!0};var O=function(t){var e=t.text,n=t.iconPath,r=t.textType,i=t.underline,c=t.className,a=t.imageWrapperClassName,f=void 0===a?"":a;return o.a.createElement("div",{className:h()("icon_title-wrapper",{underline:i},c)},n&&o.a.createElement(E,{icon:n,alt:e,wrapperClassName:f,imageWrapperClassName:"icon_title-image",svgWrapperClassName:"icon_title-svg",showUpload:!1}),o.a.createElement("div",{className:h()("icon_title-text","text-center",r)},e))};O.defaultProps={iconPath:"",textType:"",underline:!1};var N=function(t){var e=t.title,n=t.children,r=t.openContactForm,i=t.icon,c=t.strings,a=void 0===c?{}:c,f=t.icons,u=void 0===f?{}:f;return o.a.createElement("div",{className:"header_title-wrapper d-flex flex-column w-100 f-1"},o.a.createElement("div",{className:"d-flex"},!!i&&o.a.createElement("div",{className:"mr-2"},o.a.createElement(E,{icon:i,wrapperClassName:"header_title-icon"})),o.a.createElement("div",null,o.a.createElement("div",{className:"d-flex justify-content-between w-100 f-1"},o.a.createElement("div",{className:"header_title-text font-weight-bold"},e),!!r&&o.a.createElement("div",{className:"header_title-action"},o.a.createElement(I,{stringId:"NEED_HELP_TEXT",text:a.NEED_HELP_TEXT,status:"information",iconId:"BLUE_QUESTION",iconPath:u.BLUE_QUESTION,onClick:r}))),n&&o.a.createElement("div",{className:"header_title-children"},n))))},S=function(t){switch(t){case"success":return"notification-success";case"warning":return"notification-warning";case"information":return"notification-info";case"disabled":return"notification-disabled";case"loading":return"notification-loading";default:return""}},I=function(t){var e=t.text,n=t.stringId,r=t.status,i=t.onClick,c=t.iconId,a=t.iconPath,f=t.className,u=t.reverseImage,s=t.textPosition,l=t.iconPosition,p=t.showPointer,d=t.rotate,_=t.rotateIfLtr,v=t.rotateIfRtl,m=t.showActionText,y=t.disable,g=void 0!==y&&y;return o.a.createElement("div",{className:h()("action_notification-wrapper",{pointer:!g&&p,left:"left"===s,right:"right"===s,"icon_on-right":"right"===l,"icon_on-left":"left"===l,disabled:g},f),onClick:function(t){var e=t.target.dataset,n=void 0===e?{}:e,r=n.stringId,o=n.iconId;if(!g&&!r&&!o&&i)return i()}},(m||!b.isMobile)&&o.a.createElement("div",{className:h()("action_notification-text",S(r))},e),o.a.createElement(E,{iconId:c,stringId:n,icon:a,alt:e,svgWrapperClassName:"action_notification-svg",imageWrapperClassName:h()("action_notification-image",{rotate_ltr:_,rotate_rtl:v,rotate:d,reverse:u})}))};I.defaultProps={text:"",status:"information",iconPath:"",className:"",reverseImage:!1,textPosition:"right",iconPosition:"right",showPointer:!0,rotate:!1,rotateIfRtl:!1,rotateIfLtr:!1};var C=n(67),w=n.n(C),A=n(49),T={insert:"head",singleton:!1},R=(w()(A.a,T),A.a.locals,n(84),n(85),n(86),n(89),n(92),n(93),n(16)),j=n.n(R),F=n(69),P=n.n(F),k=n(34),L=n.n(k),M=(n(99),n(66),n(105),n(107),n(48)),U=n.n(M);function B(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_()(t);if(e){var o=_()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return p()(this,n)}}var D=function(t){var e=t.label,n=void 0===e?"":e,r=t.valid,i=void 0!==r&&r,c=t.hasValue,a=void 0!==c&&c,f=t.focused,u=void 0!==f&&f,s=t.children,l=t.hideUnderline,p=void 0!==l&&l,d=t.contentClassName,_=void 0===d?"":d,v=t.hideCheck,m=void 0!==v&&v,b=t.outlineClassName,y=void 0===b?"":b,g=t.staticIcons,E=void 0===g?{}:g;return o.a.createElement("div",{className:h()("field-content")},o.a.createElement("div",{className:"d-flex"},n&&o.a.createElement("div",{className:"field-label"},n)),o.a.createElement("div",{className:h()("field-children",{valid:i,custom:p},_)},s,!m&&i&&a&&o.a.createElement(x.ReactSVG,{src:E.BLACK_CHECK,className:"field-valid"})),!p&&o.a.createElement("span",{className:h()("field-content-outline",y,{focused:u})}))},V=function(t){var e=t.error,n=t.displayError,r=t.className,i=t.staticIcons,c=void 0===i?{}:i,a=t.getErrorLocalized;return o.a.createElement("div",{className:h()("field-error-content",r,{"field-error-hidden":!n})},e&&o.a.createElement("img",{src:c.RED_WARNING,className:"field-error-icon",alt:"error"}),e&&o.a.createElement("span",{className:"field-error-text"},a(e)))},K=function(t){s()(n,t);var e=B(n);function n(){return c()(this,n),e.apply(this,arguments)}return f()(n,[{key:"render",value:function(){var t=this.props,e=t.children,n=t.label,r=t.stringId,i=t.input.value,c=t.meta,a=c.active,f=void 0!==a&&a,u=c.error,s=void 0===u?"":u,l=c.touched,p=void 0!==l&&l,d=c.invalid,_=void 0!==d&&d,v=t.focused,m=void 0!==v&&v,b=t.fullWidth,y=void 0!==b&&b,g=t.visited,x=void 0!==g&&g,E=t.hideUnderline,O=void 0!==E&&E,N=t.className,S=void 0===N?"":N,C=t.onClick,w=void 0===C?function(){}:C,A=t.notification,T=t.hideCheck,R=void 0!==T&&T,F=t.outlineClassName,P=void 0===F?"":F,k=t.getErrorLocalized,L=void 0===k?function(t){return t}:k,M=t.staticIcons,B=void 0===M?{}:M,K=!(f||m)&&(x||p)&&s,W=i||!1===i;return o.a.createElement("div",{className:h()("field-wrapper",S,{error:K,inline:!y,"with-notification":!!A,"field-valid":!_})},o.a.createElement(D,{stringId:r,label:n,valid:!_,hasValue:W,focused:f||m,hideUnderline:O,hideCheck:R,outlineClassName:P,onClick:w,staticIcons:B},e,A&&"object"===U()(A)&&o.a.createElement(I,j()({},A,{className:h()("pr-0 pl-0 no_bottom",{"with-tick-icon":y&&!_&&!R}),showActionText:!0}))),o.a.createElement(V,{displayError:K,error:s,staticIcons:B,getErrorLocalized:L}))}}]),n}(r.Component);K.defaultProps={meta:{},input:{value:""}};var W=K,G=function(t){var e,n,r,i,c,a=t.input,f=t.type,u=t.placeholder,s=t.meta,l=s.touched,p=s.error,d=s.active,_=(t.onClick,t.fullWidth,t.information,t.notification,t.options),v=(t.hideCheck,t.outlineClassName,t.stringId,L()(t,["input","type","placeholder","meta","onClick","fullWidth","information","notification","options","hideCheck","outlineClassName","stringId"])),m=l&&p&&!d;return o.a.createElement(W,t,o.a.createElement("div",{style:{display:"flex"}},_&&(n=(e=_).icon,r=void 0===n?"":n,i=e.label,c=void 0===i?"":i,o.a.createElement("div",null,o.a.createElement("img",{className:"input_icon",src:r,alt:c}))),o.a.createElement("input",j()({placeholder:u,className:h()("input_field-input",{error:m}),type:f},a,v))))};function H(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function z(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?H(Object(n),!0).forEach((function(e){P()(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):H(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}var q=function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=arguments.length>1?arguments[1]:void 0;return o.a.createElement("div",null,Object.keys(t).map((function(n){var r=t[n],i=r.type,c=r.validate,a=void 0===c?[]:c,f=L()(r,["type","validate"]),u=z({callback:e,key:n,name:n,type:i,validate:a},f);switch(i){case"text":default:return o.a.createElement(m.Field,j()({component:G},u))}})))};function X(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_()(t);if(e){var o=_()(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return p()(this,n)}}var J=function(t,e){return function(){var n=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return n.length>t?e:void 0}},Q=function(t){return t?void 0:"required"},Y=function(t){s()(n,t);var e=X(n);function n(){var t;c()(this,n);for(var r=arguments.length,o=new Array(r),i=0;i<r;i++)o[i]=arguments[i];return(t=e.call.apply(e,[this].concat(o))).state={formFields:{}},t.generateFormFields=function(){var e=t.props.strings,n=void 0===e?{}:e,r={};r.bank_name={type:"text",stringId:"USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_LABEL,USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_PLACEHOLDER",label:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_LABEL"],placeholder:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.BANK_NAME_PLACEHOLDER"],validate:[Q],fullWidth:b.isMobile},r.account_number={type:"text",stringId:"USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_LABEL,USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_PLACEHOLDER,USER_VERIFICATION.BANK_ACCOUNT_FORM.VALIDATIONS.ACCOUNT_NUMBER_MAX_LENGTH",label:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_LABEL"],placeholder:n["USER_VERIFICATION.BANK_ACCOUNT_FORM.FORM_FIELDS.ACCOUNT_NUMBER_PLACEHOLDER"],validate:[Q,J(50,n["USER_VERIFICATION.BANK_ACCOUNT_FORM.VALIDATIONS.ACCOUNT_NUMBER_MAX_LENGTH"])],maxLength:50,fullWidth:b.isMobile},t.setState({formFields:r})},t.handleSubmit=function(e){var n=Object.assign({},e),r=t.props.verifyBankData;return(void 0===r?function(){}:r)(n).then((function(e){var n=e.data;t.props.moveToNextStep("bank",{bank_data:n}),t.props.setActivePageContent("email")})).catch((function(t){var e={_error:t.message};throw t.response&&t.response.data&&(e._error=t.response.data.message),new m.SubmissionError(e)}))},t.onGoBack=function(){t.props.setActivePageContent("email"),t.props.handleBack("bank")},t}return f()(n,[{key:"componentDidMount",value:function(){this.generateFormFields()}},{key:"render",value:function(){var t=this.props,e=t.handleSubmit,n=t.pristine,r=t.submitting,i=t.valid,c=t.error,a=t.openContactForm,f=t.icon,u=t.iconId,s=t.strings,l=void 0===s?{}:s,p=t.icons,d=void 0===p?{}:p,_=t.getErrorLocalized,v=void 0===_?function(){}:_,m=this.state.formFields;return o.a.createElement("div",{className:"presentation_container apply_rtl verification_container"},o.a.createElement(O,{stringId:"USER_VERIFICATION.BANK_VERIFICATION",text:l["USER_VERIFICATION.BANK_VERIFICATION"],textType:"title"}),o.a.createElement("form",{className:"d-flex flex-column w-100 verification_content-form-wrapper"},o.a.createElement(N,{stringId:"USER_VERIFICATION.TITLE_BANK_ACCOUNT",title:l["USER_VERIFICATION.TITLE_BANK_ACCOUNT"],iconId:u,icon:f,openContactForm:a,strings:l,icons:d},o.a.createElement("div",{className:"my-2"},l["USER_VERIFICATION.BANK_VERIFICATION_TEXT_1"]),o.a.createElement("div",{className:"my-2"},l["USER_VERIFICATION.BANK_VERIFICATION_TEXT_2"]),o.a.createElement("ul",{className:"pl-4"},o.a.createElement("li",{className:"my-1"},l["USER_VERIFICATION.BASE_WITHDRAWAL"]),o.a.createElement("li",{className:"my-1"},l["USER_VERIFICATION.BASE_DEPOSITS"]),o.a.createElement("li",{className:"my-1"},l["USER_VERIFICATION.WARNING.LIST_ITEM_3"]))),q(m),c&&o.a.createElement("div",{className:"warning_text"},v(c)),o.a.createElement("div",{className:"d-flex"},o.a.createElement("div",{className:"w-50"},o.a.createElement(g,{label:l["USER_VERIFICATION.GO_BACK"],onClick:this.onGoBack})),o.a.createElement("div",{className:"separator"}),o.a.createElement("div",{className:"w-50"},o.a.createElement(g,{label:l.SUBMIT,type:"button",onClick:e(this.handleSubmit),disabled:n||r||!i||!!c})))))}}]),n}(r.Component),Z=Object(m.reduxForm)({form:"BankVerification"})(Y),$=Object(v.connect)((function(t){return{}}))(Z),tt=n(50),et=Object(tt.combineReducers)({form:m.reducer}),nt=Object(tt.createStore)(et);e.default=function(t){return o.a.createElement(v.Provider,{store:nt},o.a.createElement($,t))}}]));
\ No newline at end of file
diff --git a/web/public/remote_page.js b/web/public/remote_page.js
new file mode 100644
index 0000000000..ac4842eb1f
--- /dev/null
+++ b/web/public/remote_page.js
@@ -0,0 +1 @@
+!function(e,r){for(var t in r)e[t]=r[t]}(exports,function(e){var r={};function t(n){if(r[n])return r[n].exports;var o=r[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,t),o.l=!0,o.exports}return t.m=e,t.c=r,t.d=function(e,r,n){t.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:n})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,r){if(1&r&&(e=t(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(t.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var o in e)t.d(n,o,function(r){return e[r]}.bind(null,o));return n},t.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(r,"a",r),r},t.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},t.p="",t(t.s=1)}([function(e,r){e.exports=require("react")},function(e,r,t){"use strict";t.r(r);var n=t(0),o=t.n(n),u=function(e){var r=e.children;return o.a.createElement("h1",null,r)};r.default=function(e){var r=e.user,t=(r=void 0===r?{}:r).username,n=void 0===t?"":t;return o.a.createElement(u,null,"Hello ".concat(n))}}]));
\ No newline at end of file
diff --git a/web/src/RemoteComponent.js b/web/src/RemoteComponent.js
new file mode 100644
index 0000000000..fe5f2d30bf
--- /dev/null
+++ b/web/src/RemoteComponent.js
@@ -0,0 +1,9 @@
+import {
+	createRemoteComponent,
+	createRequires,
+} from '@paciolan/remote-component';
+import { resolve } from 'remote-component.config';
+
+const requires = createRequires(resolve);
+
+export const RemoteComponent = createRemoteComponent({ requires });
diff --git a/web/src/_common.scss b/web/src/_common.scss
index 368dda2fda..fdf90e275a 100644
--- a/web/src/_common.scss
+++ b/web/src/_common.scss
@@ -173,8 +173,12 @@ table th {
 	align-items: flex-start;
 }
 
+.align-end {
+	align-items: flex-end;
+}
+
 .underline-text {
-	text-decoration: underline;
+	text-decoration: underline !important;
 }
 
 .disabled-link {
@@ -262,12 +266,6 @@ table th {
 		z-index: 1;
 	}
 
-	&.order-entry {
-		&.ant-select {
-			width: 100% !important;
-		}
-	}
-
 	.ant-select-arrow {
 		z-index: -1;
 	}
@@ -284,3 +282,15 @@ table th {
 .border-pale {
 	border-color: $colors-super-pale-black !important;
 }
+
+.text-align-center {
+	text-align: center;
+}
+
+.align-items-baseline {
+	align-items: baseline;
+}
+
+.no-border {
+	border: none !important;
+}
diff --git a/web/src/_customVariables.css b/web/src/_customVariables.css
index 5435a463cb..e688ccdba0 100644
--- a/web/src/_customVariables.css
+++ b/web/src/_customVariables.css
@@ -44,6 +44,8 @@
 	--calculated_trading_buying-related-text: #000000;
 	--calculated_trading_selling-related-text: #ffffff;
 	--calculated_base_modal-overlay: #ffffffbf;
+	--calculated_landing_background: #ffffff00;
+	--calculated_landing_markets_table: #fffffff0;
 	--calculated_specials_highlight-box: #0066b41a;
 	--calculated_base_top-bar-navigation_text: #ffffff;
 	--calculated_base_top-bar-navigation_text-inactive: #ffffffb3;
@@ -160,4 +162,14 @@
 	--coin-tusd-text: #ffffff;
 	--coin-dai: #f3c27a;
 	--coin-dai-text: #000000;
+	--coin-ama: #fa2902;
+	--coin-ama-text: #ffffff;
+	--coin-xtz: #2c7df7;
+	--coin-xtz-text: #ffffff;
+	--coin-doge: #c3a634;
+	--coin-doge-text: #ffffff;
+	--coin-uni: #ff4dab;
+	--coin-uni-text: #ffffff;
+	--coin-dot: #d80579;
+	--coin-dot-text: #ffffff;
 }
diff --git a/web/src/_variables.scss b/web/src/_variables.scss
index 46d4e8d382..e9c3ead29e 100644
--- a/web/src/_variables.scss
+++ b/web/src/_variables.scss
@@ -9,6 +9,7 @@ $bp-lg: 1199px;
 $colors-main-black: var(--labels_important-active-labels-text-graphics);
 $colors-black: var(--labels_secondary-inactive-label-text-graphics);
 $colors-border: var(--calculated_secondary-border);
+$colors-border-hover: var(--calculated_secondary-border-1);
 $colors-main-border: var(--calculated_important-border);
 $footer-border-color: var(--calculated_footer_border);
 $colors-super-pale-black: var(--calculated_super-pale_label-text-graphics);
@@ -49,6 +50,7 @@ $app-background-color: var(--base_background);
 $app-light-background: var(--base_secondary-navigation-bar);
 $app-sidebar-background: var(--base_wallet-sidebar-and-popup);
 $auth-container-background: var(--base_wallet-sidebar-and-popup);
+$landing_markets_table: var(--calculated_landing_markets_table);
 $market-card_gradient_background: var(
 	--calculated_market-card_gradient_background
 );
@@ -64,6 +66,7 @@ $quick-trade-container: var(--base_wallet-sidebar-and-popup);
 
 $app-modal-background: var(--calculated_base_modal-overlay);
 $app-bar-background-color: var(--base_top-bar-navigation);
+$app-landing_background: var(--calculated_landing_background);
 
 $app-line-divider: $colors-main-border;
 $box-fields: var(--labels_fields);
@@ -84,6 +87,14 @@ $sparkline-fill: var(--calculated_trading_buying-sparkline-fill);
 $negative-sparkline-fill: var(--calculated_trading_selling-sparkline-fill);
 $selling-orderbook-bar: var(--calculated_trading_selling-orderbook-bar);
 $buying-orderbook-bar: var(--calculated_trading_buying-orderbook-bar);
+$selling-orderbook-best-bar: var(
+	--calculated_trading_selling-orderbook-best-bar
+);
+$buying-orderbook-best-bar: var(--calculated_trading_buying-orderbook-best-bar);
+$selling-orderbook-hover: var(--calculated_trading_selling-orderbook-hover);
+$buying-orderbook-hover: var(--calculated_trading_buying-orderbook-hover);
+$orderbook-text: var(--calculated_trading-orderbook-text);
+$orderbook-secondary-text: var(--calculated_trading-orderbook-secondary-text);
 $buy-bids-text: var(--calculated_trading_buying-related-text);
 $sell-bids-text: var(--calculated_trading_selling-related-text);
 $base_top-bar-navigation_text: var(--calculated_base_top-bar-navigation_text);
@@ -288,6 +299,21 @@ $coin-tusd-text: var(--coin-tusd-text);
 $coin-dai: var(--coin-dai);
 $coin-dai-1: var(--coin-dai);
 $coin-dai-text: var(--coin-dai-text);
+$coin-ama: var(--coin-ama);
+$coin-ama-1: var(--coin-ama);
+$coin-ama-text: var(--coin-ama-text);
+$coin-xtz: var(--coin-xtz);
+$coin-xtz-1: var(--coin-xtz);
+$coin-xtz-text: var(--coin-xtz-text);
+$coin-doge: var(--coin-doge);
+$coin-doge-1: var(--coin-doge);
+$coin-doge-text: var(--coin-doge-text);
+$coin-uni: var(--coin-uni);
+$coin-uni-1: var(--coin-uni);
+$coin-uni-text: var(--coin-uni-text);
+$coin-dot: var(--coin-dot);
+$coin-dot-1: var(--coin-dot);
+$coin-dot-text: var(--coin-dot-text);
 
 $content-display-width: 100rem;
 $app-content-display-width: 75rem;
@@ -296,14 +322,15 @@ $background-patter--size: 30rem;
 
 $font-size-headline: 4rem;
 $font-size-headline2: 3.5rem;
-$font-size-subhead1: 2.5rem;
-$font-size-subhead2: 1.75rem;
-$font-size-subhead3: 1.25rem;
-$font-size-main: 1rem;
-$font-size-subtext: 0.9rem;
-$font-size-mobile-title: 14px;
-$font-size-mobile-txt: 12px;
-$font-size-mobile-innertxt: 10px;
+$font-size-subhead1: 2.6rem;
+$font-size-subhead2: 1.8rem;
+$font-size-subhead3: 1.3rem;
+$font-size-subhead4: 1.2rem;
+$font-size-main: 1.1rem;
+$font-size-subtext: 1rem;
+$font-size-mobile-title: 15px;
+$font-size-mobile-txt: 13px;
+$font-size-mobile-innertxt: 11px;
 
 $form-width-max: $content-display-width / 2;
 
diff --git a/web/src/actions/appActions.js b/web/src/actions/appActions.js
index bd6b5359cb..c8f94abc08 100644
--- a/web/src/actions/appActions.js
+++ b/web/src/actions/appActions.js
@@ -30,6 +30,7 @@ export const NOTIFICATIONS = {
 	STAKE_TOKEN: 'STAKE_TOKEN',
 	DEPOSIT_INFO: 'DEPOSIT_INFO',
 	XHT_SUCCESS_ACCESS: 'XHT_SUCCESS_ACCESS',
+	UNDEFINED_ERROR: 'UNDEFINED_ERROR',
 };
 export const CONTACT_FORM = 'CONTACT_FORM';
 export const HELPFUL_RESOURCES_FORM = 'HELPFUL_RESOURCES_FORM';
@@ -59,6 +60,10 @@ export const SET_PLUGINS_FAILURE = 'SET_PLUGINS_FAILURE';
 export const SET_CONFIG_LEVEL = 'SET_CONFIG_LEVEL';
 export const ADD_TO_FAVOURITES = 'ADD_TO_FAVOURITES';
 export const REMOVE_FROM_FAVOURITES = 'REMOVE_FROM_FAVOURITES';
+export const CHANGE_HOME_PAGE_SETTING = 'CHANGE_HOME_PAGE_SETTING';
+export const SET_WEB_VIEWS = 'SET_WEB_VIEWS';
+export const SET_INJECTED_VALUES = 'SET_INJECTED_VALUES';
+export const SET_INJECTED_HTML = 'SET_INJECTED_HTML';
 
 export const USER_TYPES = {
 	USER_TYPE_NORMAL: 'normal',
@@ -250,6 +255,15 @@ export const setPlugins = (enabledPlugins) => {
 	};
 };
 
+export const setWebViews = (enabledPlugins) => {
+	return {
+		type: SET_WEB_VIEWS,
+		payload: {
+			enabledPlugins,
+		},
+	};
+};
+
 export const setInfo = (info) => ({
 	type: SET_INFO,
 	payload: {
@@ -365,3 +379,18 @@ export const removeFromFavourites = (payload) => ({
 	type: REMOVE_FROM_FAVOURITES,
 	payload,
 });
+
+export const setHomePageSetting = (home_page = false) => ({
+	type: CHANGE_HOME_PAGE_SETTING,
+	payload: home_page,
+});
+
+export const setInjectedValues = (payload) => ({
+	type: SET_INJECTED_VALUES,
+	payload,
+});
+
+export const setInjectedHTML = (payload) => ({
+	type: SET_INJECTED_HTML,
+	payload,
+});
diff --git a/web/src/actions/authAction.js b/web/src/actions/authAction.js
index 9ba009d017..c1f8010857 100644
--- a/web/src/actions/authAction.js
+++ b/web/src/actions/authAction.js
@@ -120,7 +120,7 @@ export const logout = (message = '') => (dispatch) => {
 			message,
 		},
 	});
-	cleatTokenInApp(browserHistory, message ? '/login' : '/');
+	cleatTokenInApp(browserHistory, '/login');
 };
 
 export const setLogoutMessage = (message = '') => ({
diff --git a/web/src/actions/chartAction.js b/web/src/actions/chartAction.js
index 6eff0fecbd..ad21228cd3 100644
--- a/web/src/actions/chartAction.js
+++ b/web/src/actions/chartAction.js
@@ -4,20 +4,23 @@ import moment from 'moment';
 import { getDecimals } from '../utils/utils';
 
 export const getChartConfig = () => {
-	// return axios({
-	// 	url: '/udf/config',
-	// 	method: 'GET'
+	return axios({
+		url: '/udf/config',
+		method: 'GET'
+	})
+		.then((res) => {
+			return res.data;
+		});
+	// const config = {
+	// 	supported_resolutions: ['60', '240', '1D'],
+	// 	supports_group_request: false,
+	// 	supports_marks: false,
+	// 	supports_search: true,
+	// 	supports_timescale_marks: false,
+	// };
+	// return new Promise((resolve) => {
+	// 	resolve(config);
 	// });
-	const config = {
-		supported_resolutions: ['60', '1D'],
-		supports_group_request: false,
-		supports_marks: false,
-		supports_search: true,
-		supports_timescale_marks: false,
-	};
-	return new Promise((resolve) => {
-		resolve(config);
-	});
 };
 
 export const getChartSymbol = (symbol, tickSize, api_name = '') => {
diff --git a/web/src/actions/operatorActions.js b/web/src/actions/operatorActions.js
index baaadb6f79..f7e477e874 100644
--- a/web/src/actions/operatorActions.js
+++ b/web/src/actions/operatorActions.js
@@ -21,6 +21,21 @@ export const updateConfigs = async (configs) => {
 	return requestAuthenticated('/admin/kit', options);
 };
 
+export const updateInjectedHTML = (injected_html) => {
+	const constants = {
+		kit: {
+			injected_html,
+		},
+	};
+
+	const options = {
+		method: 'PUT',
+		body: JSON.stringify(constants),
+	};
+
+	return requestAuthenticated('/admin/kit', options);
+};
+
 export const getKitData = async () => {
 	const { data } = await axios.get('/kit');
 	return data;
@@ -44,13 +59,14 @@ export const publish = async (configs = {}) => {
 	console.info('Published Successfully');
 };
 
-export const pushVersions = async (configs) => {
+export const pushVersions = async (configs = {}) => {
+	const { sections = {}, ...rest } = configs;
 	const versions = await getVersions();
 	const uniqid = Date.now();
 	Object.keys(configs).forEach((key) => {
 		versions[key] = `${key}-${uniqid}`;
 	});
-	return { ...configs, meta: { versions } };
+	return { ...rest, meta: { versions, sections } };
 };
 
 export const upload = (formData) => {
diff --git a/web/src/actions/userAction.js b/web/src/actions/userAction.js
index ed41653f72..38089bce54 100644
--- a/web/src/actions/userAction.js
+++ b/web/src/actions/userAction.js
@@ -259,9 +259,14 @@ export const setUsernameStore = (username) => ({
 // 	payload: axios.get('/fees')
 // });
 
-export const createAddress = (addressType = '') => ({
+export const createAddress = (crypto, network) => ({
 	type: 'CREATE_ADDRESS',
-	payload: axios.get(`/user/create-address?crypto=${addressType}`),
+	payload: axios.get('/user/create-address', {
+		params: {
+			crypto,
+			...(network ? { network } : {}),
+		},
+	}),
 });
 
 export const cleanCreateAddress = () => ({
@@ -298,7 +303,7 @@ export const getUserLogins = ({ limit = 50, page = 1, ...rest }) => {
 			.get('/user/logins')
 			.then((body) => {
 				dispatch({
-					type: 'USER_DEPOSITS_FULFILLED',
+					type: 'USER_LOGINS_FULFILLED',
 					payload: {
 						...body.data,
 						page,
@@ -311,7 +316,7 @@ export const getUserLogins = ({ limit = 50, page = 1, ...rest }) => {
 			})
 			.catch((err) => {
 				dispatch({
-					type: 'USER_DEPOSITS_REJECTED',
+					type: 'USER_LOGINS_REJECTED',
 					payload: err.response,
 				});
 			});
diff --git a/web/src/actions/walletActions.js b/web/src/actions/walletActions.js
index 99970eef31..5dc5898a6a 100644
--- a/web/src/actions/walletActions.js
+++ b/web/src/actions/walletActions.js
@@ -16,6 +16,9 @@ export const ACTION_KEYS = {
 	USER_WITHDRAWALS_PENDING: 'USER_WITHDRAWALS_PENDING',
 	USER_WITHDRAWALS_FULFILLED: 'USER_WITHDRAWALS_FULFILLED',
 	USER_WITHDRAWALS_REJECTED: 'USER_WITHDRAWALS_REJECTED',
+	USER_LOGINS_PENDING: 'USER_LOGINS_PENDING',
+	USER_LOGINS_FULFILLED: 'USER_LOGINS_FULFILLED',
+	USER_LOGINS_REJECTED: 'USER_LOGINS_REJECTED',
 	USER_WITHDRAWALS_BTC_FEE_PENDING: 'USER_WITHDRAWALS_BTC_FEE_PENDING',
 	USER_WITHDRAWALS_BTC_FEE_FULFILLED: 'USER_WITHDRAWALS_BTC_FEE_FULFILLED',
 	USER_WITHDRAWALS_BTC_FEE_REJECTED: 'USER_WITHDRAWALS_BTC_FEE_REJECTED',
@@ -269,6 +272,21 @@ export const downloadUserTrades = (key) => {
 	};
 };
 
+const getParamsByStatus = (status) => {
+	switch (status) {
+		case 'dismissed':
+			return { dismissed: true };
+		case 'rejected':
+			return { rejected: true };
+		case 'completed':
+			return { status: true };
+		case 'pending':
+			return { processing: true };
+		default:
+			return {};
+	}
+};
+
 export const getUserDeposits = ({
 	limit = 50,
 	page = 1,
@@ -276,10 +294,11 @@ export const getUserDeposits = ({
 	currency,
 	...rest
 }) => {
+	const statusParams = getParamsByStatus(status);
 	const query = querystring.stringify({
 		page,
 		limit,
-		...(status ? { status } : {}),
+		...statusParams,
 		...(currency ? { currency } : {}),
 	});
 
@@ -316,10 +335,11 @@ export const getUserWithdrawals = ({
 	currency,
 	...rest
 }) => {
+	const statusParams = getParamsByStatus(status);
 	const query = querystring.stringify({
 		page,
 		limit,
-		...(status ? { status } : {}),
+		...statusParams,
 		...(currency ? { currency } : {}),
 	});
 
diff --git a/web/src/components/Accordion/_Accordion.scss b/web/src/components/Accordion/_Accordion.scss
index 9e1734d951..f7285c2ac7 100644
--- a/web/src/components/Accordion/_Accordion.scss
+++ b/web/src/components/Accordion/_Accordion.scss
@@ -154,7 +154,7 @@ $main-text--color: $colors-deactivate-color2;
 	}
 
 	.accordion_section_content {
-		font-size: $font-size-subtext;
+		font-size: $font-size-main;
 		padding: $accordion_content-padding;
 	}
 
diff --git a/web/src/components/AppBar/AnnouncementList.js b/web/src/components/AppBar/AnnouncementList.js
new file mode 100644
index 0000000000..5185f9c8a4
--- /dev/null
+++ b/web/src/components/AppBar/AnnouncementList.js
@@ -0,0 +1,122 @@
+import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import Scrollbars from 'react-custom-scrollbars';
+
+import { EditWrapper, NotificationsList, Image } from 'components';
+import STRINGS from '../../config/localizedStrings';
+import withConfig from 'components/ConfigProvider/withConfig';
+import { getAnnouncement } from 'actions/appActions';
+import { LAST_UPDATED_NOTIFICATION_KEY } from '../../config/constants';
+
+const AnnouncementList = ({
+	icons: ICONS,
+	user,
+	announcements,
+	getAnnouncement,
+}) => {
+	const [isOpen, setOpen] = useState(false);
+	const [unreadCount, setUnreadCount] = useState(0);
+	const elementRef = useRef(null);
+
+	const getAnnouncementList = useCallback(() => {
+		getAnnouncement();
+	}, [getAnnouncement]);
+
+	useEffect(() => {
+		document.addEventListener('click', onOutsideClick);
+		return () => {
+			document.removeEventListener('click', onOutsideClick);
+		};
+	}, []);
+
+	useEffect(() => {
+		if (user) {
+			getAnnouncementList();
+		}
+	}, [user, getAnnouncementList]);
+
+	useEffect(() => {
+		if (isOpen) {
+			let notificationTemp = announcements.sort((a, b) => {
+				return new Date(b.updated_at) - new Date(a.updated_at);
+			});
+			let notificationData = notificationTemp[0] || {};
+			if (notificationData.updated_at) {
+				localStorage.setItem(
+					LAST_UPDATED_NOTIFICATION_KEY,
+					notificationData.updated_at
+				);
+			}
+		} else {
+			const lastUpdated = localStorage.getItem(LAST_UPDATED_NOTIFICATION_KEY);
+			if (!lastUpdated) {
+				setUnreadCount(announcements.length);
+			} else {
+				const newData = announcements.filter(
+					(data) => new Date(data.updated_at) > new Date(lastUpdated)
+				);
+				setUnreadCount(newData.length);
+			}
+		}
+	}, [isOpen, announcements]);
+
+	const onOutsideClick = (event) => {
+		if (
+			elementRef.current &&
+			event.target !== elementRef.current &&
+			!elementRef.current.contains(event.target)
+		) {
+			setOpen(false);
+		}
+		if (
+			elementRef.current &&
+			event.target !== elementRef.current &&
+			elementRef.current.contains(event.target)
+		) {
+			setOpen((val) => !val);
+		}
+	};
+
+	return (
+		<div className="d-flex app-bar-account-content mx-3" ref={elementRef}>
+			<div className="d-flex">
+				<div>
+					<Image
+						icon={ICONS['TOP_BAR_ANNOUNCEMENT']}
+						wrapperClassName="app-bar-account-icon mr-3"
+					/>
+					{unreadCount ? (
+						<div className="app-bar-account-notification">{unreadCount}</div>
+					) : null}
+				</div>
+				<div className="d-flex align-items-center">
+					<EditWrapper stringId="TRADE_TAB_POSTS" iconId="TOP_BAR_ANNOUNCEMENT">
+						{STRINGS['TRADE_TAB_POSTS']}
+					</EditWrapper>
+				</div>
+			</div>
+			{isOpen && (
+				<div className="app-bar-account-menu apply_rtl">
+					<div className="app-announcement-list">
+						<Scrollbars>
+							<NotificationsList ICONS={ICONS} />
+						</Scrollbars>
+					</div>
+				</div>
+			)}
+		</div>
+	);
+};
+const mapStateToProps = (state) => ({
+	announcements: state.app.announcements,
+	activeLanguage: state.app.language,
+});
+const mapDispatchToProps = (dispatch) => ({
+	getAnnouncement: bindActionCreators(getAnnouncement, dispatch),
+});
+
+export default connect(
+	mapStateToProps,
+	mapDispatchToProps
+)(withConfig(AnnouncementList));
diff --git a/web/src/components/AppBar/AppMenuBar.js b/web/src/components/AppBar/AppMenuBar.js
index 9c07d9edcc..00be52fb53 100644
--- a/web/src/components/AppBar/AppMenuBar.js
+++ b/web/src/components/AppBar/AppMenuBar.js
@@ -1,377 +1,45 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import Image from 'components/Image';
-import classnames from 'classnames';
 
-import { IS_XHT } from '../../config/constants';
-import STRINGS from '../../config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
-import { EditWrapper } from 'components';
+import AppMenuBarItem from './AppMenuBarItem';
 
 class AppMenuBar extends Component {
-	state = {
-		activeMenu: '',
-		securityPending: 0,
-		verificationPending: 0,
-		walletPending: 0,
-	};
-
-	componentDidMount() {
-		if (this.props.location && this.props.location.pathname) {
-			this.setActiveMenu(this.props.location.pathname);
-		}
-		if (this.props.user && this.props.user.id) {
-			this.checkVerificationStatus(this.props.user, this.props.enabledPlugins);
-			this.checkWalletStatus(this.props.user, this.props.coins);
-		}
-	}
-
-	UNSAFE_componentWillReceiveProps(nextProps) {
-		if (
-			this.props.location &&
-			nextProps.location &&
-			this.props.location.pathname !== nextProps.location.pathname
-		) {
-			this.setActiveMenu(nextProps.location.pathname);
-		}
-		if (
-			JSON.stringify(this.props.user) !== JSON.stringify(nextProps.user) ||
-			JSON.stringify(this.props.coins) !== JSON.stringify(nextProps.coins)
-		) {
-			this.checkVerificationStatus(nextProps.user, nextProps.enabledPlugins);
-			this.checkWalletStatus(nextProps.user, nextProps.coins);
-		}
-		if (this.props.activeLanguage !== nextProps.activeLanguage) {
-			this.setActiveMenu(nextProps.location.pathname);
-		}
-	}
-
-	checkVerificationStatus = (user, enabledPlugins) => {
-		const userData = user.userData || {};
-		const {
-			phone_number,
-			full_name,
-			id_data = {},
-			bank_account = [],
-		} = userData;
-		let securityPending = 0;
-		let verificationPending = 0;
-		if (!user.otp_enabled) {
-			securityPending += 1;
-		}
-		if (
-			user.verification_level < 1 &&
-			!full_name &&
-			enabledPlugins.includes('kyc')
-		) {
-			verificationPending += 1;
-		}
-		if (
-			(id_data.status === 0 || id_data.status === 2) &&
-			enabledPlugins.includes('kyc')
-		) {
-			verificationPending += 1;
-		}
-		if (!phone_number && enabledPlugins.includes('sms')) {
-			verificationPending += 1;
-		}
-		if (
-			bank_account.filter((acc) => acc.status === 0 || acc.status === 2)
-				.length === bank_account.length &&
-			enabledPlugins.includes('bank')
-		) {
-			verificationPending += 1;
-		}
-		this.setState({ securityPending, verificationPending });
-	};
-
-	checkWalletStatus = (user, coins) => {
-		let walletPending = false;
-		if (user.balance) {
-			walletPending = true;
-			Object.keys(coins).forEach((pair) => {
-				if (user.balance[`${pair.toLowerCase()}_balance`] > 0) {
-					walletPending = false;
-				}
-			});
-		}
-		this.setState({ walletPending: walletPending ? 1 : 0 });
-	};
-
-	handleMenuChange = (menu) => {
-		const { pairs } = this.props;
-
-		let pair = '';
-		if (Object.keys(pairs).length) {
-			pair = Object.keys(pairs)[0];
-		} else {
-			pair = this.props.pair;
-		}
-
-		if (menu === 'account') {
-			this.props.router.push('/account');
-		} else if (menu === 'security') {
-			this.props.router.push('/security');
-		} else if (menu === 'verification') {
-			this.props.router.push('/verification');
-		} else if (menu === 'transactions') {
-			this.props.router.push('/transactions');
-		} else if (menu === 'wallet') {
-			this.props.router.push('/wallet');
-		} else if (menu === 'settings') {
-			this.props.router.push('/settings');
-		} /* else if (menu === 'api') {
-			this.props.router.push('/api');
-		} */ else if (
-			menu === 'summary'
-		) {
-			this.props.router.push('/summary');
-		} else if (menu === 'quick-trade') {
-			this.props.router.push(`/quick-trade/${pair}`);
-		} else if (menu === 'pro-trade') {
-			this.props.router.push('/trade/add/tabs');
-		}
-		this.setState({ activeMenu: menu });
-	};
-
-	setActiveMenu = (path) => {
-		let activeMenu = this.state.activeMenu;
-		switch (path) {
-			case '/account':
-			case '/summary':
-				activeMenu = 'summary';
-				break;
-			case '/wallet':
-				activeMenu = 'wallet';
-				break;
-			case '/transactions':
-				activeMenu = 'transactions';
-				break;
-			case '/security':
-				activeMenu = 'security';
-				break;
-			case '/settings':
-				activeMenu = 'settings';
-				break;
-			case '/verification':
-				activeMenu = 'verification';
-				break;
-			case '/api':
-				activeMenu = 'api';
-				break;
-			case '/trade/add/tabs':
-				activeMenu = 'pro-trade';
-				break;
-			default:
-				activeMenu = '';
-				break;
-		}
-
-		if (path.includes('quick-trade')) {
-			activeMenu = 'quick-trade';
-		}
-
-		this.setState({ activeMenu });
-	};
-
 	render() {
-		const { icons: ICONS, constants } = this.props;
-		const {
-			activeMenu,
-			securityPending,
-			verificationPending,
-			walletPending,
-		} = this.state;
+		const { menuItems, activePath, onMenuChange } = this.props;
+
 		return (
 			<div className="app-menu-bar-wrapper d-flex justify-content-start">
-				<div className="app-menu-bar d-flex align-items-end justify-content-start title-font apply_rtl">
-					<div
-						className={classnames('app-menu-bar-content d-flex', {
-							'active-menu': activeMenu === 'summary',
-						})}
-						onClick={() => this.handleMenuChange('summary')}
-					>
-						<div className="app-menu-bar-content-item d-flex">
-							<Image
-								icon={ICONS['TAB_SUMMARY']}
-								wrapperClassName="app-menu-bar-icon"
-							/>
-							<EditWrapper stringId="ACCOUNTS.TAB_SUMMARY" iconId="TAB_SUMMARY">
-								{STRINGS['ACCOUNTS.TAB_SUMMARY']}
-							</EditWrapper>
-						</div>
-					</div>
-					{constants && constants.features && constants.features.pro_trade && (
-						<div
-							className={classnames('app-menu-bar-content d-flex', {
-								'active-menu': activeMenu === 'pro-trade',
-							})}
-							onClick={() => this.handleMenuChange('pro-trade')}
-						>
-							<div className="app-menu-bar-content-item d-flex">
-								<Image
-									icon={ICONS['SIDEBAR_TRADING_ACTIVE']}
-									wrapperClassName="app-menu-bar-icon"
-								/>
-								<EditWrapper
-									stringId="PRO_TRADE"
-									iconId="SIDEBAR_TRADING_ACTIVE"
-								>
-									{STRINGS['PRO_TRADE']}
-								</EditWrapper>
-							</div>
-						</div>
+				<div className="app-menu-bar d-flex align-items-start justify-content-start title-font apply_rtl">
+					{menuItems.map(
+						({ path, string_id, activePaths, hide_from_appbar }, index) => {
+							return (
+								!hide_from_appbar && (
+									<AppMenuBarItem
+										key={`appbar_item_${index}`}
+										path={path}
+										stringId={string_id}
+										isActive={
+											activePaths
+												? activePaths.includes(activePath)
+												: path === activePath
+										}
+										onClick={() => onMenuChange(path)}
+									/>
+								)
+							);
+						}
 					)}
-					{constants && constants.features && constants.features.quick_trade && (
-						<div
-							className={classnames('app-menu-bar-content d-flex', {
-								'active-menu': activeMenu === 'quick-trade',
-							})}
-							onClick={() => this.handleMenuChange('quick-trade')}
-						>
-							<div className="app-menu-bar-content-item d-flex">
-								<Image
-									icon={ICONS['QUICK_TRADE_TAB_ACTIVE']}
-									wrapperClassName="app-menu-bar-icon"
-								/>
-								<EditWrapper
-									stringId="QUICK_TRADE"
-									iconId="QUICK_TRADE_TAB_ACTIVE"
-								>
-									{STRINGS['QUICK_TRADE']}
-								</EditWrapper>
-							</div>
-						</div>
-					)}
-					<div
-						className={classnames('app-menu-bar-content d-flex', {
-							notification: !!walletPending && IS_XHT,
-							'active-menu': activeMenu === 'wallet',
-						})}
-						onClick={() => this.handleMenuChange('wallet')}
-					>
-						<div className="app-menu-bar-content-item d-flex">
-							{!!walletPending && IS_XHT && (
-								<div className="app-menu-bar-icon-notification">
-									{walletPending}
-								</div>
-							)}
-							<Image
-								icon={ICONS['TAB_WALLET']}
-								wrapperClassName="app-menu-bar-icon"
-							/>
-							<EditWrapper stringId="ACCOUNTS.TAB_WALLET" iconId="TAB_WALLET">
-								{STRINGS['ACCOUNTS.TAB_WALLET']}
-							</EditWrapper>
-						</div>
-					</div>
-					<div
-						className={classnames('app-menu-bar-content d-flex', {
-							'active-menu': activeMenu === 'transactions',
-						})}
-						onClick={() => this.handleMenuChange('transactions')}
-					>
-						<div className="app-menu-bar-content-item d-flex">
-							<Image
-								icon={ICONS['TAB_HISTORY']}
-								wrapperClassName="app-menu-bar-icon"
-							/>
-							<EditWrapper stringId="ACCOUNTS.TAB_HISTORY" iconId="TAB_HISTORY">
-								{STRINGS['ACCOUNTS.TAB_HISTORY']}
-							</EditWrapper>
-						</div>
-					</div>
-					<div
-						className={classnames('app-menu-bar-content d-flex', {
-							notification: !!securityPending,
-							'active-menu': activeMenu === 'security',
-						})}
-						onClick={() => this.handleMenuChange('security')}
-					>
-						<div className="app-menu-bar-content-item d-flex">
-							{!!securityPending && (
-								<div className="app-menu-bar-icon-notification">
-									{securityPending}
-								</div>
-							)}
-							<Image
-								icon={ICONS['TAB_SECURITY']}
-								wrapperClassName="app-menu-bar-icon"
-							/>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_SECURITY"
-								iconId="TAB_SECURITY"
-							>
-								{STRINGS['ACCOUNTS.TAB_SECURITY']}
-							</EditWrapper>
-						</div>
-					</div>
-					<div
-						className={classnames('app-menu-bar-content d-flex', {
-							notification: !!verificationPending && !IS_XHT,
-							'active-menu': activeMenu === 'verification',
-						})}
-						onClick={() => this.handleMenuChange('verification')}
-					>
-						<div className="app-menu-bar-content-item d-flex">
-							{!!verificationPending && !IS_XHT && (
-								<div className="app-menu-bar-icon-notification">
-									{verificationPending}
-								</div>
-							)}
-							<Image
-								icon={ICONS['TAB_VERIFY']}
-								wrapperClassName="app-menu-bar-icon"
-							/>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_VERIFICATION"
-								iconId="TAB_VERIFY"
-							>
-								{STRINGS['ACCOUNTS.TAB_VERIFICATION']}
-							</EditWrapper>
-						</div>
-					</div>
-					<div
-						className={classnames('app-menu-bar-content d-flex', {
-							'active-menu': activeMenu === 'settings',
-						})}
-						onClick={() => this.handleMenuChange('settings')}
-					>
-						<div className="app-menu-bar-content-item d-flex">
-							<Image
-								icon={ICONS['TAB_SETTING']}
-								wrapperClassName="app-menu-bar-icon"
-							/>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_SETTINGS"
-								iconId="TAB_SETTING"
-							>
-								{STRINGS['ACCOUNTS.TAB_SETTINGS']}
-							</EditWrapper>
-						</div>
-					</div>
-					{/* <div
-                        className={classnames("app-menu-bar-content d-flex", { 'active-menu': activeMenu === 'api' })}
-                        onClick={() => this.handleMenuChange('api')}>
-                        <div className="app-menu-bar-content-item d-flex">
-                            <Image iconId={ICONS["TAB_API"]} wrapperClassName="app-menu-bar-icon" />
-                            {STRINGS["ACCOUNTS.TAB_API"]}
-                        </div>
-                    </div> */}
 				</div>
 			</div>
 		);
 	}
 }
 
-const mapStateToProps = (state) => ({
-	user: state.user,
-	coins: state.app.coins,
-	pair: state.app.pair,
-	pairs: state.app.pairs,
-	constants: state.app.constants,
-	activeLanguage: state.app.language,
-	enabledPlugins: state.app.enabledPlugins,
-});
+const mapStateToProps = ({ app: { language: activeLanguage } }) => {
+	return {
+		activeLanguage,
+	};
+};
 
 export default connect(mapStateToProps)(withConfig(AppMenuBar));
diff --git a/web/src/components/AppBar/AppMenuBarItem.js b/web/src/components/AppBar/AppMenuBarItem.js
new file mode 100644
index 0000000000..b5303d72f2
--- /dev/null
+++ b/web/src/components/AppBar/AppMenuBarItem.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import classnames from 'classnames';
+import STRINGS from 'config/localizedStrings';
+import { EditWrapper } from 'components';
+
+const AppMenuBarItem = ({ path, isActive, onClick, stringId }) => {
+	return (
+		<div
+			className={classnames('app-menu-bar-content d-flex', {
+				'active-menu': isActive,
+			})}
+			onClick={() => onClick(path)}
+		>
+			<div className="app-menu-bar-content-item d-flex">
+				<EditWrapper stringId={stringId}>{STRINGS[stringId]}</EditWrapper>
+			</div>
+		</div>
+	);
+};
+
+export default AppMenuBarItem;
diff --git a/web/src/components/AppBar/MarketSelector.js b/web/src/components/AppBar/MarketSelector.js
index 89bcfb33bf..70018fdbee 100644
--- a/web/src/components/AppBar/MarketSelector.js
+++ b/web/src/components/AppBar/MarketSelector.js
@@ -231,91 +231,93 @@ class MarketSelector extends Component {
 							handleSearch={handleSearch}
 						/>
 					</div>
-					{hasTabMenu ? (
-						processedTabMenu.map(
-							(
-								{
-									pair,
-									symbol,
-									menu,
-									pairTwo,
-									ticker,
-									increment_price,
-									priceDifference,
-									priceDifferencePercent,
-								},
-								index
-							) => {
-								return (
-									<div
-										key={index}
-										className="app-bar-add-tab-content-list d-flex align-items-center justify-content-start pointer"
-									>
+					<div className={classnames({ 'scroll-view': processedTabMenu.length >= 10})}>
+						{hasTabMenu ? (
+							processedTabMenu.map(
+								(
+									{
+										pair,
+										symbol,
+										menu,
+										pairTwo,
+										ticker,
+										increment_price,
+										priceDifference,
+										priceDifferencePercent,
+									},
+									index
+								) => {
+									return (
 										<div
-											className="pl-3 pr-2 pointer"
-											onClick={() => this.toggleFavourite(pair)}
+											key={index}
+											className="app-bar-add-tab-content-list d-flex align-items-center justify-content-start pointer"
 										>
-											{this.isFavourite(pair) ? (
-												<StarFilled className="stared-market" />
-											) : (
-												<StarOutlined />
-											)}
-										</div>
-										<div
-											className="d-flex align-items-center justify-content-between w-100"
-											onClick={() => addTradePairTab(pair)}
-										>
-											<div className="d-flex align-items-center">
-												<Image
-													iconId={
-														ICONS[`${menu.pair_base.toUpperCase()}_ICON`]
-															? `${menu.pair_base.toUpperCase()}_ICON`
-															: 'DEFAULT_ICON'
-													}
-													icon={
-														ICONS[`${menu.pair_base.toUpperCase()}_ICON`]
-															? ICONS[`${menu.pair_base.toUpperCase()}_ICON`]
-															: ICONS.DEFAULT_ICON
-													}
-													wrapperClassName="app-bar-add-tab-icons"
-												/>
-												<div className="app_bar-pair-font">
-													{symbol.toUpperCase()}/{pairTwo.symbol.toUpperCase()}:
-												</div>
-												<div className="title-font ml-1 app-bar_add-tab-price">
-													{formatToCurrency(ticker.close, increment_price)}
-												</div>
+											<div
+												className="pl-3 pr-2 pointer"
+												onClick={() => this.toggleFavourite(pair)}
+											>
+												{this.isFavourite(pair) ? (
+													<StarFilled className="stared-market" />
+												) : (
+													<StarOutlined />
+												)}
 											</div>
-											<div className="d-flex align-items-center mr-4">
-												<div
-													className={
-														priceDifference < 0
-															? 'app-price-diff-down app-bar-price_diff_down'
-															: 'app-bar-price_diff_up app-price-diff-up'
-													}
-												>
-													{/* {formatAverage(formatToCurrency(priceDifference, increment_price))} */}
+											<div
+												className="d-flex align-items-center justify-content-between w-100"
+												onClick={() => addTradePairTab(pair)}
+											>
+												<div className="d-flex align-items-center">
+													<Image
+														iconId={
+															ICONS[`${menu.pair_base.toUpperCase()}_ICON`]
+																? `${menu.pair_base.toUpperCase()}_ICON`
+																: 'DEFAULT_ICON'
+														}
+														icon={
+															ICONS[`${menu.pair_base.toUpperCase()}_ICON`]
+																? ICONS[`${menu.pair_base.toUpperCase()}_ICON`]
+																: ICONS.DEFAULT_ICON
+														}
+														wrapperClassName="app-bar-add-tab-icons"
+													/>
+													<div className="app_bar-pair-font">
+														{symbol.toUpperCase()}/{pairTwo.symbol.toUpperCase()}:
+													</div>
+													<div className="title-font ml-1 app-bar_add-tab-price">
+														{formatToCurrency(ticker.close, increment_price)}
+													</div>
 												</div>
-												<div
-													className={
-														priceDifference < 0
-															? 'title-font app-price-diff-down'
-															: 'title-font app-price-diff-up'
-													}
-												>
-													{priceDifferencePercent}
+												<div className="d-flex align-items-center mr-4">
+													<div
+														className={
+															priceDifference < 0
+																? 'app-price-diff-down app-bar-price_diff_down'
+																: 'app-bar-price_diff_up app-price-diff-up'
+														}
+													>
+														{/* {formatAverage(formatToCurrency(priceDifference, increment_price))} */}
+													</div>
+													<div
+														className={
+															priceDifference < 0
+																? 'title-font app-price-diff-down'
+																: priceDifference > 0 ? 'title-font app-price-diff-up' : "title-font"
+														}
+													>
+														{priceDifferencePercent}
+													</div>
 												</div>
 											</div>
 										</div>
-									</div>
-								);
-							}
-						)
-					) : (
-						<div className="app-bar-add-tab-content-list d-flex align-items-center">
-							No data...
-						</div>
-					)}
+									);
+								}
+							)
+						) : (
+							<div className="app-bar-add-tab-content-list d-flex align-items-center">
+								No data...
+							</div>
+						)}
+					</div>
 					<div className="d-flex justify-content-center app_bar-link blue-link pointer">
 						{constants &&
 							constants.features &&
diff --git a/web/src/components/AppBar/MenuList.js b/web/src/components/AppBar/MenuList.js
index eb1612f785..d9fc5f0e0d 100644
--- a/web/src/components/AppBar/MenuList.js
+++ b/web/src/components/AppBar/MenuList.js
@@ -1,12 +1,10 @@
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import Image from 'components/Image';
 import classnames from 'classnames';
 
-import STRINGS from '../../config/localizedStrings';
-import { IS_XHT } from '../../config/constants';
+import { IS_XHT } from 'config/constants';
 import withConfig from 'components/ConfigProvider/withConfig';
-import { EditWrapper } from 'components';
+import MenuListItem from './MenuListItem';
 
 class MenuList extends Component {
 	state = {
@@ -19,22 +17,6 @@ class MenuList extends Component {
 		document.addEventListener('click', this.onOutsideClick);
 	}
 
-	shouldComponentUpdate(nextProps, nextState) {
-		if (nextState.isOpen !== this.state.isOpen) {
-			return true;
-		}
-		if (
-			nextProps.selectedMenu !== this.props.selectedMenu ||
-			nextProps.securityPending !== this.props.securityPending ||
-			nextProps.verificationPending !== this.props.verificationPending ||
-			nextProps.walletPending !== this.props.walletPending ||
-			nextProps.activePath !== this.props.activePath
-		) {
-			return true;
-		}
-		return false;
-	}
-
 	onOutsideClick = (event) => {
 		if (
 			this.element &&
@@ -56,31 +38,41 @@ class MenuList extends Component {
 		document.removeEventListener('click', this.onOutsideClick);
 	}
 
-	handleMenu = (path) => {
-		this.setState({ isOpen: false });
-		this.props.handleMenu(path);
-	};
-
-	onHelp = () => {
-		this.setState({ isOpen: false });
-		this.props.onHelp();
+	getNotifications = (path = '') => {
+		const { verificationPending, securityPending, walletPending } = this.props;
+		switch (path) {
+			case '/verification':
+				return verificationPending;
+			case '/security':
+				return securityPending;
+			case '/wallet':
+				return walletPending;
+			default:
+				return 0;
+		}
 	};
 
-	logout = () => {
-		this.setState({ isOpen: false });
-		this.props.logout();
+	getShowNotification = (path = '', notifications) => {
+		switch (path) {
+			case '/verification':
+				return !!notifications && !IS_XHT;
+			case '/wallet':
+				return !!notifications && IS_XHT;
+			default:
+				return !!notifications;
+		}
 	};
 
 	render() {
 		const {
-			selectedMenu,
 			securityPending,
 			verificationPending,
 			walletPending,
-			activePath,
 			icons: ICONS,
-			constants,
-			location,
+			user,
+			menuItems,
+			activePath,
+			onMenuChange,
 		} = this.props;
 		const { isOpen } = this.state;
 		const totalPending = IS_XHT
@@ -88,267 +80,60 @@ class MenuList extends Component {
 			: securityPending + verificationPending;
 		return (
 			<div
-				className={classnames('app-bar-account-content', {
+				className={classnames('d-flex app-bar-account-content', {
 					'account-inactive':
-						activePath !== 'account' && activePath !== 'wallet',
+						activePath !== '/account' && activePath !== '/wallet',
 				})}
 				ref={(el) => (this.element = el)}
 			>
-				<Image
-					iconId="SIDEBAR_ACCOUNT_INACTIVE"
-					icon={ICONS['SIDEBAR_ACCOUNT_INACTIVE']}
-					wrapperClassName="app-bar-account-icon"
-				/>
-				{!!totalPending && (
-					<div className="app-bar-account-notification">{totalPending}</div>
-				)}
+				<div className="mr-3">
+					<Image
+						iconId="SIDEBAR_ACCOUNT_INACTIVE"
+						icon={ICONS['SIDEBAR_ACCOUNT_INACTIVE']}
+						wrapperClassName="app-bar-account-icon"
+					/>
+					{!!totalPending && (
+						<div className="app-bar-account-notification">{totalPending}</div>
+					)}
+				</div>
+				<div>{user.email}</div>
 				{isOpen && (
 					<div id="tab-account-menu" className="app-bar-account-menu apply_rtl">
-						<div
-							className={classnames('app-bar-account-menu-list d-flex', {
-								'menu-active':
-									activePath === 'account' && selectedMenu === 'summary',
-							})}
-							onClick={() => this.handleMenu('summary')}
-						>
-							<div className="notification-content" />
-							<Image
-								icon={ICONS['TAB_SUMMARY']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper stringId="ACCOUNTS.TAB_SUMMARY" iconId="TAB_SUMMARY">
-								{STRINGS['ACCOUNTS.TAB_SUMMARY']}
-							</EditWrapper>
-						</div>
-						{constants && constants.features && constants.features.pro_trade && (
-							<div
-								className={classnames('app-bar-account-menu-list d-flex', {
-									'menu-active':
-										location.pathname === '/trade/add/tabs' &&
-										selectedMenu === 'pro-trade',
-								})}
-								onClick={() => this.handleMenu('pro-trade')}
-							>
-								<div className="notification-content" />
-								<Image
-									icon={ICONS['SIDEBAR_TRADING_ACTIVE']}
-									wrapperClassName="app-bar-account-list-icon"
-								/>
-								<EditWrapper
-									stringId="PRO_TRADE"
-									iconId="SIDEBAR_TRADING_ACTIVE"
-								>
-									{STRINGS['PRO_TRADE']}
-								</EditWrapper>
-							</div>
+						{menuItems.map(
+							(
+								{ path, icon_id, string_id, hide_from_menulist, activePaths },
+								index
+							) => {
+								const notifications = this.getNotifications(path);
+								const showNotification = this.getShowNotification(
+									path,
+									notifications
+								);
+								return (
+									!hide_from_menulist && (
+										<MenuListItem
+											key={`menulist_item_${index}`}
+											path={path}
+											stringId={string_id}
+											iconId={icon_id}
+											icon={ICONS[icon_id]}
+											isActive={
+												activePaths
+													? activePaths.includes(activePath)
+													: path === activePath
+											}
+											onClick={() =>
+												onMenuChange(path, () =>
+													this.setState({ isOpen: false })
+												)
+											}
+											notifications={notifications}
+											showNotification={showNotification}
+										/>
+									)
+								);
+							}
 						)}
-						{constants && constants.features && constants.features.quick_trade && (
-							<div
-								className={classnames('app-bar-account-menu-list d-flex', {
-									'menu-active':
-										activePath === 'quick-trade' &&
-										selectedMenu === 'quick-trade',
-								})}
-								onClick={() => this.handleMenu('quick-trade')}
-							>
-								<div className="notification-content" />
-								<Image
-									icon={ICONS['QUICK_TRADE_TAB_ACTIVE']}
-									wrapperClassName="app-bar-account-list-icon"
-								/>
-								<EditWrapper
-									stringId="QUICK_TRADE"
-									iconId="QUICK_TRADE_TAB_ACTIVE"
-								>
-									{STRINGS['QUICK_TRADE']}
-								</EditWrapper>
-							</div>
-						)}
-						<div
-							className={classnames(
-								'app-bar-account-menu-list d-flex',
-								!!walletPending && IS_XHT
-									? {
-											'menu-notification-active':
-												activePath === 'wallet' && selectedMenu === 'wallet',
-											wallet_notification: selectedMenu !== 'wallet',
-									  }
-									: {
-											'menu-active':
-												activePath === 'wallet' && selectedMenu === 'wallet',
-									  }
-							)}
-							onClick={() => this.handleMenu('wallet')}
-						>
-							<div className="notification-content">
-								{!!walletPending && IS_XHT && (
-									<div
-										className={
-											selectedMenu === 'wallet'
-												? 'app-bar-account-list-notification wallet_selected'
-												: 'app-bar-account-list-notification wallet_selected_inactive'
-										}
-									>
-										{walletPending}
-									</div>
-								)}
-							</div>
-							<Image
-								icon={ICONS['TAB_WALLET']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper stringId="ACCOUNTS.TAB_WALLET" iconId="TAB_WALLET">
-								{STRINGS['ACCOUNTS.TAB_WALLET']}
-							</EditWrapper>
-						</div>
-						<div
-							className={classnames('app-bar-account-menu-list d-flex', {
-								'menu-active': selectedMenu === 'history',
-							})}
-							onClick={() => this.handleMenu('history')}
-						>
-							<div className="notification-content" />
-							<Image
-								icon={ICONS['TAB_HISTORY']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper stringId="ACCOUNTS.TAB_HISTORY" iconId="TAB_HISTORY">
-								{STRINGS['ACCOUNTS.TAB_HISTORY']}
-							</EditWrapper>
-						</div>
-						<div
-							className={classnames(
-								'app-bar-account-menu-list d-flex',
-								!!securityPending
-									? {
-											'menu-notification-active':
-												activePath === 'account' && selectedMenu === 'security',
-											security_notification: selectedMenu !== 'security',
-									  }
-									: {
-											'menu-active':
-												activePath === 'account' && selectedMenu === 'security',
-									  }
-							)}
-							onClick={() => this.handleMenu('security')}
-						>
-							<div className="notification-content">
-								{!!securityPending && (
-									<div
-										className={
-											selectedMenu === 'security'
-												? 'app-bar-account-list-notification security_selected'
-												: 'app-bar-account-list-notification security_selected_inactive'
-										}
-									>
-										{securityPending}
-									</div>
-								)}
-							</div>
-							<Image
-								icon={ICONS['TAB_SECURITY']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_SECURITY"
-								iconId="TAB_SECURITY"
-							>
-								{STRINGS['ACCOUNTS.TAB_SECURITY']}
-							</EditWrapper>
-						</div>
-						<div
-							className={classnames(
-								'app-bar-account-menu-list d-flex',
-								!!verificationPending && !IS_XHT
-									? {
-											'menu-notification-active':
-												activePath === 'account' &&
-												selectedMenu === 'verification',
-											verification_notification:
-												selectedMenu !== 'verification',
-									  }
-									: {
-											'menu-active':
-												activePath === 'account' &&
-												selectedMenu === 'verification',
-									  }
-							)}
-							onClick={() => this.handleMenu('verification')}
-						>
-							<div className="notification-content">
-								{!!verificationPending && !IS_XHT && (
-									<div
-										className={
-											selectedMenu === 'verification'
-												? 'app-bar-account-list-notification verification_selected'
-												: 'app-bar-account-list-notification verification_selected_inactive'
-										}
-									>
-										{verificationPending}
-									</div>
-								)}
-							</div>
-							<Image
-								icon={ICONS['TAB_VERIFY']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_VERIFICATION"
-								iconId="TAB_VERIFY"
-							>
-								{STRINGS['ACCOUNTS.TAB_VERIFICATION']}
-							</EditWrapper>
-						</div>
-						<div
-							className={classnames('app-bar-account-menu-list d-flex', {
-								'menu-active':
-									activePath === 'account' && selectedMenu === 'settings',
-							})}
-							onClick={() => this.handleMenu('settings')}
-						>
-							<div className="notification-content" />
-							<Image
-								icon={ICONS['TAB_SETTING']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_SETTINGS"
-								iconId="TAB_SETTING"
-							>
-								{STRINGS['ACCOUNTS.TAB_SETTINGS']}
-							</EditWrapper>
-						</div>
-						<div
-							className={classnames('app-bar-account-menu-list d-flex', {
-								'menu-active':
-									activePath === 'account' && selectedMenu === 'help',
-							})}
-							onClick={this.onHelp}
-						>
-							<div className="notification-content" />
-							<Image
-								icon={ICONS['SIDEBAR_HELP']}
-								wrapperClassName="app-bar-account-list-icon"
-							/>
-							<EditWrapper stringId="LOGIN.HELP" iconId="SIDEBAR_HELP">
-								{STRINGS['LOGIN.HELP']}
-							</EditWrapper>
-						</div>
-
-						<div className="app-bar-account-menu-list d-flex">
-							<div className="d-flex" onClick={this.logout}>
-								<div className="notification-content" />
-								<Image
-									icon={ICONS['TAB_SIGNOUT']}
-									wrapperClassName="app-bar-account-list-icon"
-								/>
-								{STRINGS['ACCOUNTS.TAB_SIGNOUT']}
-							</div>
-							<EditWrapper
-								stringId="ACCOUNTS.TAB_SIGNOUT"
-								iconId="TAB_SIGNOUT"
-							/>
-						</div>
 					</div>
 				)}
 			</div>
@@ -356,10 +141,4 @@ class MenuList extends Component {
 	}
 }
 
-const mapStateToProps = (state) => {
-	return {
-		constants: state.app.constants,
-	};
-};
-
-export default connect(mapStateToProps)(withConfig(MenuList));
+export default withConfig(MenuList);
diff --git a/web/src/components/AppBar/MenuListItem.js b/web/src/components/AppBar/MenuListItem.js
new file mode 100644
index 0000000000..4e645b106f
--- /dev/null
+++ b/web/src/components/AppBar/MenuListItem.js
@@ -0,0 +1,48 @@
+import React from 'react';
+import classnames from 'classnames';
+import STRINGS from 'config/localizedStrings';
+import Image from 'components/Image';
+import { EditWrapper } from 'components';
+
+const MenuListItem = ({
+	icon,
+	iconId,
+	path,
+	isActive,
+	stringId,
+	onClick,
+	notifications,
+	showNotification,
+}) => {
+	return (
+		<div
+			className={classnames(
+				'app-bar-account-menu-list d-flex',
+				{ 'menu-active': isActive && !showNotification },
+				{ 'menu-notification-active': isActive && showNotification },
+				{ verification_notification: !isActive && showNotification }
+			)}
+			onClick={() => onClick(path)}
+		>
+			<div className="notification-content">
+				{showNotification && (
+					<div
+						className={
+							isActive
+								? 'app-bar-account-list-notification verification_selected'
+								: 'app-bar-account-list-notification verification_selected_inactive'
+						}
+					>
+						{notifications}
+					</div>
+				)}
+			</div>
+			<Image icon={icon} wrapperClassName="app-bar-account-list-icon" />
+			<EditWrapper stringId={stringId} iconId={iconId}>
+				{STRINGS[stringId] || 'Unnamed page'}
+			</EditWrapper>
+		</div>
+	);
+};
+
+export default MenuListItem;
diff --git a/web/src/components/AppBar/Tab.js b/web/src/components/AppBar/Tab.js
index bbe6e1226c..8660ce4ca8 100644
--- a/web/src/components/AppBar/Tab.js
+++ b/web/src/components/AppBar/Tab.js
@@ -65,7 +65,7 @@ const Tab = ({
 						className={
 							priceDifference < 0
 								? 'title-font app-price-diff-down'
-								: 'title-font app-price-diff-up'
+								: priceDifference > 0 ? 'title-font app-price-diff-up' : "title-font"
 						}
 					>
 						{priceDifferencePercent}
diff --git a/web/src/components/AppBar/ThemeSwitcher.js b/web/src/components/AppBar/ThemeSwitcher.js
index 94982e5e09..8b14cef97a 100644
--- a/web/src/components/AppBar/ThemeSwitcher.js
+++ b/web/src/components/AppBar/ThemeSwitcher.js
@@ -74,7 +74,7 @@ const ThemeSwitcher = ({ selected, options = [], toggle, icons: ICONS }) => {
 						bordered={false}
 						suffixIcon={<CaretDownOutlined />}
 						className="custom-select-input-style appbar elevated"
-						dropdownClassName="custom-select-style"
+						dropdownClassName="custom-select-style select-option-wrapper"
 					>
 						{options.map(({ value }) => (
 							<Option value={value} key={value}>
diff --git a/web/src/components/AppBar/_AppBar.scss b/web/src/components/AppBar/_AppBar.scss
index 92bfb65397..d289f93e23 100644
--- a/web/src/components/AppBar/_AppBar.scss
+++ b/web/src/components/AppBar/_AppBar.scss
@@ -30,7 +30,7 @@ $app-menu-notification-size: 1.2rem;
 		height: 4rem;
 		width: 5rem;
 		background-size: contain;
-		background-position: center;
+		background-position: left center;
 		background-repeat: no-repeat;
 	}
 
@@ -115,7 +115,7 @@ $app-menu-notification-size: 1.2rem;
 		color: $base_top-bar-navigation_text;
 		cursor: pointer;
 		margin-right: 0.8rem;
-		width: 15rem;
+		// width: 15rem;
 
 		svg {
 			.account-inactive {
@@ -156,7 +156,7 @@ $app-menu-notification-size: 1.2rem;
 	}
 
 	.app-bar-account-icon {
-		margin: 0.5rem 0.3rem 0 0.3rem;
+		// margin: 0.5rem 0.3rem 0 0.3rem;
 		width: 1.5rem;
 	}
 	.app-bar-account-moon-icon {
@@ -292,15 +292,21 @@ $app-menu-notification-size: 1.2rem;
 
 	.app-bar-account-content {
 		align-items: center;
-		flex-direction: column;
+		// display: flex;
+		// flex-direction: column;
 		justify-content: center;
 		position: relative;
+		color: $app-bar-icon-inactive;
+	}
+	.app-announcement-list {
+		height: 335px;
+		width: 280px;
 	}
-
 	.app-bar-account-notification {
 		position: absolute;
-		right: -6px;
-		top: 0;
+		// right: -6px;
+		left: 15px;
+		bottom: 12px;
 		height: $app-menu-notification-size;
 		width: $app-menu-notification-size;
 		border-radius: $app-menu-notification-size;
@@ -317,13 +323,14 @@ $app-menu-notification-size: 1.2rem;
 	.app-bar-account-menu {
 		display: block;
 		position: absolute;
-		right: 0;
+		// right: 0;
 		top: 36px;
 		min-width: 10rem;
 		min-height: 8rem;
 		background-color: $app-background-color;
-		z-index: 20;
+		z-index: 1052;
 		padding: 1rem;
+		border-top: 2px solid $link;
 		-webkit-box-shadow: 0px 4px 6px 1px rgba(0, 0, 0, 0.4);
 		-moz-box-shadow: 0px 4px 6px 1px rgba(0, 0, 0, 0.4);
 		box-shadow: 0px 4px 6px 1px rgba(0, 0, 0, 0.4);
@@ -478,6 +485,20 @@ $app-menu-notification-size: 1.2rem;
 			font-weight: bold;
 		}
 	}
+	.login-container {
+		background-color: $link;
+		padding: 2px 20px;
+		border-radius: 3px;
+		cursor: pointer;
+		font-size: 11px;
+	}
+}
+
+.select-option-wrapper {
+	.ant-select-item,
+	.ant-select-item-option {
+		font-size: 12px;
+	}
 }
 
 .app-bar-tab-menu {
@@ -539,18 +560,21 @@ $app-menu-notification-size: 1.2rem;
 .app-menu-bar {
 	display: flex;
 	font-size: $navigation_bar-font_size;
-	height: $navigation_bar-height;
-	min-height: $navigation_bar-height;
+	// height: $navigation_bar-height;
+	// min-height: $navigation_bar-height;
 	position: relative;
 	width: 100%;
 
 	.app-menu-bar-content {
 		color: $base_top-bar-navigation_text-inactive;
 		cursor: pointer;
-		height: 2.5rem;
-		position: relative;
-		top: 1px;
-		width: 10rem;
+		margin: 0 20px;
+		height: 100%;
+		padding: 8px 0;
+		opacity: 0.8;
+		display: flex;
+		align-items: center;
+		border-top: 3px solid transparent;
 	}
 
 	.app-menu-bar-content-item {
@@ -581,11 +605,10 @@ $app-menu-notification-size: 1.2rem;
 	}
 
 	.active-menu {
-		border-bottom: 1px solid $dark-app-line-divider;
 		color: $base_top-bar-navigation_text;
-		height: 2.5rem;
-		position: relative;
-		// top: 1px;
+		border-top: 3px solid $base_top-bar-navigation_text;
+		height: 100%;
+		opacity: 1;
 
 		svg {
 			.trade-active-2 {
@@ -722,6 +745,10 @@ $app-menu-notification-size: 1.2rem;
 			min-width: 17rem;
 			max-width: 17rem;
 		}
+		&:hover {
+			background-color: $app-light-background;
+			border-radius: 0.2rem;
+		}
 	}
 
 	.app_bar-currency-txt {
@@ -794,7 +821,7 @@ $app-menu-notification-size: 1.2rem;
 	}
 
 	.app_bar-pair-font {
-		font-size: 0.8rem;
+		font-size: 0.9rem;
 	}
 
 	.app-bar-tab-close {
@@ -807,7 +834,7 @@ $app-menu-notification-size: 1.2rem;
 		color: $colors-black;
 		cursor: pointer;
 		display: flex;
-		font-size: $font-size-main;
+		font-size: 1.2rem;
 		font-weight: 400;
 		height: 100%;
 		position: relative;
@@ -815,8 +842,8 @@ $app-menu-notification-size: 1.2rem;
 
 	.app_bar-pair-tab {
 		padding: 0 0.5rem;
-		min-width: 13rem;
-		max-width: 13rem;
+		min-width: 14rem;
+		max-width: 14rem;
 
 		&.selector-trigger {
 			min-width: 17rem;
@@ -916,7 +943,7 @@ $app-menu-notification-size: 1.2rem;
 }
 
 .search-field {
-	width: 100%;
+	// width: 100%;
 	color: $colors-black;
 	background-color: $app-background-color;
 
@@ -949,7 +976,7 @@ $app-menu-notification-size: 1.2rem;
 	.app-bar-tab-menu-list {
 		background-color: $app-bar-background-color;
 		color: $app-bar-menu-list-color;
-		font-size: 0.8rem;
+		font-size: 0.9rem;
 		height: 2.5rem;
 		padding: 0.5rem 0.8rem;
 		width: 3.2rem;
@@ -964,15 +991,19 @@ $app-menu-notification-size: 1.2rem;
 	}
 
 	.app-bar-add-tab-content {
-		font-size: 0.8rem;
+		font-size: 0.9rem;
 		overflow-y: scroll;
 		padding: 0.3rem 0;
+		.scroll-view {
+			overflow-y: auto;
+			height: 22rem;
+		}
 	}
 
 	.app-bar-tab-overflow-content {
 		background-color: $dark-app-bar-add-tab-menu-background;
 		color: $app-bar-menu-list-color;
-		font-size: 0.8rem;
+		font-size: 0.9rem;
 		overflow-y: scroll;
 		padding: 0.3rem 0;
 	}
@@ -1070,6 +1101,13 @@ $app-menu-notification-size: 1.2rem;
 			color: $buy;
 		}
 	}
+	.app-price-diff-down {
+		color: $sell;
+	}
+
+	.app-price-diff-up {
+		color: $buy;
+	}
 }
 
 .app_bar-link {
@@ -1115,10 +1153,10 @@ $app-menu-notification-size: 1.2rem;
 		height: $navigation_bar-height-lg;
 		min-height: $navigation_bar-height-lg;
 
-		.active-menu,
-		.app-menu-bar-content {
-			height: 3rem;
-		}
+		// .active-menu,
+		// .app-menu-bar-content {
+		// height: 3rem;
+		// }
 
 		.app-menu-bar-content {
 			width: 12rem;
@@ -1234,6 +1272,7 @@ $app-menu-notification-size: 1.2rem;
 	flex-grow: 1;
 	flex-shrink: 1;
 	overflow-y: auto;
+	align-items: flex-start !important;
 }
 
 .stared-market {
@@ -1250,3 +1289,19 @@ $app-menu-notification-size: 1.2rem;
 .market-trigger {
 	background-color: $app-background-color;
 }
+
+.landing-page-bar {
+	background: linear-gradient(
+		to bottom,
+		$app-landing_background,
+		$app-landing_background
+	) !important;
+}
+@media (max-width: 768px) {
+	.select-option-wrapper {
+		.ant-select-item,
+		.ant-select-item-option {
+			font-size: 0.9rem !important;
+		}
+	}
+}
diff --git a/web/src/components/AppBar/index.js b/web/src/components/AppBar/index.js
index a7eaf2321d..03f9d99b91 100644
--- a/web/src/components/AppBar/index.js
+++ b/web/src/components/AppBar/index.js
@@ -5,30 +5,21 @@ import classnames from 'classnames';
 import { Link } from 'react-router';
 import Image from 'components/Image';
 import { isMobile } from 'react-device-detect';
-import { DEFAULT_URL, IS_XHT } from 'config/constants';
-import { LinkButton } from './LinkButton';
+import { DEFAULT_URL } from 'config/constants';
 import MenuList from './MenuList';
 import { MobileBarWrapper } from '../';
-import STRINGS from '../../config/localizedStrings';
 import { isLoggedIn } from '../../utils/token';
-import { getMe, setMe } from '../../actions/userAction';
-import {
-	getTickers,
-	setNotification,
-	changeTheme,
-	NOTIFICATIONS,
-} from '../../actions/appActions';
+import { getTickers, changeTheme } from '../../actions/appActions';
 import { updateUserSettings, setUserData } from '../../actions/userAction';
 import ThemeSwitcher from './ThemeSwitcher';
 import { EditWrapper } from 'components';
 import withEdit from 'components/EditProvider/withEdit';
 import withConfig from 'components/ConfigProvider/withConfig';
+import AnnouncementList from './AnnouncementList';
+import STRINGS from 'config/localizedStrings';
 
 class AppBar extends Component {
 	state = {
-		symbolSelectorIsOpen: false,
-		isAccountMenu: false,
-		selectedMenu: '',
 		securityPending: 0,
 		verificationPending: 0,
 		walletPending: 0,
@@ -36,16 +27,10 @@ class AppBar extends Component {
 	};
 
 	componentDidMount() {
-		if (this.props.location && this.props.location.pathname) {
-			this.setActiveMenu(this.props.location.pathname);
-		}
 		if (this.props.user) {
 			this.checkVerificationStatus(this.props.user, this.props.enabledPlugins);
 			this.checkWalletStatus(this.props.user, this.props.coins);
 		}
-		if (this.props.isHome && this.props.token) {
-			this.getUserDetails();
-		}
 		this.props.getTickers();
 		if (this.props.theme) {
 			this.setSelectedTheme(this.props.theme);
@@ -53,24 +38,10 @@ class AppBar extends Component {
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps) {
-		if (
-			this.props.location &&
-			nextProps.location &&
-			this.props.location.pathname !== nextProps.location.pathname
-		) {
-			this.setActiveMenu(nextProps.location.pathname);
-		}
 		if (JSON.stringify(this.props.user) !== JSON.stringify(nextProps.user)) {
 			this.checkVerificationStatus(nextProps.user, nextProps.enabledPlugins);
 			this.checkWalletStatus(nextProps.user, nextProps.coins);
 		}
-		if (
-			this.props.token !== nextProps.token &&
-			nextProps.token &&
-			nextProps.isHome
-		) {
-			this.getUserDetails();
-		}
 	}
 
 	componentDidUpdate(prevProps) {
@@ -87,20 +58,6 @@ class AppBar extends Component {
 		this.setState({ selected });
 	};
 
-	getUserDetails = () => {
-		return this.props
-			.getMe()
-			.then(({ value }) => {
-				if (value && value.data && value.data.id) {
-					this.props.setMe(value.data);
-				}
-			})
-			.catch((err) => {
-				const message = err.message || JSON.stringify(err);
-				this.props.setNotification(NOTIFICATIONS.ERROR, message);
-			});
-	};
-
 	checkVerificationStatus = (user, enabledPlugins) => {
 		let userData = user.userData || {};
 		if (!Object.keys(userData).length && user.id) {
@@ -158,19 +115,6 @@ class AppBar extends Component {
 		this.setState({ walletPending: walletPending ? 1 : 0 });
 	};
 
-	toogleSymbolSelector = () => {
-		this.setState({ symbolSelectorIsOpen: !this.state.symbolSelectorIsOpen });
-	};
-
-	onChangeSymbol = (symbol) => {
-		this.props.changeSymbol(symbol);
-		this.toogleSymbolSelector();
-	};
-
-	handleAccountMenu = () => {
-		this.setState({ isAccountMenu: !this.state.isAccountMenu });
-	};
-
 	handleTheme = (selected) => {
 		const { isEditMode, themeOptions } = this.props;
 		if (!isLoggedIn() || isEditMode) {
@@ -200,80 +144,14 @@ class AppBar extends Component {
 		}
 	};
 
-	closeAccountMenu = () => {
-		this.setState({ isAccountMenu: false });
-	};
-
-	renderSymbolOption = ({ symbol, name, currencySymbol, iconPath }, index) => {
-		const { fullname } = this.props.coins[symbol] || {};
-		return (
-			<div
-				key={index}
-				className="app_bar-currency_option"
-				onClick={() => this.onChangeSymbol(symbol)}
-			>
-				<img
-					alt={symbol}
-					src={iconPath}
-					className="app_bar-currency_display-icon"
-				/>
-				<span>{fullname}</span>
-			</div>
-		);
-	};
-
-	renderSplashActions = (token, verifyingToken) => {
-		const { securityPending, verificationPending, walletPending } = this.state;
-		const { icons: ICONS } = this.props;
-		if (verifyingToken) {
-			return <div />;
-		}
-
-		const totalPending = IS_XHT
-			? securityPending + walletPending
-			: securityPending + verificationPending;
-
-		const WRAPPER_CLASSES = ['app_bar-controllers-splash', 'd-flex'];
-		return token ? (
-			<div className="d-flex app-bar-account" onClick={this.handleSummary}>
-				<div className="app-bar-account-content mr-2">
-					<Image
-						iconId="SIDEBAR_ACCOUNT_INACTIVE"
-						icon={ICONS['SIDEBAR_ACCOUNT_INACTIVE']}
-						wrapperClassName="app-bar-currency-icon"
-					/>
-					{!!totalPending && (
-						<div className="app-bar-account-notification">{totalPending}</div>
-					)}
-				</div>
-				<EditWrapper stringId="ACCOUNT_TEXT">
-					<div className="d-flex align-items-center">
-						{STRINGS['ACCOUNT_TEXT']}
-					</div>
-				</EditWrapper>
-			</div>
-		) : (
-			<div className={classnames(...WRAPPER_CLASSES)}>
-				<LinkButton
-					path="/login"
-					text={STRINGS['LOGIN_TEXT']}
-					buttonClassName="contrast"
-				/>
-			</div>
-		);
-	};
-
-	renderIcon = (isHome) => {
+	renderIcon = () => {
 		const { icons: ICONS, isEditMode } = this.props;
 		return (
 			<div className={classnames('app_bar-icon', 'text-uppercase', 'h-100')}>
 				<div className="d-flex h-100">
 					<Link
 						to={DEFAULT_URL}
-						className={classnames(
-							{ 'disabled-link': isHome || isEditMode },
-							'h-100'
-						)}
+						className={classnames({ 'disabled-link': isEditMode }, 'h-100')}
 					>
 						<Image
 							iconId="EXCHANGE_LOGO"
@@ -287,86 +165,6 @@ class AppBar extends Component {
 		);
 	};
 
-	handleSummary = () => {
-		this.props.router.push('/summary');
-	};
-	handleMenu = (menu) => {
-		const { pairs } = this.props;
-
-		let pair = '';
-		if (Object.keys(pairs).length) {
-			pair = Object.keys(pairs)[0];
-		} else {
-			pair = this.props.pair;
-		}
-
-		if (menu === 'account') {
-			this.props.router.push('/account');
-		} else if (menu === 'security') {
-			this.props.router.push('/security');
-		} else if (menu === 'history') {
-			this.props.router.push('/transactions');
-		} else if (menu === 'verification') {
-			this.props.router.push('/verification');
-		} else if (menu === 'wallet') {
-			this.props.router.push('/wallet');
-		} else if (menu === 'settings') {
-			this.props.router.push('/settings');
-		} /* else if (menu === 'api') {
-			this.props.router.push('/api');
-		} */ else if (
-			menu === 'summary'
-		) {
-			this.props.router.push('/summary');
-		} else if (menu === 'quick-trade') {
-			this.props.router.push(`/quick-trade/${pair}`);
-		} else if (menu === 'pro-trade') {
-			this.props.router.push('/trade/add/tabs');
-		}
-		this.setState({ selectedMenu: menu, isAccountMenu: false });
-	};
-
-	setActiveMenu = (path) => {
-		let selectedMenu = this.state.selectedMenu;
-		switch (path) {
-			case '/account':
-				selectedMenu = 'account';
-				break;
-			case '/summary':
-				selectedMenu = 'summary';
-				break;
-			case '/wallet':
-				selectedMenu = 'wallet';
-				break;
-			case '/transactions':
-				selectedMenu = 'history';
-				break;
-			case '/security':
-				selectedMenu = 'security';
-				break;
-			case '/settings':
-				selectedMenu = 'settings';
-				break;
-			case '/verification':
-				selectedMenu = 'verification';
-				break;
-			case '/api':
-				selectedMenu = 'api';
-				break;
-			case '/trade/add/tabs':
-				selectedMenu = 'pro-trade';
-				break;
-			default:
-				break;
-		}
-
-		if (path.includes('quick-trade')) {
-			selectedMenu = 'quick-trade';
-		}
-
-		this.setState({ selectedMenu });
-	};
-
 	onToggle = (theme) => {
 		this.setSelectedTheme(theme);
 		this.handleTheme(theme);
@@ -374,28 +172,16 @@ class AppBar extends Component {
 
 	render() {
 		const {
-			// noBorders,
-			token,
-			verifyingToken,
-			isHome,
-			theme,
-			logout,
-			activePath,
-			location,
-			onHelp,
-			// user,
+			user,
 			constants = {},
 			children,
+			activePath,
+			onMenuChange,
+			menuItems,
+			router,
 		} = this.props;
-		const {
-			selectedMenu,
-			securityPending,
-			verificationPending,
-			walletPending,
-		} = this.state;
+		const { securityPending, verificationPending, walletPending } = this.state;
 
-		let disableBorder = false;
-		// noBorders || (activePath !== 'trade' && activePath !== 'quick-trade');
 		const { selected } = this.state;
 		const { themeOptions } = this.props;
 		return isMobile ? (
@@ -404,9 +190,7 @@ class AppBar extends Component {
 					'd-flex',
 					'app_bar-mobile',
 					'align-items-center',
-					isHome
-						? 'justify-content-between pl-4 pr-4'
-						: 'justify-content-center'
+					'justify-content-center'
 				)}
 			>
 				<Link to="/">
@@ -417,19 +201,18 @@ class AppBar extends Component {
 						className="homeicon-svg"
 					/>
 				</Link>
-				{isHome && this.renderSplashActions(token, verifyingToken)}
 			</MobileBarWrapper>
 		) : (
 			<div
 				className={classnames('app_bar d-flex justify-content-between', {
-					'no-borders': disableBorder,
+					'no-borders': false,
 				})}
 			>
 				<div
 					id="home-nav-container"
 					className="d-flex align-items-center justify-content-center h-100"
 				>
-					{this.renderIcon(isHome, theme)}
+					{this.renderIcon()}
 				</div>
 				{children}
 				{!isLoggedIn() && (
@@ -439,55 +222,49 @@ class AppBar extends Component {
 							options={themeOptions}
 							toggle={this.onToggle}
 						/>
-					</div>
-				)}
-				{!isHome ? (
-					isLoggedIn() ? (
 						<div
-							id="trade-nav-container"
-							className="d-flex app-bar-account justify-content-end"
+							className="login-container"
+							onClick={() => router.push('/login')}
 						>
-							<div className="d-flex app_bar-quicktrade-container">
-								<ThemeSwitcher
-									selected={selected}
-									options={themeOptions}
-									toggle={this.onToggle}
-								/>
-							</div>
-							<MenuList
-								selectedMenu={selectedMenu}
-								securityPending={securityPending}
-								verificationPending={verificationPending}
-								walletPending={walletPending}
-								handleMenu={this.handleMenu}
-								logout={logout}
-								activePath={activePath}
-								closeAccountMenu={this.closeAccountMenu}
-								onHelp={onHelp}
-								location={location}
+							{STRINGS['LOGIN_TEXT'].toUpperCase()}
+						</div>
+					</div>
+				)}
+				{isLoggedIn() && (
+					<div
+						id="trade-nav-container"
+						className="d-flex app-bar-account justify-content-end"
+					>
+						<div className="d-flex app_bar-quicktrade-container">
+							<ThemeSwitcher
+								selected={selected}
+								options={themeOptions}
+								toggle={this.onToggle}
 							/>
 						</div>
-					) : null
-				) : (
-					this.renderSplashActions(token, verifyingToken)
+						<AnnouncementList user={user.email} />
+						<MenuList
+							menuItems={menuItems}
+							securityPending={securityPending}
+							verificationPending={verificationPending}
+							walletPending={walletPending}
+							user={user}
+							activePath={activePath}
+							onMenuChange={onMenuChange}
+						/>
+					</div>
 				)}
 			</div>
 		);
 	}
 }
 
-const mapStateToProps = (state, ownProps) => {
-	const userData =
-		!state.user.id && ownProps.user && ownProps.user.id
-			? ownProps.user
-			: state.user;
+const mapStateToProps = (state) => {
 	return {
-		user: userData,
+		user: state.user,
 		theme: state.app.theme,
 		pair: state.app.pair,
-		pairs: state.app.pairs,
 		coins: state.app.coins,
-		info: state.app.info,
 		enabledPlugins: state.app.enabledPlugins,
 		constants: state.app.constants,
 		activeLanguage: state.app.language,
@@ -495,19 +272,11 @@ const mapStateToProps = (state, ownProps) => {
 };
 
 const mapDispatchToProps = (dispatch) => ({
-	getMe: bindActionCreators(getMe, dispatch),
-	setMe: bindActionCreators(setMe, dispatch),
-	setNotification: bindActionCreators(setNotification, dispatch),
 	getTickers: bindActionCreators(getTickers, dispatch),
 	changeTheme: bindActionCreators(changeTheme, dispatch),
 	setUserData: bindActionCreators(setUserData, dispatch),
 });
 
-AppBar.defaultProps = {
-	noBorders: false,
-	isHome: false,
-};
-
 export default connect(
 	mapStateToProps,
 	mapDispatchToProps
diff --git a/web/src/components/AppFooter/_AppFooter.scss b/web/src/components/AppFooter/_AppFooter.scss
index 595e4218af..5b8e590800 100644
--- a/web/src/components/AppFooter/_AppFooter.scss
+++ b/web/src/components/AppFooter/_AppFooter.scss
@@ -22,9 +22,9 @@ $footer-logo-color: $trade-tabs-inactive-color;
 		width: 100%;
 
 		.footer-links-section {
-			width: 60%;
+			// width: 60%;
 			.footer-links-group {
-				margin: 0 $footer-wrapper--margin;
+				margin: $footer-wrapper--margin;
 				font-size: $font-size-main;
 
 				.footer-links-section--title {
@@ -35,6 +35,7 @@ $footer-logo-color: $trade-tabs-inactive-color;
 
 				.footer-links-section--list {
 					min-width: 8rem;
+					text-transform: capitalize;
 
 					.social_icon {
 						width: 1rem;
@@ -51,16 +52,18 @@ $footer-logo-color: $trade-tabs-inactive-color;
 		}
 		.footer_separter {
 			border-left: 1px solid $footer-wrapper--border-color;
+			margin-left: 0.5rem;
+
 			.footer-txt {
-				width: 25rem;
-				margin-left: 1rem;
+				width: 23rem;
+				margin-left: 1.5rem;
 			}
 			.footer-logo {
 				background-size: contain;
-				background-position: center;
+				// background-position: center;
 				background-repeat: no-repeat;
 				height: 6rem !important;
-				margin-left: 1rem;
+				margin-left: 1.5rem;
 				width: 7rem;
 			}
 			svg {
@@ -177,32 +180,32 @@ $footer-logo-color: $trade-tabs-inactive-color;
 					margin: 0 $footer-icons--side-margin !important;
 				}
 			}
-			.footer-links-section {
-				width: 70%;
-			}
+			// .footer-links-section {
+			// 	width: 70%;
+			// }
 		}
 	}
 }
 
-@media screen and (min-width: 1920px) {
-	.app_footer-container {
-		.footer-row-content {
-			.footer-links-section {
-				width: 50%;
-			}
-		}
-	}
-}
+// @media screen and (min-width: 1920px) {
+// 	.app_footer-container {
+// 		.footer-row-content {
+// 			.footer-links-section {
+// 				width: 50%;
+// 			}
+// 		}
+// 	}
+// }
 
 @media screen and (max-width: $bp-sm) {
 	.app_footer-container {
 		.footer-row-content {
-			.footer-links-section {
-				width: 80%;
-			}
+			// .footer-links-section {
+			// 	width: 80%;
+			// }
 			.footer_separter {
 				.footer-txt {
-					width: 30rem;
+					width: 12rem;
 				}
 			}
 		}
@@ -236,7 +239,7 @@ $footer-logo-color: $trade-tabs-inactive-color;
 						align-items: center;
 					}
 					.footer-txt {
-						width: 37rem;
+						width: 100%;
 					}
 					.footer-logo {
 						height: 3.5rem;
diff --git a/web/src/components/AppFooter/index.js b/web/src/components/AppFooter/index.js
index 9e1c6de52d..a2d1f90ad3 100644
--- a/web/src/components/AppFooter/index.js
+++ b/web/src/components/AppFooter/index.js
@@ -77,52 +77,62 @@ const AppFooter = ({
 							'flex-column': isMobile,
 						})}
 					>
-						{generateSectionsText(constants.links, ICONS)
-							.filter(({ LINKS }) => LINKS.length)
-							.map(({ TITLE, LINKS }, index) => (
-								<div
-									key={index}
-									className={classnames(
-										'd-flex',
-										'flex-column',
-										'footer-links-group'
-									)}
-								>
-									<div className="footer-links-section--title">{TITLE}</div>
+						<div
+							className={classnames('d-flex', 'flex-wrap', {
+								'flex-column': isMobile,
+							})}
+						>
+							{generateSectionsText(constants.links, ICONS)
+								.filter(({ LINKS }) => LINKS.length)
+								.map(({ TITLE, LINKS }, index) => (
 									<div
+										key={index}
 										className={classnames(
 											'd-flex',
 											'flex-column',
-											'footer-links-section--list'
+											'footer-links-group'
 										)}
 									>
-										{LINKS.map(({ link, text, icon }, indexLink) => (
-											<div key={indexLink} className="link-section d-flex">
-												<a
-													href={link || '#'}
-													target="_blank"
-													rel="noopener noreferrer"
-												>
-													<div
-														className={classnames('d-flex', 'f-1', 'flex-row')}
+										<div className="footer-links-section--title">{TITLE}</div>
+										<div
+											className={classnames(
+												'd-flex',
+												'flex-column',
+												'footer-links-section--list'
+											)}
+										>
+											{LINKS.map(({ link, text, icon }, indexLink) => (
+												<div key={indexLink} className="link-section d-flex">
+													<a
+														href={link || '#'}
+														target="_blank"
+														rel="noopener noreferrer"
 													>
-														<div>
-															{icon ? (
-																<img
-																	src={icon}
-																	className="social_icon"
-																	alt="social_icons"
-																/>
-															) : null}
+														<div
+															className={classnames(
+																'd-flex',
+																'f-1',
+																'flex-row'
+															)}
+														>
+															<div>
+																{icon ? (
+																	<img
+																		src={icon}
+																		className="social_icon"
+																		alt="social_icons"
+																	/>
+																) : null}
+															</div>
+															<span>{text}</span>
 														</div>
-														<span>{text}</span>
-													</div>
-												</a>
-											</div>
-										))}
+													</a>
+												</div>
+											))}
+										</div>
 									</div>
-								</div>
-							))}
+								))}
+						</div>
 						<div className="footer_separter">
 							<div className="footer-content">
 								<div className="d-flex">
diff --git a/web/src/components/AppMenuSidebar/SidebarItem.js b/web/src/components/AppMenuSidebar/SidebarItem.js
new file mode 100644
index 0000000000..91ca99a4b2
--- /dev/null
+++ b/web/src/components/AppMenuSidebar/SidebarItem.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import classnames from 'classnames';
+import STRINGS from 'config/localizedStrings';
+import Image from 'components/Image';
+import { EditWrapper } from 'components';
+
+const SidebarItem = ({ icon, iconId, path, isActive, stringId, onClick }) => {
+	return (
+		<div
+			className={classnames(
+				'd-flex align-items-center app-menu-bar-side_list',
+				{ list_active: isActive }
+			)}
+			onClick={() => onClick(path)}
+		>
+			<Image icon={icon} wrapperClassName="app-menu-bar-icon" />
+			<div className="side-bar-txt">
+				<EditWrapper stringId={stringId} iconId={iconId}>
+					{STRINGS[stringId] || 'Unnamed page'}
+				</EditWrapper>
+			</div>
+		</div>
+	);
+};
+
+export default SidebarItem;
diff --git a/web/src/components/AppMenuSidebar/_AppMenuSidebar.scss b/web/src/components/AppMenuSidebar/_AppMenuSidebar.scss
new file mode 100644
index 0000000000..04af84a468
--- /dev/null
+++ b/web/src/components/AppMenuSidebar/_AppMenuSidebar.scss
@@ -0,0 +1,102 @@
+.app-menu-bar-side {
+	min-width: 18rem;
+	max-width: 18rem;
+}
+.direction_rtl {
+	.apply_rtl {
+		.app-menu-bar-side {
+			.side-bar-txt {
+				margin: 0 25px 0 0;
+			}
+		}
+	}
+}
+
+.app-side-bar {
+	.app-menu-bar-side {
+		background-color: $app-sidebar-background;
+		border-right: 1px solid $colors-border;
+
+		padding: 20px 16px 0 15px;
+		.app-menu-bar-icon {
+			width: 20px;
+		}
+	}
+	.app-menu-bar-side_list {
+		height: 60px;
+		padding: 18px 17px;
+		cursor: pointer;
+		color: $colors-black !important;
+
+		.side-bar-txt {
+			height: 24px;
+			margin: 0 0 0 14px;
+			font-size: 16px;
+		}
+	}
+	.list_active,
+	.app-menu-bar-side_list:hover {
+		border-radius: 4px;
+		background-color: $colors-border-hover;
+		.side-bar-txt {
+			color: $base_top-bar-navigation_text !important;
+		}
+		.tab-summary0,
+		.tab-wallet0,
+		.tab-security0,
+		.tab-history0,
+		.tab-verify0,
+		.tab-setting0,
+		.help-question,
+		.tab-signout,
+		.tab-history-st {
+			fill: $base_top-bar-navigation_text !important;
+		}
+	}
+	.list_active {
+		background-color: $colors-border !important;
+	}
+}
+
+@media (max-width: $bp-md) {
+	.app-menu-bar-side {
+		padding: 20px 8px 0 8px !important;
+		min-width: 6rem !important;
+		max-width: 10rem !important;
+		.app-menu-bar-icon {
+			width: 15px !important;
+		}
+	}
+	.app-menu-bar-side_list,
+	.list_active,
+	.app-menu-bar-side_list:hover {
+		width: 100%;
+		padding: 0px 24px !important;
+		font-size: 12px !important;
+	}
+	.app-menu-bar-side_list,
+	.list_active {
+		.side-bar-txt,
+		.side-bar-text-active {
+			display: none !important;
+		}
+	}
+}
+@media (min-width: 1920px) {
+	.app-menu-bar-side {
+		max-width: 26rem;
+		min-width: 26rem;
+	}
+}
+@media (max-width: 1096px) {
+	.app-menu-bar-side {
+		min-width: 20rem;
+		max-width: 20rem;
+	}
+}
+
+.layout-mobile {
+	.app-menu-bar-side {
+		display: none !important;
+	}
+}
diff --git a/web/src/components/AppMenuSidebar/index.js b/web/src/components/AppMenuSidebar/index.js
new file mode 100644
index 0000000000..925dfa7407
--- /dev/null
+++ b/web/src/components/AppMenuSidebar/index.js
@@ -0,0 +1,42 @@
+import React, { Component } from 'react';
+
+import withConfig from 'components/ConfigProvider/withConfig';
+import SidebarItem from './SidebarItem';
+
+class AppMenuSidebar extends Component {
+	render() {
+		const { icons: ICONS, menuItems, activePath, onMenuChange } = this.props;
+		return (
+			<div className="d-flex justify-content-between app-side-bar">
+				<div className="app-menu-bar-side">
+					{menuItems.map(
+						(
+							{ path, icon_id, string_id, hide_from_sidebar, activePaths },
+							index
+						) => {
+							return (
+								!hide_from_sidebar && (
+									<SidebarItem
+										key={`sidebar_item_${index}`}
+										path={path}
+										stringId={string_id}
+										iconId={icon_id}
+										icon={ICONS[icon_id]}
+										isActive={
+											activePaths
+												? activePaths.includes(activePath)
+												: path === activePath
+										}
+										onClick={() => onMenuChange(path)}
+									/>
+								)
+							);
+						}
+					)}
+				</div>
+			</div>
+		);
+	}
+}
+
+export default withConfig(AppMenuSidebar);
diff --git a/web/src/components/Button/CheckboxButton.js b/web/src/components/Button/CheckboxButton.js
index 365b77c4d1..336cf8d42a 100644
--- a/web/src/components/Button/CheckboxButton.js
+++ b/web/src/components/Button/CheckboxButton.js
@@ -34,6 +34,8 @@ const CheckboxButton = ({
 				'checkbutton-input-wrapper',
 				'd-flex',
 				'align-items-center',
+				'mdc-button',
+				'mdc-button--unelevated',
 				{ pointer: !!onClick }
 			)}
 			onClick={onCheck(disabled, onClick, checked)}
diff --git a/web/src/components/Button/_Button.scss b/web/src/components/Button/_Button.scss
index 4687694f17..b223c5cebd 100644
--- a/web/src/components/Button/_Button.scss
+++ b/web/src/components/Button/_Button.scss
@@ -26,9 +26,17 @@
 
 .checkbutton-wrapper {
 	font-size: $font-size-main;
-	margin-top: 1rem;
+	// margin-top: 1rem;
+	display: flex;
+	justify-content: center;
+	align-items: center;
 
 	.checkbutton-input-wrapper {
+		width: 300px;
+		padding: 10px;
+		margin-top: 35px;
+		justify-content: center;
+		background-color: $colors-notifications-blue;
 		.checkbutton-input-wrapper--label {
 			margin: 0;
 			padding-left: 0.5rem;
@@ -40,6 +48,7 @@
 		}
 		.checkbutton-input-wrapper--image svg {
 			@include size(2rem);
+			stroke: $base_footer_text;
 		}
 	}
 	.checkbutton-content-wrapper {
diff --git a/web/src/components/Chart/Charts/DonutChart.js b/web/src/components/Chart/Charts/DonutChart.js
index 5d844dcf94..5ff5649bef 100644
--- a/web/src/components/Chart/Charts/DonutChart.js
+++ b/web/src/components/Chart/Charts/DonutChart.js
@@ -152,6 +152,7 @@ class DonutChart extends Component {
 	}
 
 	renderSlice = (value, i, width, height) => {
+		const { showOpenWallet } = this.props;
 		let data = value.data;
 		let minViewportSize = Math.min(width, height);
 		let activeSlice = this.state.hoverId === data.symbol;
@@ -190,7 +191,7 @@ class DonutChart extends Component {
 					>
 						<tspan>{STRINGS['ZERO_ASSET']}</tspan>
 					</text>
-					{this.props.showOpenWallet ? (
+					{showOpenWallet && (
 						<text
 							transform={translate(0, 10)}
 							dy=".35em"
@@ -201,7 +202,7 @@ class DonutChart extends Component {
 								{STRINGS['DEPOSIT_ASSETS'].toUpperCase()}
 							</Link>
 						</text>
-					) : null}
+					)}
 				</g>
 			);
 		} else if (data.balance > 0) {
@@ -235,13 +236,13 @@ class DonutChart extends Component {
 							>
 								{symbol.toUpperCase()}
 							</text>
-							{this.props.showOpenWallet ? (
+							{showOpenWallet && (
 								<text dy="5px" textAnchor="middle" className="donut-label-link">
 									<Link to="/wallet" className="deposit-asset">
 										{STRINGS['OPEN_WALLET'].toUpperCase()}
 									</Link>
 								</text>
-							) : null}
+							)}
 						</Fragment>
 					) : null}
 				</g>
diff --git a/web/src/components/Chart/_Chart.scss b/web/src/components/Chart/_Chart.scss
index a96c0828e1..5de7cd9b36 100644
--- a/web/src/components/Chart/_Chart.scss
+++ b/web/src/components/Chart/_Chart.scss
@@ -426,3 +426,15 @@
 foreignObject {
 	overflow: visible;
 }
+
+.layout-mobile {
+	.donut-label-pair {
+		font-size: 1.4rem;
+	}
+	.donut-label-percentage {
+		font-size: 1.2rem;
+	}
+	.donut-label-link {
+		font-size: 1rem;
+	}
+}
diff --git a/web/src/components/Chat/_Chat.scss b/web/src/components/Chat/_Chat.scss
index 793b45c82f..bbb2fcc5d0 100644
--- a/web/src/components/Chat/_Chat.scss
+++ b/web/src/components/Chat/_Chat.scss
@@ -58,6 +58,7 @@ $colors-white: white;
 		}
 		.chat-footer {
 			padding: 0.5rem;
+			background-color: $box-fields;
 			.chat-message-box {
 				min-height: 4rem;
 				font-size: $regular-chat--font-size;
@@ -74,11 +75,11 @@ $colors-white: white;
 				}
 			}
 			.chat-emoji-wrapper {
-				background-color: $colors-white;
+				background-color: $box-fields;
 				.chat-emoji-icon {
 					svg {
 						.emoji-face-icon {
-							fill: $chat-message-content-color;
+							fill: $colors-black;
 						}
 					}
 				}
@@ -100,6 +101,7 @@ $colors-white: white;
 	box-shadow: 1px 0px 3px 0px rgba(0, 0, 0, 0.29);
 	font-family: 'Open Sans' !important;
 	border: 1px solid $chat-box-border !important;
+	border-top: 2px solid $link !important;
 
 	.timestamp {
 		color: $chat-message-dark--font-color;
@@ -369,6 +371,7 @@ $colors-white: white;
 		min-height: 3rem;
 		width: 100%;
 		padding: 0;
+		background-color: $app-light-background;
 		button {
 			width: 100%;
 		}
diff --git a/web/src/components/CheckTitle/MobileTabBar.js b/web/src/components/CheckTitle/MobileTabBar.js
index cc456acd7f..be7c429fa6 100644
--- a/web/src/components/CheckTitle/MobileTabBar.js
+++ b/web/src/components/CheckTitle/MobileTabBar.js
@@ -16,7 +16,11 @@ const MobileTabBar = ({ tabs, activeTab, setActiveTab, renderContent }) => {
 					}),
 				};
 				if (setActiveTab) {
-					tabProps.onClick = () => setActiveTab(index);
+					tabProps.onClick = () => {
+						if (index !== activeTab) {
+							setActiveTab(index);
+						}
+					};
 				}
 				return (
 					<div {...tabProps}>
diff --git a/web/src/components/CheckTitle/_CheckTitle.scss b/web/src/components/CheckTitle/_CheckTitle.scss
index 65cd0284a3..ed44248a93 100644
--- a/web/src/components/CheckTitle/_CheckTitle.scss
+++ b/web/src/components/CheckTitle/_CheckTitle.scss
@@ -192,13 +192,13 @@ $notification-size: 1.5rem;
 }
 
 .header_title-wrapper {
-	border-top: 1px solid $colors-main-border;
+	// border-top: 1px solid $colors-main-border;
 	margin-bottom: 1rem;
 	padding-top: 0.5rem;
 	position: relative;
 
 	.header_title-children {
-		font-size: $font-size-subtext;
+		font-size: $font-size-main;
 		color: $colors-deactivate-color2;
 		padding: 0.5rem 0;
 	}
diff --git a/web/src/components/ConfigProvider/index.js b/web/src/components/ConfigProvider/index.js
index 7caa9f6eb1..bb8346cb68 100644
--- a/web/src/components/ConfigProvider/index.js
+++ b/web/src/components/ConfigProvider/index.js
@@ -12,7 +12,13 @@ class ConfigProvider extends Component {
 	constructor(props) {
 		super(props);
 		const { initialConfig } = this.props;
-		const { icons = {}, color = {}, defaults = {}, coin_icons } = {
+		const {
+			icons = {},
+			color = {},
+			defaults = {},
+			coin_icons,
+			sections = {},
+		} = {
 			...initialConfig,
 		};
 
@@ -29,6 +35,7 @@ class ConfigProvider extends Component {
 			color: calculatedThemes,
 			themeOptions,
 			defaults,
+			sections,
 		};
 	}
 
@@ -79,6 +86,16 @@ class ConfigProvider extends Component {
 		}));
 	};
 
+	updateSections = (sections = {}) => {
+		this.setState((prevState) => ({
+			...prevState,
+			sections: {
+				...prevState.sections,
+				...sections,
+			},
+		}));
+	};
+
 	removeTheme = (keys = []) => {
 		const { color: prevColor } = this.state;
 		const color = {};
@@ -106,13 +123,14 @@ class ConfigProvider extends Component {
 
 	render() {
 		const { children, activeTheme } = this.props;
-		const { icons, color, themeOptions, defaults } = this.state;
+		const { icons, color, themeOptions, defaults, sections } = this.state;
 		const {
 			updateIcons,
 			removeIcon,
 			updateColor,
 			updateDefaults,
 			removeTheme,
+			updateSections,
 		} = this;
 
 		return (
@@ -122,9 +140,11 @@ class ConfigProvider extends Component {
 					icons: icons[activeTheme] || {},
 					allIcons: icons,
 					color,
+					sections,
 					themeOptions,
 					updateIcons,
 					updateColor,
+					updateSections,
 					updateDefaults,
 					removeTheme,
 					removeIcon,
diff --git a/web/src/components/ConfigProvider/withConfig.js b/web/src/components/ConfigProvider/withConfig.js
index 95fd5e5a5d..74a50560b3 100644
--- a/web/src/components/ConfigProvider/withConfig.js
+++ b/web/src/components/ConfigProvider/withConfig.js
@@ -15,6 +15,8 @@ const withConfig = (Component) => {
 				themeOptions,
 				removeTheme,
 				updateDefaults,
+				sections,
+				updateSections,
 			}) => (
 				<Component
 					{...props}
@@ -28,6 +30,8 @@ const withConfig = (Component) => {
 					themeOptions={themeOptions}
 					removeTheme={removeTheme}
 					updateDefaults={updateDefaults}
+					sections={sections}
+					updateSections={updateSections}
 				/>
 			)}
 		</ProjectConfig.Consumer>
diff --git a/web/src/components/CurrencyBall/_CurrencyBall.scss b/web/src/components/CurrencyBall/_CurrencyBall.scss
index 69a7cce799..1d9d87e27a 100644
--- a/web/src/components/CurrencyBall/_CurrencyBall.scss
+++ b/web/src/components/CurrencyBall/_CurrencyBall.scss
@@ -264,6 +264,31 @@ $large-modifier: 2.25;
 		border: none !important;
 		color: $coin-dai-text !important;
 	}
+	&.ama {
+		background-color: $coin-ama;
+		border: none !important;
+		color: $coin-ama-text !important;
+	}
+	&.xtz {
+		background-color: $coin-xtz;
+		border: none !important;
+		color: $coin-xtz-text !important;
+	}
+	&.doge {
+		background-color: $coin-doge;
+		border: none !important;
+		color: $coin-doge-text !important;
+	}
+	&.uni {
+		background-color: $coin-uni;
+		border: none !important;
+		color: $coin-uni-text !important;
+	}
+	&.dot {
+		background-color: $coin-dot;
+		border: none !important;
+		color: $coin-dot-text !important;
+	}
 
 	&.s {
 		font-size: $small-font;
diff --git a/web/src/components/Dialog/MessageDisplay.js b/web/src/components/Dialog/MessageDisplay.js
index 663157c57d..93957b59c1 100644
--- a/web/src/components/Dialog/MessageDisplay.js
+++ b/web/src/components/Dialog/MessageDisplay.js
@@ -11,14 +11,25 @@ const MessageDisplay = ({
 	buttonLabel = STRINGS['CLOSE_TEXT'],
 	iconPath,
 	iconId,
+	title,
+	titleId,
+	style,
 }) => (
-	<div className="success_display-wrapper d-flex align-content-between flex-wrap flex-column">
+	<div
+		className="success_display-wrapper d-flex align-content-between flex-wrap flex-column"
+		style={style}
+	>
 		<div className="success_display-content d-flex flex-column align-self-center flex-wrap justify-content-center align-items-center">
 			<Image
 				iconId={iconId}
 				icon={iconPath}
 				wrapperClassName="success_display-content-image"
 			/>
+			{title && (
+				<div className="success_display-content-text bold">
+					<EditWrapper stringId={titleId}>{title}</EditWrapper>
+				</div>
+			)}
 			<div className="success_display-content-text">
 				<EditWrapper stringId={stringId}>{text}</EditWrapper>
 			</div>
diff --git a/web/src/components/Dialog/_Dialog.scss b/web/src/components/Dialog/_Dialog.scss
index 4e42ffd259..895ea9b479 100644
--- a/web/src/components/Dialog/_Dialog.scss
+++ b/web/src/components/Dialog/_Dialog.scss
@@ -79,6 +79,12 @@ $close-button--margin: 1.5rem;
 	.ReactModal__Overlay {
 		z-index: 110 !important;
 	}
+
+	&.full {
+		.ReactModal__Overlay {
+			background-color: $app-sidebar-background !important;
+		}
+	}
 }
 
 .app-dialog-flex {
diff --git a/web/src/components/DisplayTable/_DisplayTable.scss b/web/src/components/DisplayTable/_DisplayTable.scss
index 3e087a2b18..60992de43c 100644
--- a/web/src/components/DisplayTable/_DisplayTable.scss
+++ b/web/src/components/DisplayTable/_DisplayTable.scss
@@ -31,6 +31,9 @@ $cell-height: 1.5rem;
 		min-height: $cell-height;
 		padding: 0.1rem;
 	}
+	.ant-select-arrow {
+		z-index: 1;
+	}
 }
 
 .f-1 {
diff --git a/web/src/components/EditProvider/index.js b/web/src/components/EditProvider/index.js
index c29a1304b1..0ef3b556a3 100644
--- a/web/src/components/EditProvider/index.js
+++ b/web/src/components/EditProvider/index.js
@@ -5,6 +5,7 @@ export const EditContext = React.createContext();
 class EditProvider extends Component {
 	state = {
 		isEditMode: false,
+		isInjectMode: false,
 	};
 
 	handleEditMode = () => {
@@ -14,16 +15,25 @@ class EditProvider extends Component {
 		}));
 	};
 
+	handleInjectMode = () => {
+		this.setState((prevState) => ({
+			...prevState,
+			isInjectMode: !prevState.isInjectMode,
+		}));
+	};
+
 	render() {
-		const { isEditMode } = this.state;
+		const { isEditMode, isInjectMode } = this.state;
 		const { children } = this.props;
-		const { handleEditMode } = this;
+		const { handleEditMode, handleInjectMode } = this;
 
 		return (
 			<EditContext.Provider
 				value={{
 					isEditMode,
+					isInjectMode,
 					handleEditMode,
+					handleInjectMode,
 				}}
 			>
 				{children}
diff --git a/web/src/components/EditProvider/withEdit.js b/web/src/components/EditProvider/withEdit.js
index b0cf7ae854..b8f92a9188 100644
--- a/web/src/components/EditProvider/withEdit.js
+++ b/web/src/components/EditProvider/withEdit.js
@@ -4,11 +4,13 @@ import { EditContext } from './index';
 const withEdit = (Component) => {
 	return (props) => (
 		<EditContext.Consumer>
-			{({ isEditMode, handleEditMode }) => (
+			{({ isEditMode, handleEditMode, isInjectMode, handleInjectMode }) => (
 				<Component
 					{...props}
 					isEditMode={isEditMode}
 					handleEditMode={handleEditMode}
+					isInjectMode={isInjectMode}
+					handleInjectMode={handleInjectMode}
 				/>
 			)}
 		</EditContext.Consumer>
diff --git a/web/src/components/EditWrapper/_EditWrapper.scss b/web/src/components/EditWrapper/_EditWrapper.scss
index 9e9a905b02..923e4c5ed5 100644
--- a/web/src/components/EditWrapper/_EditWrapper.scss
+++ b/web/src/components/EditWrapper/_EditWrapper.scss
@@ -24,6 +24,11 @@ $operator-controls__panel-text-color: #ffffff;
 	font-size: 10px !important;
 	text-decoration: none !important;
 	font-weight: normal !important;
+
+	&.large {
+		width: 50px !important;
+		height: 50px !important;
+	}
 }
 
 .edit-wrapper__icon {
diff --git a/web/src/components/EditWrapper/index.js b/web/src/components/EditWrapper/index.js
index 2634fc2ee6..f81152b79d 100644
--- a/web/src/components/EditWrapper/index.js
+++ b/web/src/components/EditWrapper/index.js
@@ -11,6 +11,8 @@ const EditWrapper = ({
 	position,
 	style,
 	reverse,
+	sectionId,
+	backgroundId,
 }) => {
 	const [x = 5, y = 0] = position;
 	const triggerStyles = {
@@ -40,6 +42,28 @@ const EditWrapper = ({
 						/>
 					</div>
 				)}
+				{sectionId && (
+					<div
+						className="edit-wrapper__icon-wrapper large"
+						data-section-id={sectionId}
+					>
+						<ReactSVG
+							src={STATIC_ICONS['EDIT_SECTION']}
+							className="edit-wrapper__icon"
+						/>
+					</div>
+				)}
+				{backgroundId && (
+					<div
+						className="edit-wrapper__icon-wrapper"
+						data-icon-id={backgroundId}
+					>
+						<ReactSVG
+							src={STATIC_ICONS['EDIT_BACKGROUND']}
+							className="edit-wrapper__icon"
+						/>
+					</div>
+				)}
 			</div>
 		</div>
 	);
diff --git a/web/src/components/Form/FormFields/DumbFieldForm.js b/web/src/components/Form/FormFields/DumbFieldForm.js
new file mode 100644
index 0000000000..4fc91fdec4
--- /dev/null
+++ b/web/src/components/Form/FormFields/DumbFieldForm.js
@@ -0,0 +1,54 @@
+import React from 'react';
+import classnames from 'classnames';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+import FieldWrapper from './FieldWrapper';
+import { ActionNotification } from '../../';
+import { ICONS } from '../../../config/constants';
+import STRINGS from '../../../config/localizedStrings';
+
+export const renderCopy = (text, onCopy) => {
+	return (
+		<CopyToClipboard text={text}>
+			<ActionNotification
+				status="information"
+				stringId="COPY_TEXT"
+				text={STRINGS['COPY_TEXT']}
+				iconId="COPY_NEW"
+				iconPath={ICONS['COPY_NEW']}
+				className="copy-wrapper"
+				onClick={onCopy}
+			/>
+		</CopyToClipboard>
+	);
+};
+
+const DumbField = ({
+	input: { value },
+	className = '',
+	allowCopy = false,
+	onCopy,
+	copyOnClick = false,
+	...rest
+}) => {
+	return (
+		<FieldWrapper
+			className={classnames('dumb-field-wrapper', className)}
+			{...rest}
+		>
+			<div className="d-flex justify-content-between">
+				{copyOnClick ? (
+					<CopyToClipboard text={value}>
+						<div className="pointer address-line" onClick={onCopy}>
+							{value}
+						</div>
+					</CopyToClipboard>
+				) : (
+					value
+				)}
+				{value && allowCopy && renderCopy(value, onCopy)}
+			</div>
+		</FieldWrapper>
+	);
+};
+
+export default DumbField;
diff --git a/web/src/components/Form/FormFields/FieldWrapper.js b/web/src/components/Form/FormFields/FieldWrapper.js
index 2b29a8687c..62def32dc2 100644
--- a/web/src/components/Form/FormFields/FieldWrapper.js
+++ b/web/src/components/Form/FormFields/FieldWrapper.js
@@ -1,4 +1,5 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
+import { ExclamationCircleFilled } from '@ant-design/icons';
 import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 
@@ -18,32 +19,66 @@ export const FieldContent = ({
 	contentClassName = '',
 	hideCheck = false,
 	outlineClassName = '',
+	displayError,
+	error,
+	ishorizontalfield = false,
+	dateFieldClassName,
+	warning,
 }) => {
 	return (
-		<div className={classnames('field-content')}>
-			<div className="d-flex">
-				{label && <div className="field-label">{label}</div>}
-				<EditWrapper stringId={stringId} />
+		<div>
+			<div className={classnames({ 'field-label-wrapper': ishorizontalfield })}>
+				<div className="d-flex">
+					{label && (
+						<div className="field-label">
+							{label}
+							{warning && (
+								<div className="d-flex align-items-baseline field_warning_wrapper">
+									<ExclamationCircleFilled className="field_warning_icon" />
+									<div className="field_warning_text">{warning}</div>
+								</div>
+							)}
+						</div>
+					)}
+					<EditWrapper stringId={stringId} />
+				</div>
+				<div className={classnames('field-content')}>
+					<div
+						className={classnames(
+							'field-children',
+							{ valid, custom: hideUnderline },
+							contentClassName,
+							{
+								'input-box-field':
+									ishorizontalfield && dateFieldClassName === '',
+							}
+						)}
+					>
+						{children}
+						{!hideCheck && valid && hasValue && (
+							<ReactSVG
+								src={STATIC_ICONS.BLACK_CHECK}
+								className="field-valid"
+							/>
+						)}
+					</div>
+					{!hideUnderline && (
+						<span
+							className={classnames('field-content-outline', outlineClassName, {
+								focused,
+							})}
+						/>
+					)}
+				</div>
 			</div>
-			<div
-				className={classnames(
-					'field-children',
-					{ valid, custom: hideUnderline },
-					contentClassName
-				)}
-			>
-				{children}
-				{!hideCheck && valid && hasValue && (
-					<ReactSVG src={STATIC_ICONS.BLACK_CHECK} className="field-valid" />
-				)}
+			<div className="field-label-wrapper">
+				{ishorizontalfield ? (
+					<Fragment>
+						<div className="field-label"></div>
+						<FieldError displayError={displayError} error={error} />
+					</Fragment>
+				) : null}
 			</div>
-			{!hideUnderline && (
-				<span
-					className={classnames('field-content-outline', outlineClassName, {
-						focused,
-					})}
-				/>
-			)}
 		</div>
 	);
 };
@@ -74,6 +109,7 @@ class FieldWrapper extends Component {
 		const {
 			children,
 			label,
+			warning,
 			stringId,
 			input: { value },
 			meta: { active = false, error = '', touched = false, invalid = false },
@@ -86,6 +122,7 @@ class FieldWrapper extends Component {
 			notification,
 			hideCheck = false,
 			outlineClassName = '',
+			ishorizontalfield,
 		} = this.props;
 
 		const displayError = !(active || focused) && (visited || touched) && error;
@@ -102,6 +139,7 @@ class FieldWrapper extends Component {
 				<FieldContent
 					stringId={stringId}
 					label={label}
+					warning={warning}
 					valid={!invalid}
 					hasValue={hasValue}
 					focused={active || focused}
@@ -109,6 +147,10 @@ class FieldWrapper extends Component {
 					hideCheck={hideCheck}
 					outlineClassName={outlineClassName}
 					onClick={onClick}
+					displayError={displayError}
+					error={error}
+					ishorizontalfield={ishorizontalfield}
+					dateFieldClassName={className}
 				>
 					{children}
 					{notification && typeof notification === 'object' && (
@@ -121,7 +163,9 @@ class FieldWrapper extends Component {
 						/>
 					)}
 				</FieldContent>
-				<FieldError displayError={displayError} error={error} />
+				{!ishorizontalfield ? (
+					<FieldError displayError={displayError} error={error} />
+				) : null}
 			</div>
 		);
 	}
diff --git a/web/src/components/Form/FormFields/FileField.js b/web/src/components/Form/FormFields/FileField.js
index 05dd33d766..dcb64c1d93 100644
--- a/web/src/components/Form/FormFields/FileField.js
+++ b/web/src/components/Form/FormFields/FileField.js
@@ -4,6 +4,7 @@ import FieldWrapper from './FieldWrapper';
 import { ActionNotification } from '../../';
 import STRINGS from '../../../config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
+import { STATIC_ICONS } from 'config/icons';
 
 class FileField extends Component {
 	state = {
@@ -44,7 +45,7 @@ class FileField extends Component {
 	};
 
 	render() {
-		const { placeholder, multiple, length, icons: ICONS } = this.props;
+		const { placeholder, multiple, length } = this.props;
 		const { filename, fileArray } = this.state;
 		const input = {
 			onChange: this.onChange,
@@ -91,9 +92,9 @@ class FileField extends Component {
 									stringId="ADD_FILES"
 									text={STRINGS['ADD_FILES']}
 									status="information"
-									iconId="BLUE_CLIP"
-									iconPath={ICONS['BLUE_CLIP']}
-									className="no_bottom pr-0 pl-0"
+									iconId="PAPER_CLIP"
+									iconPath={STATIC_ICONS['PAPER_CLIP']}
+									className="no_bottom pr-0 pl-0 paper-clip-icon"
 								/>
 						  )
 						: !filename && (
@@ -101,9 +102,9 @@ class FileField extends Component {
 									stringId="ADD_FILES"
 									text={STRINGS['ADD_FILES']}
 									status="information"
-									iconId="BLUE_CLIP"
-									iconPath={ICONS['BLUE_CLIP']}
-									className="no_bottom pr-0 pl-0"
+									iconId="PAPER_CLIP"
+									iconPath={STATIC_ICONS['PAPER_CLIP']}
+									className="no_bottom pr-0 pl-0 paper-clip-icon"
 								/>
 						  )}
 					<input type="file" className="input_file" {...input} />
diff --git a/web/src/components/Form/FormFields/ToggleField.js b/web/src/components/Form/FormFields/ToggleField.js
index 8e7759ae34..e7d10ae600 100644
--- a/web/src/components/Form/FormFields/ToggleField.js
+++ b/web/src/components/Form/FormFields/ToggleField.js
@@ -51,6 +51,7 @@ class ToggleField extends Component {
 			meta = { active: false, error: '', touched: false, invalid: false },
 			toggleOnly,
 			disabled,
+			isHideToggleText,
 			...rest
 		} = this.props;
 		const { selected } = this.state;
@@ -63,6 +64,7 @@ class ToggleField extends Component {
 						disabled={disabled}
 						name={input.name}
 						onToogle={this.onToogle}
+						isHideToggleText={isHideToggleText}
 					/>
 				) : (
 					<FieldContent
@@ -79,6 +81,7 @@ class ToggleField extends Component {
 								disabled={disabled}
 								name={input.name}
 								onToogle={this.onToogle}
+								isHideToggleText={isHideToggleText}
 							/>
 						</div>
 					</FieldContent>
@@ -88,7 +91,14 @@ class ToggleField extends Component {
 	}
 }
 
-const Toggle = ({ options, selected, onToogle, disabled, name }) => (
+const Toggle = ({
+	options,
+	selected,
+	onToogle,
+	disabled,
+	name,
+	isHideToggleText = false,
+}) => (
 	<div className={classnames('toggle_button-wrapper', 'd-flex')}>
 		<div
 			className={classnames(
@@ -98,13 +108,15 @@ const Toggle = ({ options, selected, onToogle, disabled, name }) => (
 				'direction_ltr'
 			)}
 		>
-			<div
-				className={classnames({
-					selected: options[1].value === selected && !disabled,
-				})}
-			>
-				{options[1].label}
-			</div>
+			{!isHideToggleText ? (
+				<div
+					className={classnames({
+						selected: options[1].value === selected && !disabled,
+					})}
+				>
+					{options[1].label}
+				</div>
+			) : null}
 			<div
 				onClick={name === 'all' || !disabled ? onToogle : () => {}}
 				className={classnames('toggle-action_button', {
@@ -115,13 +127,15 @@ const Toggle = ({ options, selected, onToogle, disabled, name }) => (
 			>
 				<div className="toggle-action_button-display" />
 			</div>
-			<div
-				className={classnames({
-					selected: options[0].value === selected && !disabled,
-				})}
-			>
-				{options[0].label}
-			</div>
+			{!isHideToggleText ? (
+				<div
+					className={classnames({
+						selected: options[0].value === selected && !disabled,
+					})}
+				>
+					{options[0].label}
+				</div>
+			) : null}
 		</div>
 	</div>
 );
diff --git a/web/src/components/Form/FormFields/_DropdownField.scss b/web/src/components/Form/FormFields/_DropdownField.scss
index 4812294764..a7aa1e391d 100644
--- a/web/src/components/Form/FormFields/_DropdownField.scss
+++ b/web/src/components/Form/FormFields/_DropdownField.scss
@@ -42,7 +42,8 @@ $dropdown-option--padding: 0.25rem;
 }
 
 .dropdown-option {
-	padding: $dropdown-option--padding;
+	// padding: $dropdown-option--padding;
+	padding: 0.25rem 1rem;
 	display: flex;
 	align-items: center;
 	> .icon {
@@ -75,3 +76,14 @@ $dropdown-option--padding: 0.25rem;
 		}
 	}
 }
+
+.layout-mobile {
+	.dropdown-option {
+		> .icon {
+			max-height: 1.8rem;
+		}
+		.option-icon {
+			width: 1.8rem;
+		}
+	}
+}
diff --git a/web/src/components/Form/FormFields/_FieldWrapper.scss b/web/src/components/Form/FormFields/_FieldWrapper.scss
index 10258b8d63..d11833af14 100644
--- a/web/src/components/Form/FormFields/_FieldWrapper.scss
+++ b/web/src/components/Form/FormFields/_FieldWrapper.scss
@@ -10,11 +10,11 @@ $outline-height: 1.5px;
 	position: relative;
 	width: 100%;
 	font-size: $font-size-subtext;
-	font-weight: bold;
 	margin: $wrapper-margin 0;
 
 	&.error {
 		color: $colors-notifications-red;
+		margin-bottom: 15px;
 	}
 
 	&.inline {
@@ -29,23 +29,38 @@ $outline-height: 1.5px;
 			}
 		}
 	}
+	.checkfield-input-wrapper {
+		align-items: center;
+	}
+}
+
+.field-label-wrapper {
+	display: flex;
+	align-items: center;
+
+	> div {
+		flex: 1;
+	}
+
+	.field_warning_wrapper {
+		width: 80%;
+	}
 }
 
 .field-label {
-	margin-bottom: 0.25rem;
 	color: $form-label;
-	font-weight: normal;
+	font-size: 14px;
 }
 
 .field-content {
 	position: relative;
 	display: flex;
 	flex-direction: column;
-	margin-bottom: $underline-margin-bottom;
+	// margin-bottom: $underline-margin-bottom;
 }
 
 .field-children {
-	padding: $children--padding 0 $children--padding/2;
+	padding: $children--padding 1rem $children--padding/2;
 	position: relative;
 
 	&.custom {
@@ -61,6 +76,21 @@ $outline-height: 1.5px;
 		bottom: 0.25rem;
 	}
 }
+.input-box-field {
+	width: 100%;
+	height: 38px;
+	padding: 10px 10px;
+	border-radius: 2px;
+	border: 1px solid $colors-main-border;
+	background-color: $app-sidebar-background;
+
+	.input_field-input {
+		&::placeholder {
+			color: $colors-black;
+			font-size: 14px;
+		}
+	}
+}
 
 .field-content-outline {
 	&:before {
@@ -141,11 +171,20 @@ $outline-height: 1.5px;
 	}
 }
 
+.field_warning_wrapper {
+	font-size: 1rem;
+	color: $colors-notifications-red;
+}
+
 .direction_ltr {
 	.field-error-text {
 		padding-left: 0.25rem;
 	}
 
+	.field_warning_text {
+		padding-left: 0.25rem;
+	}
+
 	.field-children {
 		&.valid > *:not(:last-child) {
 			padding-right: $valid-icon-size;
@@ -159,7 +198,7 @@ $outline-height: 1.5px;
 	.field-wrapper {
 		&.inline {
 			.field-error-content {
-				margin-left: $error-margin;
+				margin: 0.5rem 0 0 0;
 			}
 
 			input {
@@ -183,6 +222,10 @@ $outline-height: 1.5px;
 		padding-right: 0.25rem;
 	}
 
+	.field_warning_text {
+		padding-right: 0.25rem;
+	}
+
 	.field-children {
 		&.valid > *:not(:last-child) {
 			padding-left: $valid-icon-size;
@@ -230,4 +273,18 @@ $outline-height: 1.5px;
 			}
 		}
 	}
+	.field-label-wrapper {
+		> div {
+			flex: 1;
+			width: 100%;
+		}
+
+		.field_warning_wrapper {
+			width: 100%;
+		}
+	}
+
+	.field_warning_wrapper {
+		padding-bottom: 1rem;
+	}
 }
diff --git a/web/src/components/Form/FormFields/_FormFields.scss b/web/src/components/Form/FormFields/_FormFields.scss
index 55c7c4fe24..f6ac45f53b 100644
--- a/web/src/components/Form/FormFields/_FormFields.scss
+++ b/web/src/components/Form/FormFields/_FormFields.scss
@@ -5,7 +5,7 @@ $toggle-size: 14px;
 $toggle-border: 2px;
 $toggle-margin: 2px;
 $placeholder--padding: 0.25rem;
-$placeholder--font-size: $font-size-subtext;
+$placeholder--font-size: 0.9rem;
 $placeholder--font-weight: bold;
 
 .input_icon {
@@ -51,6 +51,15 @@ $placeholder--font-weight: bold;
 
 .datefield-wrapper {
 	position: relative;
+	.field-children:last-child {
+		.year .field-content,
+		.month .field-content,
+		.day .field-content {
+			border: 1px solid $colors-main-border;
+			background-color: $app-sidebar-background;
+			padding: 6px 0;
+		}
+	}
 
 	.datefield-input {
 		// visibility: hidden;
@@ -97,6 +106,9 @@ $placeholder--font-weight: bold;
 					margin-right: 1rem;
 				}
 			}
+			.dropdown-triangle::after {
+    			bottom: 0 !important;
+			}
 		}
 	}
 }
@@ -138,6 +150,20 @@ $placeholder--font-weight: bold;
 		position: relative;
 		top: 0 !important;
 	}
+	.paper-clip-icon{
+		.action_notification-svg {
+			background-color: $link;
+			width: 1.2rem;
+			height: 1.2rem;
+			border-radius: 50%;
+			display: flex;
+    		margin-left: 5px;
+			svg {
+				width: 0.8rem !important;
+				height: 0.8rem !important;
+			}
+		}
+	}
 }
 
 .multiple_file_wrapper {
@@ -228,7 +254,7 @@ $placeholder--font-weight: bold;
 	.dropdown-triangle:after {
 		border-right: 0.25rem solid $form-arrow;
 		border-left: 0.25rem solid transparent;
-		right: 0px;
+		right: 3px;
 	}
 
 	.placeholder {
diff --git a/web/src/components/Form/TradeFormFields/DropDown.js b/web/src/components/Form/TradeFormFields/DropDown.js
index e7c3a35b8b..b54915a18e 100644
--- a/web/src/components/Form/TradeFormFields/DropDown.js
+++ b/web/src/components/Form/TradeFormFields/DropDown.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { Select } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
+import STRINGS from 'config/localizedStrings';
 
 const { Option } = Select;
 
@@ -12,27 +13,30 @@ const DropDown = (props) => {
 		options,
 	} = props;
 	return (
-		<div className="trade-form-select">
-			<Select
-				defaultValue={options[0].value}
-				bordered={false}
-				size="small"
-				onChange={onChange}
-				suffixIcon={<CaretDownOutlined />}
-				className="custom-select-input-style order-entry"
-				dropdownClassName="custom-select-style"
-			>
-				{options.map(({ value, label }, index) => (
-					<Option
-						name="selectedPairBase"
-						value={value}
-						key={index}
-						className="d-flex"
-					>
-						{label}
-					</Option>
-				))}
-			</Select>
+		<div className="trade-form-select d-flex align-center justify-content-between">
+			<div style={{ width: '50%' }}>{STRINGS['ORDER_MODE']}:</div>
+			<div style={{ width: '50%' }}>
+				<Select
+					defaultValue={options[0].value}
+					bordered={false}
+					size="small"
+					onChange={onChange}
+					suffixIcon={<CaretDownOutlined />}
+					className="custom-select-input-style w-100 elevated"
+					dropdownClassName="custom-select-style select-option-wrapper"
+				>
+					{options.map(({ value, label }, index) => (
+						<Option
+							name="selectedPairBase"
+							value={value}
+							key={index}
+							className="d-flex"
+						>
+							{label}
+						</Option>
+					))}
+				</Select>
+			</div>
 		</div>
 	);
 };
diff --git a/web/src/components/Form/TradeFormFields/_TradeFormFields.scss b/web/src/components/Form/TradeFormFields/_TradeFormFields.scss
index 349eb8d4ec..f795c12dff 100644
--- a/web/src/components/Form/TradeFormFields/_TradeFormFields.scss
+++ b/web/src/components/Form/TradeFormFields/_TradeFormFields.scss
@@ -30,7 +30,7 @@ $padding: 0.25rem;
 
 			&:focus {
 				outline: none;
-				border: 1.5px solid $trade-fields-border;
+				border: 1.5px solid $link;
 			}
 		}
 	}
@@ -116,8 +116,8 @@ $padding: 0.25rem;
 }
 
 .trade-form-select {
-	width: 35% !important;
-	transform: translateY(1.4rem);
+	padding-bottom: 1.5rem;
+	font-size: $font-size-mobile-innertxt !important;
 }
 
 .ant-slider-mark-text {
diff --git a/web/src/components/Form/factoryFields.js b/web/src/components/Form/factoryFields.js
index d45bcb4ddc..396566e7ea 100644
--- a/web/src/components/Form/factoryFields.js
+++ b/web/src/components/Form/factoryFields.js
@@ -10,18 +10,20 @@ import CheckField from './FormFields/CheckField';
 import EditableInputField from './FormFields/EditableInputField';
 import CaptchaField from './FormFields/Captcha';
 import ToggleField from './FormFields/ToggleField';
+import DumbField from './FormFields/DumbFieldForm';
 
 const renderFields = (fields = {}, callback) => {
 	return (
 		<div>
 			{Object.keys(fields).map((key, index) => {
-				const { type, validate = [], ...rest } = fields[key];
+				const { type, validate = [], ishorizontalfield, ...rest } = fields[key];
 				const commonProps = {
 					callback,
 					key,
 					name: key,
 					type,
 					validate,
+					ishorizontalfield,
 					...rest,
 				};
 
@@ -37,6 +39,8 @@ const renderFields = (fields = {}, callback) => {
 						);
 					case 'file':
 						return <Field component={FileField} {...commonProps} />;
+					case 'dumb':
+						return <Field component={DumbField} {...commonProps} />;
 					case 'select':
 					case 'autocomplete':
 						return (
diff --git a/web/src/components/Form/validations.js b/web/src/components/Form/validations.js
index e4639396e4..aa8f3bea53 100644
--- a/web/src/components/Form/validations.js
+++ b/web/src/components/Form/validations.js
@@ -39,19 +39,20 @@ export const validAddress = (symbol = '', message, network) => {
 		let valid = true;
 
 		if (network) {
-			switch (network) {
-				case 'ethereum':
-					valid = WAValidator.validate(address, 'eth');
-					break;
-				case 'stellar':
-					valid = WAValidator.validate(address, 'xlm');
-					break;
-				case 'tron':
-					valid = WAValidator.validate(address, 'trx');
-					break;
-				default:
-					break;
-			}
+			valid = WAValidator.validate(address, network);
+			// switch (network) {
+			// 	case 'ethereum':
+			// 		valid = WAValidator.validate(address, 'eth');
+			// 		break;
+			// 	case 'stellar':
+			// 		valid = WAValidator.validate(address, 'xlm');
+			// 		break;
+			// 	case 'tron':
+			// 		valid = WAValidator.validate(address, 'trx');
+			// 		break;
+			// 	default:
+			// 		break;
+			// }
 		} else {
 			const supported = WAValidator.findCurrency(symbol);
 			if (supported) {
diff --git a/web/src/components/MobileBar/MobileBarBack.js b/web/src/components/MobileBar/MobileBarBack.js
index c89a76b35e..9386499425 100644
--- a/web/src/components/MobileBar/MobileBarBack.js
+++ b/web/src/components/MobileBar/MobileBarBack.js
@@ -3,9 +3,14 @@ import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 
 import { MobileBarWrapper } from '.';
-import { ICONS } from '../../config/constants';
+import withConfig from 'components/ConfigProvider/withConfig';
 
-export const MobileBarBack = ({ onBackClick, wrapperClassName, className }) => {
+const MobileBarBack = ({
+	onBackClick,
+	wrapperClassName,
+	className,
+	icons: ICONS,
+}) => {
 	return (
 		<MobileBarWrapper className="d-flex align-items-center">
 			<div
@@ -13,7 +18,7 @@ export const MobileBarBack = ({ onBackClick, wrapperClassName, className }) => {
 				onClick={onBackClick}
 			>
 				<ReactSVG
-					src={ICONS.ARROW_ARROW}
+					src={ICONS['ARROW_ARROW']}
 					className={classnames('bar-icon-back', wrapperClassName)}
 				/>
 			</div>
@@ -26,3 +31,5 @@ MobileBarBack.defaultProps = {
 	wrapperClassName: '',
 	className: '',
 };
+
+export default withConfig(MobileBarBack);
diff --git a/web/src/components/MobileBar/MobileBarTabs.js b/web/src/components/MobileBar/MobileBarTabs.js
index 2a16e12c5d..eda99ebfda 100644
--- a/web/src/components/MobileBar/MobileBarTabs.js
+++ b/web/src/components/MobileBar/MobileBarTabs.js
@@ -3,6 +3,7 @@ import classnames from 'classnames';
 import { MobileBarWrapper } from '.';
 import MarketSelector from 'components/AppBar/MarketSelector';
 import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons';
+import Image from 'components/Image';
 
 const renderMobileTab = ({
 	title,
@@ -42,6 +43,7 @@ export const MobileBarTabs = ({
 	pair,
 	goToPair,
 	goToMarkets,
+	icons: ICONS,
 }) => {
 	const [isMarketSelectorOpen, setIsMarketSelectorOpen] = useState(false);
 
@@ -53,6 +55,12 @@ export const MobileBarTabs = ({
 		setIsMarketSelectorOpen(false);
 	};
 
+	let pair_base = '';
+	if (pair) {
+		const pairArray = pair.split('-');
+		pair_base = pairArray[0];
+	}
+
 	return (
 		<Fragment>
 			<MobileBarWrapper className="d-flex justify-content-between">
@@ -82,6 +90,16 @@ export const MobileBarTabs = ({
 						className="d-flex align-items-center ml-2"
 						onClick={toggleMarketSelector}
 					>
+						{pair_base && (
+							<Image
+								icon={
+									ICONS[`${pair_base.toUpperCase()}_ICON`]
+										? ICONS[`${pair_base.toUpperCase()}_ICON`]
+										: ICONS.DEFAULT_ICON
+								}
+								wrapperClassName="mobile-tab_market-indicator pt-3"
+							/>
+						)}
 						<span className="pt-2 trade-tab__market-selector pr-2">{pair}</span>
 						{isMarketSelectorOpen ? (
 							<CaretUpOutlined style={{ fontSize: '14px' }} />
diff --git a/web/src/components/MobileBar/_MobileBar.scss b/web/src/components/MobileBar/_MobileBar.scss
index fb7d652017..1597048791 100644
--- a/web/src/components/MobileBar/_MobileBar.scss
+++ b/web/src/components/MobileBar/_MobileBar.scss
@@ -51,7 +51,7 @@ $mobile-notification-size: 1.75rem;
 	svg {
 		@include size(2.5rem);
 		.arrow-down {
-			stroke: white;
+			stroke: $base_top-bar-navigation_text;
 		}
 	}
 }
diff --git a/web/src/components/MobileBar/index.js b/web/src/components/MobileBar/index.js
index c708c2ace4..6398a8e9a4 100644
--- a/web/src/components/MobileBar/index.js
+++ b/web/src/components/MobileBar/index.js
@@ -1,3 +1,3 @@
 export { MobileBarWrapper } from './MobileBarWrapper';
 export { MobileBarTabs } from './MobileBarTabs';
-export { MobileBarBack } from './MobileBarBack';
+export { default as MobileBarBack } from './MobileBarBack';
diff --git a/web/src/components/Notification/GenerateAddress.js b/web/src/components/Notification/GenerateAddress.js
index 4f5147d1ac..c9f8b9e566 100644
--- a/web/src/components/Notification/GenerateAddress.js
+++ b/web/src/components/Notification/GenerateAddress.js
@@ -4,6 +4,7 @@ import STRINGS from '../../config/localizedStrings';
 import { NotificationWraper, NotificationContent } from './Notification';
 import { Button, Loader } from '../';
 import { EditWrapper } from 'components';
+import Image from 'components/Image';
 
 const GenerateAddressNotification = ({
 	type,
@@ -35,7 +36,12 @@ const GenerateAddressNotification = ({
 		>
 			<NotificationContent>
 				{!error ? (
-					<div className="notification-content-header">
+					<div className="notification-content-header d-flex align-items-center">
+						<Image
+							iconId={`${currency.toUpperCase()}_ICON`}
+							icon={ICONS[`${currency.toUpperCase()}_ICON`]}
+							wrapperClassName="form_currency-ball mr-3"
+						/>
 						<EditWrapper stringId="WALLET_ADDRESS_MESSAGE">
 							{STRINGS['WALLET_ADDRESS_MESSAGE']}
 						</EditWrapper>
diff --git a/web/src/components/Notification/Logout.js b/web/src/components/Notification/Logout.js
index fcff505f6e..5d98f01b67 100644
--- a/web/src/components/Notification/Logout.js
+++ b/web/src/components/Notification/Logout.js
@@ -7,7 +7,7 @@ import STRINGS from '../../config/localizedStrings';
 const ERROR_DENIED = 'Error Denied: ';
 const ERROR_INVALID_TOKEN = 'Invalid token';
 const ERROR_INVALID_IP = 'Login again';
-const ERROR_TOKEN_EXPIRED = 'Token is expired';
+export const ERROR_TOKEN_EXPIRED = 'Token is expired';
 const ERROR_INACTIVE = 'Inactive';
 
 const getMessage = (message = '') => {
diff --git a/web/src/components/Notification/Order.js b/web/src/components/Notification/Order.js
index 6a3b7cdd9b..a1e2e380cf 100644
--- a/web/src/components/Notification/Order.js
+++ b/web/src/components/Notification/Order.js
@@ -16,7 +16,7 @@ import {
 
 const SIDE_BUY = 'buy';
 
-export const getTitleAndIcon = (type, { side, filled }, ICONS) => {
+export const getTitleAndIcon = (type, { side, filled }, ICONS = {}) => {
 	const data = {
 		iconId: '',
 		stringId: '',
diff --git a/web/src/components/NotificationsList/_NotificationsList.scss b/web/src/components/NotificationsList/_NotificationsList.scss
index 290645c105..ff24db6847 100644
--- a/web/src/components/NotificationsList/_NotificationsList.scss
+++ b/web/src/components/NotificationsList/_NotificationsList.scss
@@ -20,6 +20,10 @@
 .trade_announcement {
 	font-size: 1.5rem;
 }
+.announcement-notification-list-item {
+	color: $colors-main-black;
+	border-bottom: 1px solid $colors-border;
+}
 
 .post-content {
 	.notifications_list-item-text {
@@ -31,4 +35,7 @@
 			background-color: $app-sidebar-background !important;
 		}
 	}
+	.notifications_list-item-timestamp {
+		color: $colors-deactivate;
+	}
 }
diff --git a/web/src/components/NotificationsList/index.js b/web/src/components/NotificationsList/index.js
index e52b4db0e1..218954bfb2 100644
--- a/web/src/components/NotificationsList/index.js
+++ b/web/src/components/NotificationsList/index.js
@@ -1,10 +1,9 @@
 import React, { useEffect } from 'react';
 import { connect } from 'react-redux';
-import { ReactSVG } from 'react-svg';
 import moment from 'moment';
 import { bindActionCreators } from 'redux';
 
-import { ICONS } from '../../config/constants';
+import Image from '../Image';
 import { getAnnouncement } from '../../actions/appActions';
 
 const createMarkup = (msg) => {
@@ -16,22 +15,24 @@ export const NotificationItem = ({
 	message = '',
 	type,
 	created_at,
+	ICONS,
 }) => {
 	return (
-		<div>
+		<div className="announcement-notification-list-item">
 			<div>
 				<div className="d-flex my-2">
 					<div className="mr-2">
-						<ReactSVG
-							src={ICONS.TRADE_ANNOUNCEMENT}
-							className="trade_post_icon"
+						<Image
+							iconId="TRADE_ANNOUNCEMENT"
+							icon={ICONS['TRADE_ANNOUNCEMENT']}
+							wrapperClassName="trade_post_icon"
 						/>
 					</div>
 					<div>
 						<div className="post_header">{title}</div>
-						{type && (
+						{/* {type && (
 							<div className="notifications_list-item-title">{type}</div>
-						)}
+						)} */}
 						<div className="post-content">
 							<div className="notifications_list-item-timestamp">
 								{moment(created_at).format('MMMM DD, YYYY')}
@@ -59,7 +60,7 @@ export const NotificationItem = ({
 };
 
 // TODO create announcement item style
-const NotificationsList = ({ announcements, getAnnouncement }) => {
+const NotificationsList = ({ ICONS = {}, announcements, getAnnouncement }) => {
 	useEffect(() => {
 		getAnnouncement();
 		//  TODO: Fix react-hooks/exhaustive-deps
@@ -71,7 +72,7 @@ const NotificationsList = ({ announcements, getAnnouncement }) => {
 	return (
 		<div className="notifications_list-wrapper">
 			{announcements.map(({ id, ...rest }, index) => (
-				<NotificationItem key={id} {...rest} />
+				<NotificationItem key={id} ICONS={ICONS} {...rest} />
 			))}
 		</div>
 	);
diff --git a/web/src/components/QuickTrade/InputGroup.js b/web/src/components/QuickTrade/InputGroup.js
index 6f709be9e0..e26d5434d5 100644
--- a/web/src/components/QuickTrade/InputGroup.js
+++ b/web/src/components/QuickTrade/InputGroup.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import { oneOfType, array, string, func, number, object } from 'prop-types';
 import { Select, Input } from 'antd';
-import Image from 'components/Image';
 import math from 'mathjs';
 import { isNumeric, isFloat } from 'validator';
 import { CaretDownOutlined } from '@ant-design/icons';
@@ -10,6 +9,7 @@ import { minValue, maxValue } from 'components/Form/validations';
 import { FieldError } from 'components/Form/FormFields/FieldWrapper';
 import { translateError } from './utils';
 import withConfig from 'components/ConfigProvider/withConfig';
+import EditWrapper from 'components/EditWrapper';
 
 const { Option } = Select;
 const { Group } = Input;
@@ -65,26 +65,35 @@ class InputGroup extends React.PureComponent {
 			onSelect,
 			limits = {},
 			icons: ICONS,
+			autoFocus,
+			stringId,
 		} = this.props;
 
 		return (
 			<div className="py-2">
-				<label className="bold caps-first">{name}</label>
+				<label className="bold caps-first">
+					<EditWrapper stringId={stringId}>{name}</EditWrapper>
+				</label>
 				<Group compact className="input-group__container">
 					<Select
+						open={isOpen}
 						size="default"
 						showSearch
 						filterOption={true}
 						className="input-group__select"
 						value={selectValue}
 						style={isOpen ? { width: '100%' } : { width: '33%' }}
-						onSelect={onSelect}
+						onChange={onSelect}
 						onDropdownVisibleChange={this.onDropdownVisibleChange}
 						bordered={false}
 						listItemHeight={35}
 						listHeight={35 * 6}
 						dropdownClassName="custom-select-style"
-						suffixIcon={<CaretDownOutlined />}
+						suffixIcon={
+							<CaretDownOutlined
+								onClick={() => this.onDropdownVisibleChange(!isOpen)}
+							/>
+						}
 					>
 						{options.map((symbol, index) => (
 							<Option
@@ -94,14 +103,17 @@ class InputGroup extends React.PureComponent {
 								className="d-flex"
 							>
 								<div className="d-flex align-items-center">
-									<Image
-										icon={
-											ICONS[`${symbol.toUpperCase()}_ICON`]
-												? ICONS[`${symbol.toUpperCase()}_ICON`]
-												: ICONS['DEFAULT_ICON']
-										}
-										wrapperClassName="input-group__coin-icons"
-									/>
+									<div className="input-group__coin-icons-wrap">
+										<img
+											src={
+												ICONS[`${symbol.toUpperCase()}_ICON`]
+													? ICONS[`${symbol.toUpperCase()}_ICON`]
+													: ICONS['DEFAULT_ICON']
+											}
+											className="input-group__coin-icons"
+											alt={`${symbol.toUpperCase()}_coin`}
+										/>
+									</div>
 									<span className="pl-1">{symbol.toUpperCase()}</span>
 								</div>
 							</Option>
@@ -118,6 +130,7 @@ class InputGroup extends React.PureComponent {
 						step={limits.MIN}
 						min={limits.MIN}
 						max={limits.MAX}
+						autoFocus={autoFocus}
 					/>
 				</Group>
 				<FieldError
diff --git a/web/src/components/QuickTrade/_InputGroup.scss b/web/src/components/QuickTrade/_InputGroup.scss
index bd9743b56c..56bc4340ac 100644
--- a/web/src/components/QuickTrade/_InputGroup.scss
+++ b/web/src/components/QuickTrade/_InputGroup.scss
@@ -1,6 +1,6 @@
 .input-group__container {
 	border-radius: 4px;
-	border: $colors-main-border solid 1px;
+	border: $colors-black solid 1.5px;
 
 	.ant-select-selection,
 	.ant-input,
@@ -8,12 +8,37 @@
 	.ant-select-selector {
 		text-align: right;
 		background-color: $quick-trade-container !important;
+		color: $colors-black !important;
+	}
+	.input-group__coin-icons-wrap {
+		width: 2.5rem;
+	}
+	&:focus-within {
+		border-color: $link !important;
+	}
+
+	.input-group__select:hover {
 		color: $colors-main-black !important;
+
+		.ant-select-selection,
+		.ant-input,
+		.ant-select-arrow,
+		.ant-select-selector {
+			color: $colors-main-black !important;
+		}
+
+		.input-group__coin-icons {
+			width: 2.2rem;
+		}
+	}
+
+	&:hover {
+		border-color: $colors-main-black;
 	}
 }
 
 .input-group__coin-icons {
-	width: 2rem;
+	width: 1.8rem;
 	height: 100%;
 
 	svg {
diff --git a/web/src/components/QuickTrade/_QuickTrade.scss b/web/src/components/QuickTrade/_QuickTrade.scss
index 72d71375c3..69f2d5df0a 100644
--- a/web/src/components/QuickTrade/_QuickTrade.scss
+++ b/web/src/components/QuickTrade/_QuickTrade.scss
@@ -50,6 +50,7 @@ $title-icon--height: 10rem;
 	background-color: $quick-trade-container;
 	margin: 3rem auto;
 	height: fit-content;
+	// border: 1px solid $colors-main-border;
 
 	.review-block-wrapper,
 	.input_block-wrapper,
@@ -256,10 +257,10 @@ $title-icon--height: 10rem;
 }
 
 .layout-mobile {
-	.quick_trade-wrapper {
-		margin-top: 0;
-		margin-bottom: 0;
-	}
+	// .quick_trade-wrapper {
+	// 	margin-top: 0;
+	// 	margin-bottom: 0;
+	// }
 	.quick_trade-section_wrapper {
 		.toogle_button-wrapper {
 			.toogle-content {
diff --git a/web/src/components/QuickTrade/index.js b/web/src/components/QuickTrade/index.js
index c58e4b608f..818761f4f4 100644
--- a/web/src/components/QuickTrade/index.js
+++ b/web/src/components/QuickTrade/index.js
@@ -13,10 +13,11 @@ import Image from 'components/Image';
 import { isMobile } from 'react-device-detect';
 import withConfig from 'components/ConfigProvider/withConfig';
 
-import { Button } from 'components';
+import { Button, EditWrapper } from 'components';
 import STRINGS from 'config/localizedStrings';
 import { FLEX_CENTER_CLASSES } from 'config/constants';
 import InputGroup from './InputGroup';
+import { STATIC_ICONS } from 'config/icons';
 
 class QuickTrade extends Component {
 	render() {
@@ -38,6 +39,7 @@ class QuickTrade extends Component {
 			orderLimits: { SIZE, PRICE },
 			side,
 			icons: ICONS,
+			autoFocus = true,
 		} = this.props;
 
 		return (
@@ -57,7 +59,7 @@ class QuickTrade extends Component {
 							icon={
 								isMobile
 									? ICONS['SIDEBAR_QUICK_TRADING_INACTIVE']
-									: ICONS['QUICK_TRADE_ICON']
+									: STATIC_ICONS['QUICK_TRADE']
 							}
 							wrapperClassName={
 								isMobile ? 'quick_trade-tab-icon' : 'quick_trade-icon'
@@ -74,7 +76,8 @@ class QuickTrade extends Component {
 					</div>
 				</div>
 				<InputGroup
-					name="convert"
+					name={STRINGS['CONVERT']}
+					stringId={'CONVERT'}
 					options={sourceOptions}
 					inputValue={sourceAmount}
 					selectValue={selectedSource}
@@ -82,9 +85,11 @@ class QuickTrade extends Component {
 					onInputChange={onChangeSourceAmount}
 					forwardError={forwardSourceError}
 					limits={side === 'buy' ? PRICE : SIZE}
+					autoFocus={autoFocus}
 				/>
 				<InputGroup
-					name="to"
+					name={STRINGS['TO']}
+					stringId={'TO'}
 					options={targetOptions}
 					inputValue={targetAmount}
 					selectValue={selectedTarget}
@@ -97,10 +102,14 @@ class QuickTrade extends Component {
 					className={classnames(
 						'quick_trade-section_wrapper',
 						'quick_trade-bottom-padded',
-						'my-5'
+						'my-5',
+						'd-flex',
+						'flex-column',
+						'align-items-end'
 						// ...GROUP_CLASSES
 					)}
 				>
+					<EditWrapper stringId={'QUICK_TRADE_COMPONENT.BUTTON'} />
 					<Button
 						label={STRINGS['QUICK_TRADE_COMPONENT.BUTTON']}
 						onClick={onReviewQuickTrade}
diff --git a/web/src/components/Sidebar/SidebarBottom.js b/web/src/components/Sidebar/SidebarBottom.js
index 4c56615ddf..f4f520310d 100644
--- a/web/src/components/Sidebar/SidebarBottom.js
+++ b/web/src/components/Sidebar/SidebarBottom.js
@@ -69,7 +69,7 @@ const SidebarBottom = ({
 			<SidebarButton
 				path="/wallet"
 				title={STRINGS['WALLET_TITLE']}
-				iconPath={ICONS.SIDEBAR_WALLET_ACTIVE}
+				iconPath={ICONS.TAB_WALLET}
 				active={activePath === 'wallet'}
 			/>
 			{/*<SidebarButton
diff --git a/web/src/components/Sidebar/_Sidebar.scss b/web/src/components/Sidebar/_Sidebar.scss
index 5cbf6c7b6a..83efafdb9b 100644
--- a/web/src/components/Sidebar/_Sidebar.scss
+++ b/web/src/components/Sidebar/_Sidebar.scss
@@ -92,18 +92,23 @@ $row--size: calc(#{$row--height} - #{$sidebar-sections-padding});
 		.sidebar-bottom-icon {
 			svg {
 				.post-icon,
-				.wallet-selected-2,
 				.chat-0,
 				.account-svg-1,
 				.quick-trade-tab-active {
 					fill: $base_top-bar-navigation_text_inactive;
 				}
 
+				.tab-wallet0,
 				.trade-active-2,
 				.chat-0,
 				.quick-trade-tab-active {
 					stroke: $base-top-bar-navigation_text_inactive;
 				}
+
+				.tab-wallet0,
+				.quick-trade-tab-active {
+					fill: transparent;
+				}
 			}
 		}
 
@@ -111,13 +116,12 @@ $row--size: calc(#{$row--height} - #{$sidebar-sections-padding});
 			.sidebar-bottom-icon {
 				svg {
 					.post-icon,
-					.wallet-selected-2,
 					.chat-0,
-					.account-svg-1,
-					.quick-trade-tab-active {
+					.account-svg-1 {
 						fill: $base_top-bar-navigation_text;
 					}
 
+					.tab-wallet0,
 					.trade-active-2,
 					.chat-0,
 					.quick-trade-tab-active {
@@ -188,4 +192,9 @@ $row--size: calc(#{$row--height} - #{$sidebar-sections-padding});
 			min-height: 20rem;
 		}
 	}
+	.sidebar-bottom-icon {
+		svg {
+			stroke: none !important;
+		}
+	}
 }
diff --git a/web/src/components/SidebarHub/_SidebarHub.scss b/web/src/components/SidebarHub/_SidebarHub.scss
index 38f991965f..0284a895f4 100644
--- a/web/src/components/SidebarHub/_SidebarHub.scss
+++ b/web/src/components/SidebarHub/_SidebarHub.scss
@@ -95,7 +95,7 @@ $deactive-tab-border: $boder--width solid $border--color;
 	}
 
 	.sidebar_hub-content {
-		margin: $section--bottom-margin $content--margin;
+		// margin: $section--bottom-margin $content--margin;
 		.sidebar_hub-section {
 			border-top: $deactive-tab-border;
 
@@ -158,7 +158,7 @@ $deactive-tab-border: $boder--width solid $border--color;
 
 	.sign_up-btn,
 	.log_in-btn {
-		background: $app-background-color !important;
+		background: $link !important;
 		color: $trade-button--color !important;
 		border: 1px solid $border--color;
 	}
diff --git a/web/src/components/SidebarHub/index.js b/web/src/components/SidebarHub/index.js
index 83e69ccc0f..4e1ee18f22 100644
--- a/web/src/components/SidebarHub/index.js
+++ b/web/src/components/SidebarHub/index.js
@@ -2,23 +2,13 @@ import React, { Component } from 'react';
 import classnames from 'classnames';
 import withConfig from 'components/ConfigProvider/withConfig';
 import STRINGS from '../../config/localizedStrings';
-import { IconTitle, Accordion } from '../../components';
+import { IconTitle } from '../../components';
 
 import { ButtonLink, Wallet } from '../';
 
 class SidebarHub extends Component {
 	render() {
 		const { activePath, isLogged, icons: ICONS } = this.props;
-		const values = [
-			{
-				accordionClassName: 'sidebar_hub-section-content f-1',
-				stringId: 'WALLET_TITLE',
-				title: STRINGS['WALLET_TITLE'],
-				iconId: 'SIDEBAR_WALLET_ACTIVE',
-				icon: ICONS['SIDEBAR_WALLET_ACTIVE'],
-				content: <Wallet />,
-			},
-		];
 		return (
 			<div
 				className={classnames(
@@ -29,7 +19,7 @@ class SidebarHub extends Component {
 				<div className="d-flex sidebar_hub-content d-flex flex-column">
 					{isLogged ? (
 						<div>
-							<Accordion sections={values} />
+							<Wallet />
 						</div>
 					) : (
 						<div>
diff --git a/web/src/components/SmartTarget/index.js b/web/src/components/SmartTarget/index.js
new file mode 100644
index 0000000000..96c84dc580
--- /dev/null
+++ b/web/src/components/SmartTarget/index.js
@@ -0,0 +1,88 @@
+import React, { Component, Fragment } from 'react';
+import { connect } from 'react-redux';
+import { RemoteComponent } from 'RemoteComponent';
+import { injectPlugin } from 'utils/plugin';
+import STRINGS from 'config/localizedStrings';
+import withConfig from 'components/ConfigProvider/withConfig';
+
+class SmartTarget extends Component {
+	componentDidMount() {
+		const { webViews, targets, id } = this.props;
+		if (targets.includes(id)) {
+			const components = [];
+			webViews[id].forEach(({ src, props: propertiesData }) => {
+				const props = {};
+				propertiesData.forEach(({ key, store_key }) => {
+					props[key] = this.props[store_key];
+				});
+
+				const CustomComponent = (props) => (
+					<RemoteComponent url={src} {...props} />
+				);
+
+				components.push(<CustomComponent strings={STRINGS} {...props} />);
+			});
+
+			injectPlugin(components, id);
+		}
+	}
+
+	componentDidUpdate(prevProps) {
+		const { webViews, targets, id } = this.props;
+
+		if (!prevProps.targets.includes(id) && targets.includes(id)) {
+			const components = [];
+			webViews[id].forEach(({ src, props: propertiesData }) => {
+				const props = {};
+				propertiesData.forEach(({ key, store_key }) => {
+					props[key] = this.props[store_key];
+				});
+
+				const CustomComponent = (props) => (
+					<RemoteComponent url={src} {...props} />
+				);
+
+				components.push(<CustomComponent strings={STRINGS} {...props} />);
+			});
+
+			injectPlugin(components, id);
+		}
+	}
+
+	render() {
+		const { targets, id, children } = this.props;
+
+		return targets.includes(id) ? (
+			<div id={id} />
+		) : (
+			<Fragment>{children}</Fragment>
+		);
+	}
+}
+
+const mapStateToProps = (store) => ({
+	targets: store.app.targets,
+	webViews: store.app.webViews,
+	isReady: store.app.isReady,
+	coins: store.app.coins,
+	symbol: store.orderbook.symbol,
+	prices: store.orderbook.prices,
+	balance: store.user.balance,
+	totalAsset: store.asset.totalAsset,
+	oraclePrices: store.asset.oraclePrices,
+	chartData: store.asset.chartData,
+	activeNotification: store.app.activeNotification,
+	activeLanguage: store.app.language,
+	activeTheme: store.app.theme,
+	user: store.user,
+	pair: store.app.pair,
+	unreadMessages: store.app.chatUnreadMessages,
+	constants: store.app.constants,
+	info: store.app.info,
+	enabledPlugins: store.app.enabledPlugins,
+	features: store.app.features,
+	config_level: store.app.config_level,
+	pairsTradesFetched: store.orderbook.pairsTradesFetched,
+});
+
+export default connect(mapStateToProps)(withConfig(SmartTarget));
diff --git a/web/src/components/TabController/_TabController.scss b/web/src/components/TabController/_TabController.scss
index 50c018b144..69a0834b98 100644
--- a/web/src/components/TabController/_TabController.scss
+++ b/web/src/components/TabController/_TabController.scss
@@ -1,6 +1,6 @@
 $tab_controller-title-img-size: 6rem;
 $tab_controller-title-margin: 16px;
-$tab_controller-item-min-width: 10rem;
+$tab_controller-item-min-width: 8rem;
 
 .tab_controller-title {
 	display: flex;
@@ -18,26 +18,27 @@ $tab_controller-item-min-width: 10rem;
 }
 
 .layout-mobile {
-	.tab_controller-tabs {
-		font-size: $extra-thick--font-size;
+	.tab_controller-tabs,
+	.tab_item {
+		font-size: $extra-thick--font-size !important;
 	}
 }
 .tab_controller-tabs {
 	width: 100%;
 	display: flex;
-	justify-content: space-between;
 	align-content: center;
-	border-top: 2px solid $colors-border;
+	border-bottom: 2px solid $colors-border;
 	margin-bottom: 1rem;
 
 	.tab_item {
-		border-top: $tab-selected-line-height solid transparent;
+		border-bottom: $tab-active solid transparent;
 		padding: $tab-text-padding;
 		display: flex;
 		align-items: center;
 		min-width: $tab_controller-item-min-width;
 		justify-content: center;
 		color: $colors-deactivate;
+		font-size: 14px;
 		& svg path {
 			opacity: 0.7;
 		}
@@ -46,7 +47,7 @@ $tab_controller-item-min-width: 10rem;
 		padding: 0 1px 12px !important;
 	}
 	.tab_item-active {
-		border-top: $tab-selected-line-height solid $colors-border;
+		border-bottom: $tab-selected-line-height solid $tab-active;
 		color: $tab-active;
 		& svg path {
 			opacity: 1;
diff --git a/web/src/components/Table/_Table.scss b/web/src/components/Table/_Table.scss
index 68168f2fe4..bd92e1e9fa 100644
--- a/web/src/components/Table/_Table.scss
+++ b/web/src/components/Table/_Table.scss
@@ -25,6 +25,9 @@ $controllers--color-disabled: $colors-deactivate-color2;
 
 	.table_header-wrapper {
 		color: $colors-black;
+		.action_notification-text {
+			white-space: nowrap;
+		}
 	}
 
 	.table_body-wrapper {
diff --git a/web/src/components/Table/index.js b/web/src/components/Table/index.js
index a04f606e00..066c4ecbc0 100644
--- a/web/src/components/Table/index.js
+++ b/web/src/components/Table/index.js
@@ -110,12 +110,13 @@ class Table extends Component {
 			displayPaginator,
 			pageSize,
 			cancelDelayData,
+			className,
 		} = this.props;
 		const { data, page, headers } = this.state;
 
 		return (
 			<div className="table_container">
-				<div className="table-content">
+				<div className={classnames('table-content', className)}>
 					<table className={classnames('table-wrapper')}>
 						<TableHeader headers={headers} />
 						<TableBody
diff --git a/web/src/components/Table/paginator.js b/web/src/components/Table/paginator.js
index aa410ee133..9a9fbe40f2 100644
--- a/web/src/components/Table/paginator.js
+++ b/web/src/components/Table/paginator.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import classnames from 'classnames';
 import { ActionNotification } from '../';
-import ICONS from 'config/icons';
+import withConfig from 'components/ConfigProvider/withConfig';
 import STRINGS from '../../config/localizedStrings';
 
 const renderPageCount = (currentPage, totalPages) => {
@@ -24,6 +24,7 @@ const Paginator = ({
 	currentPage,
 	count,
 	pageSize,
+	icons: ICONS,
 }) => {
 	const totalPages = Math.ceil(count / pageSize);
 	const previousIsDisabled = currentPage <= 1;
@@ -69,4 +70,4 @@ const Paginator = ({
 	);
 };
 
-export default Paginator;
+export default withConfig(Paginator);
diff --git a/web/src/components/Wallet/AssetsBlockForm.js b/web/src/components/Wallet/AssetsBlockForm.js
index 47088e1496..7656c19574 100644
--- a/web/src/components/Wallet/AssetsBlockForm.js
+++ b/web/src/components/Wallet/AssetsBlockForm.js
@@ -9,18 +9,26 @@ class AssetsBlockForm extends React.Component {
 
 		const AssetsBlockFields = {
 			ZeroBalance: {
-				type: 'checkbox',
+				type: 'toggle',
 				label,
 				onChange: handleCheck,
 				name: 'ZeroBalance',
 				reverse: true,
+				isHideToggleText: true,
 			},
 		};
 
 		return renderFields(AssetsBlockFields);
 	}
 }
-
-export default reduxForm({
+const AssetsBlockWrapper = reduxForm({
 	form: 'AssetsBlockForm',
 })(AssetsBlockForm);
+
+AssetsBlockWrapper.defaultProps = {
+	initialValues: {
+		ZeroBalance: false,
+	},
+};
+
+export default AssetsBlockWrapper;
diff --git a/web/src/components/Wallet/_Wallet.scss b/web/src/components/Wallet/_Wallet.scss
index ddc5556da1..72dd284aec 100644
--- a/web/src/components/Wallet/_Wallet.scss
+++ b/web/src/components/Wallet/_Wallet.scss
@@ -19,6 +19,10 @@ $sections-font--color: $colors-deactivate-color2;
 }
 
 .wallet-wrapper {
+	.icon_title-wrapper {
+		flex-direction: row;
+		justify-content: flex-start;
+	}
 	.donut-container {
 		height: 18rem;
 		.donut-label-pair {
@@ -93,6 +97,13 @@ $sections-font--color: $colors-deactivate-color2;
 	}
 }
 
+.wallet-wrapper {
+	.icon-title-wrapper {
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+}
+
 .direction_rtl {
 	.sidebar_section-container
 		.wallet-wrapper
diff --git a/web/src/components/_components.scss b/web/src/components/_components.scss
index 1987836f15..801d1b1e94 100644
--- a/web/src/components/_components.scss
+++ b/web/src/components/_components.scss
@@ -36,3 +36,4 @@
 @import './Carousel/Slider';
 @import './EditWrapper/EditWrapper';
 @import './CheckDeposit/CheckDeposit';
+@import './AppMenuSidebar/AppMenuSidebar';
diff --git a/web/src/components/index.js b/web/src/components/index.js
index c2ef3b25dd..30366aa941 100644
--- a/web/src/components/index.js
+++ b/web/src/components/index.js
@@ -64,3 +64,4 @@ export { default as AdminHocForm } from './AdminForm/hoc';
 export { default as ModalForm } from './AdminForm/modal';
 export { default as AppFooter } from './AppFooter';
 export { default as Image } from './Image';
+export { default as SmartTarget } from './SmartTarget';
diff --git a/web/src/config/constants.js b/web/src/config/constants.js
index e67b5c5526..2f32a35bf5 100644
--- a/web/src/config/constants.js
+++ b/web/src/config/constants.js
@@ -21,6 +21,24 @@ export const WS_URL = config[ENV].WS_URL;
 export const PLUGIN_URL = config[ENV].PLUGIN_URL;
 export const NETWORK_API_URL = config[ENV].NETWORK_API_URL;
 
+export const DEFAULT_LANDING_SECTIONS = {
+	heading: {
+		name: 'Title/heading',
+		is_active: true,
+		order: 0,
+	},
+	market_list: {
+		name: 'Market list',
+		is_active: false,
+		order: 1,
+	},
+	quick_trade: {
+		name: 'Quick trade calculator',
+		is_active: false,
+		order: 2,
+	},
+};
+
 export const SOCIAL_ICONS = {
 	FACEBOOK: '/assets/icons/facebook.png',
 	LINKEDIN: '/assets/icons/linkedin.png',
@@ -28,7 +46,7 @@ export const SOCIAL_ICONS = {
 	INSTAGRAM: '/assets/icons/instagram.svg',
 	TELEGRAM: '/assets/icons/telegram.png',
 	GOOGLE: '/assets/icons/google.png',
-	YOUTUBE: '/assets/icons/youtube.png'
+	YOUTUBE: '/assets/icons/youtube.png',
 };
 
 export const FEATURES_ICONS = {
@@ -37,7 +55,7 @@ export const FEATURES_ICONS = {
 	SECURITY: '/assets/images/features-lock-icons.svg',
 	REPORTING: '/assets/images/features-data-icons.svg',
 	SUPPORT: '/assets/images/features-support-icons.svg',
-	LEGAL: '/assets/images/features-legal-icons.svg'
+	LEGAL: '/assets/images/features-legal-icons.svg',
 };
 
 export const SUMMMARY_ICON = {
@@ -48,7 +66,7 @@ export const SUMMMARY_ICON = {
 	LEVEL_3: '/assets/summary/level-3.png',
 	LEVEL_3_DARK: '/assets/summary/level-3-dark.png',
 	LEVEL_4: '/assets/summary/level-4.png',
-	LEVEL_4_DARK: '/assets/summary/level-4-dark.png'
+	LEVEL_4_DARK: '/assets/summary/level-4-dark.png',
 };
 
 export const HOLLAEX_LOGO =
@@ -102,6 +120,7 @@ export const DEFAULT_LANGUAGE = process.env.REACT_APP_DEFAULT_LANGUAGE || 'en';
 
 export const TEMP_KEY_LANGUAGE_RTL = 'temp_key_language_rtl';
 export const TEMP_KEY_LANGUAGE_LTR = 'temp_key_language_ltr';
+export const LAST_UPDATED_NOTIFICATION_KEY = 'LAST_UPDATED_NOTIFICATION_TIME';
 
 export const BANK_WITHDRAWAL_BASE_FEE =
 	process.env.REACT_APP_BANK_WITHDRAWAL_BASE_FEE || 1;
@@ -113,10 +132,6 @@ export const BANK_WITHDRAWAL_MAX_AMOUNT_FOR_BASE_FEE =
 	process.env.REACT_APP_BANK_WITHDRAWAL_MAX_AMOUNT_FOR_BASE_FEE || 0;
 export const takerFee = 0;
 
-export const BANK_PAYMENT_LINK = '';
-export const MIN_VERIFICATION_LEVEL_TO_WITHDRAW = 2;
-export const MAX_VERIFICATION_LEVEL_TO_WITHDRAW = 5;
-
 export const EXPLORERS_ENDPOINT = (currency) => {
 	let endpoint = '';
 	switch (currency) {
@@ -201,7 +216,6 @@ export const TIME_ZONE = process.env.REACT_APP_TIMEZONE || 'GMT';
 export const TOKEN_EMAIL = 'token::email';
 export const TOKEN_MAX_AGE = 23 * 60 * 60;
 
-export const DISPLAY_LANDING = false;
 export const DEFAULT_URL = '/';
 
 // minimum level for a user to be able to create api tokens
diff --git a/web/src/config/icons/coins.js b/web/src/config/icons/coins.js
deleted file mode 100644
index 884d4fb321..0000000000
--- a/web/src/config/icons/coins.js
+++ /dev/null
@@ -1,21 +0,0 @@
-const coinIcons = {
-	BTC_ICON: '/assets/icons/btc-icon-01.svg',
-	ETH_ICON: '/assets/icons/eth-icon-01.svg',
-	EUR_ICON: '/assets/icons/eur-icon.svg',
-	LTC_ICON: '/assets/icons/ltc-icon.svg',
-	TRX_ICON: '/assets/icons/trx-icon.svg',
-	TUSD_ICON: '/assets/icons/tusd-icon.svg',
-	XLM_ICON: '/assets/icons/xlm-icon.svg',
-	EOS_ICON: '/assets/icons/eos-icon.svg',
-	DAI_ICON: '/assets/icons/dai-icon.svg',
-	BNB_ICON: '/assets/icons/bnb-icon.svg',
-	ADA_ICON: '/assets/icons/ada-icon.svg',
-	BCH_ICON: '/assets/icons/bch-icon.svg',
-	XRP_ICON: '/assets/icons/xrp-icon-01.svg',
-	KRW_ICON: '/assets/icons/krw-icon-01.svg',
-	XHT_ICON: '/assets/icons/xht-icon.svg',
-	XMR_ICON: '/assets/icons/xmr-icon.svg',
-	USDT_ICON: '/assets/icons/usdt-icon.svg',
-};
-
-export default coinIcons;
diff --git a/web/src/config/icons/dark.js b/web/src/config/icons/dark.js
index 29491443ba..a1eb71e57c 100644
--- a/web/src/config/icons/dark.js
+++ b/web/src/config/icons/dark.js
@@ -1,5 +1,4 @@
 import flatten from 'flat';
-import coinIcons from './coins';
 
 const options = { safe: true, delimiter: '_' };
 const nestedIcons = {
@@ -8,6 +7,7 @@ const nestedIcons = {
 		FAV_ICON: '/favicon.ico',
 		LOADER: '/assets/loader-dark.gif',
 		BOARDING_IMAGE: '/assets/dark-background.jpg',
+		LANDING_PAGE: '/assets/images/hollaex-background.png',
 	},
 
 	TRADE: {
@@ -140,6 +140,7 @@ const nestedIcons = {
 	RED_ARROW: '/assets/acounts/account-icons-16.svg',
 	BLUE_CLIP: '/assets/acounts/account-icons-17.svg',
 	BLACK_CHECK: '/assets/acounts/account-icons-19.svg',
+	UNDEFINED_ERROR: '/assets/acounts/unknown-error-icon-01.svg',
 
 	OTP_KEYS: '/assets/acounts/account-icons-29.svg',
 	GREEN_CHECK: '/assets/acounts/account-icons-23.svg',
@@ -245,8 +246,6 @@ const nestedIcons = {
 	BONUS_OFFERING: '/assets/icons/bonus_offering.svg',
 
 	CANCEL_ORDERS: '/assets/images/cancel-all-orders.svg',
-
-	...coinIcons,
 };
 
 const icons = flatten(nestedIcons, options);
diff --git a/web/src/config/icons/light.js b/web/src/config/icons/light.js
index c5c5bef6e1..cd61ad7e52 100644
--- a/web/src/config/icons/light.js
+++ b/web/src/config/icons/light.js
@@ -1,5 +1,4 @@
 import flatten from 'flat';
-import coinIcons from './coins';
 
 const options = { safe: true, delimiter: '_' };
 const nestedIcons = {
@@ -7,6 +6,7 @@ const nestedIcons = {
 		FAV_ICON: '/favicon.ico',
 		LOADER: '/assets/loader-dark.gif',
 		BOARDING_IMAGE: '/assets/background.png',
+		LANDING_PAGE: '/assets/images/hollaex-background.png',
 	},
 
 	TRADE: {
@@ -83,19 +83,6 @@ const nestedIcons = {
 		API_ICON: '/assets/images/api-security-icon.svg',
 	},
 
-	LEVEL_ACCOUNT: {
-		ICON_1: '/assets/images/level-1.svg',
-		ICON_2: '/assets/images/level-2.svg',
-		ICON_3: '/assets/images/level-3.svg',
-		ICON_4: '/assets/images/level-4.svg',
-		ICON_5: '/assets/images/level-5.svg',
-		ICON_6: '/assets/images/level-6.svg',
-		ICON_7: '/assets/images/level-7.svg',
-		ICON_8: '/assets/images/level-8.svg',
-		ICON_9: '/assets/images/level-9.svg',
-		ICON_10: '/assets/images/level-10.svg',
-	},
-
 	FEATURES: {
 		PRO_TRADING: '/assets/images/features-pro-trade-icons.svg',
 		PAYMENT: '/assets/images/features-payment-card-icons.svg',
@@ -248,8 +235,6 @@ const nestedIcons = {
 	BONUS_OFFERING: '/assets/icons/bonus_offering.svg',
 
 	CANCEL_ORDERS: '/assets/images/cancel-all-orders.svg',
-
-	...coinIcons,
 };
 
 const icons = flatten(nestedIcons, options);
diff --git a/web/src/config/icons/static.js b/web/src/config/icons/static.js
index 2d03c4f3c3..eadce65e5a 100644
--- a/web/src/config/icons/static.js
+++ b/web/src/config/icons/static.js
@@ -57,6 +57,8 @@ const icons = {
 	EDIT_STRING: '/assets/icons/edit-string.svg',
 	OPERATOR_EDIT_ICON: '/assets/icons/upload-graphic-edit.svg',
 	EDIT_ICON: '/assets/images/edit-icon.svg',
+	EDIT_SECTION: '/assets/images/gear-homepage-edit-sections-01.svg',
+	EDIT_BACKGROUND: '/assets/images/upload-01.svg',
 	SEARCH: '/assets/images/search.svg',
 	BLACK_CHECK: '/assets/acounts/account-icons-19.svg',
 	RED_WARNING: '/assets/acounts/account-icons-09.svg',
@@ -69,9 +71,11 @@ const icons = {
 	CANCEL_CROSS_ACTIVE: '/assets/images/cancel-cross-active.svg',
 	VERIFICATION_ICON: '/assets/images/verification-green-tick.svg',
 	CHAT_FEATURE_ICON: '/assets/images/chat-feature-icon.svg',
+	HOME_PAGE_FEATURE_ICON: '/assets/images/home-page.svg',
 	USER_EMAIL: '/assets/images/user-email.svg',
 	USER_EMAIL_VERIFIED: '/assets/images/user-email-verified.svg',
 	USER_EMAIL_UNVERIFIED: '/assets/images/user-email-unverified.svg',
+	SPINNER: '/assets/images/spinner.gif',
 
 	// Notification Icons
 	VERIFICATION_PENDING: '/assets/images/verification-pending-orange.svg',
@@ -80,6 +84,8 @@ const icons = {
 	VERIFICATION_INCOMPLETE: '/assets/images/verification-attention-red.svg',
 	VERIFICATION_VERIFIED: '/assets/images/verification-green-tick.svg',
 	CLOUD_ICON: '/assets/images/current-plan-cloud-icon.svg',
+	QUICK_TRADE: '/assets/images/quick-trade-01.svg',
+	PAPER_CLIP: '/assets/acounts/paperclip-attach-01.svg',
 };
 
 export default icons;
diff --git a/web/src/config/lang/ar.js b/web/src/config/lang/ar.js
index 86c73e22ee..a1917678f4 100644
--- a/web/src/config/lang/ar.js
+++ b/web/src/config/lang/ar.js
@@ -5,225 +5,226 @@ import flatten from 'flat';
 // OPEN PR for translations on language branch
 const options = { safe: true };
 const nestedContent = {
-	APP_TITLE: 'HollaEx',
-	APP_SUB_TITLE: 'اکسچنج دارایی های دیجیتال متن باز', // slogan
+	APP_TITLE: 'هولا إكس',
+	APP_SUB_TITLE: 'بورصة العملات الرقمية المفتوحة', // slogan
 
-	LOGOUT_CONFIRM_TEXT: 'آیا برای خارج شدن مطمئن هستید؟',
-	ADD_TRADING_PAIR: 'اضافه کردن دارایی جدید',
-	ACTIVE_TRADES: 'شما باید {0} برای دسترسی به سفارشات فعال خود داشته باشید',
-	CANCEL_BASE_WITHDRAWAL: 'برداشت {0}لغو کنید',
-	CANCEL_WITHDRAWAL: 'لغو برداشت',
+	LOGOUT_CONFIRM_TEXT: 'هل انت متأكد؟هل تريد تسجيل الخروج؟',
+	ADD_TRADING_PAIR: 'حدد السوق',
+	ACTIVE_TRADES: 'يجب عليك أن {0} للوصول الي تداولاتك المفتوحة',
+	CANCEL_BASE_WITHDRAWAL: 'إلغاء {0}السحب',
+	CANCEL_WITHDRAWAL: 'إلغاء السحب',
 	CANCEL_WITHDRAWAL_POPUP_CONFIRM:
-		'آیا از لغو برداشت در حال انتظار خود مطمئن هستید؟',
+		'هل تريد إلغاء السحب الذي في قيد الانتظار لـ',
 	CANT_BE_CANCELLED: '-',
 	ALREADY_CANCELLED: '-',
 	TIMESTAMP_FORMAT: 'YYYY/MM/DD HH:mm:ss',
 	HOUR_FORMAT: 'HH:mm:ss',
-	LOGIN_TEXT: 'ورود',
-	SIGN_IN: 'ورود',
-	SIGNUP_TEXT: 'ثبت نام',
-	REGISTER_TEXT: 'ثبت نام',
-	ACCOUNT_TEXT: 'حساب کاربری',
-	HOME_TEXT: 'صفحه اصلی',
-	CLOSE_TEXT: 'بستن',
-	COPY_TEXT: 'کپی',
-	COPY_SUCCESS_TEXT: 'با موفقیت کپی شد',
-	CANCEL_SUCCESS_TEXT: 'با موفقیت لغو شد',
-	UPLOAD_TEXT: 'بارگزاری',
-	ADD_FILES: 'اضافه کردن فایل', // ToDo
-	OR_TEXT: 'یا',
-	CONTACT_US_TEXT: 'تماس با ما',
-	HELPFUL_RESOURCES_TEXT: 'منابع مفید',
+	LOGIN_TEXT: 'تسجیل الدخول',
+	SIGN_IN: 'تسجیل الدخول',
+	SIGNUP_TEXT: 'سجّل',
+	REGISTER_TEXT: 'إنشاء حساب',
+	ACCOUNT_TEXT: 'الحساب',
+	HOME_TEXT: 'الصفحة الرئيسية',
+	CLOSE_TEXT: 'إغلاق',
+	COPY_TEXT: 'نسخ',
+	COPY_SUCCESS_TEXT: 'تم النسخ بنجاح',
+	CANCEL_SUCCESS_TEXT: 'تم الإلغاء بنجاح',
+	UPLOAD_TEXT: 'تحميل',
+	ADD_FILES: 'أضف ملفات', // ToDo
+	OR_TEXT: 'أو',
+	CONTACT_US_TEXT: 'إتصل معنا',
+	HELPFUL_RESOURCES_TEXT: 'مصادر مفيدة',
 	HELP_RESOURCE_GUIDE_TEXT:
-		'درصورت وجود هر گونه سوال و ابهامی آن را با ارسال ایمیل به support@hollaex.com با ما درمیان بگذارید.',
-	HELP_TELEGRAM_TEXT: 'مستندات API های HollaEx را مطالعه نمایید.',
+		'لا تتردد في الاتصال معنا لمزيد من المعلومات و في مواجهة أي مشاكل عن طريق إرسال رسالة الكترونية لنا.',
+	HELP_TELEGRAM_TEXT: 'تحقق من وثائق API المفتوحة:',
 	HELP_TELEGRAM_LINK: 'https://apidocs.hollaex.com',
-	NEED_HELP_TEXT: 'پرسشی دارید؟', // new
-	HELP_TEXT: 'راهنما',
-	SUCCESS_TEXT: 'موفق',
-	ERROR_TEXT: 'خطا',
-	PROCEED: 'انجام شد',
-	EDIT_TEXT: 'ویرایش',
-	BACK_TEXT: 'بازگشت',
-	NO_OPTIONS: 'گزینه ای وجود ندارد',
-	SECONDS: 'ثانیه ها',
-	VIEW_MARKET: 'مشاهده بازار', // new
-	GO_TRADE: 'معامله رو شروع کن', // new
-	VIEW_INFO: 'مشاهده صفحه اطلاعات', // new
-	APPLY_HERE: 'اعمال تغییرات', // new
+	NEED_HELP_TEXT: 'تحتاج لمساعدة؟', // new
+	HELP_TEXT: 'مساعدة',
+	SUCCESS_TEXT: 'نجاح',
+	ERROR_TEXT: 'خطأ',
+	PROCEED: 'تقدم',
+	EDIT_TEXT: 'تعديل',
+	BACK_TEXT: 'عودة',
+	NO_OPTIONS: 'لا يوجد خيارات متاحة',
+	SECONDS: 'ثواني',
+	VIEW_MARKET: 'مشاهدة السوق', // new
+	GO_TRADE: 'قم بالتداول', // new
+	VIEW_INFO: 'مشاهدة صفحة المعلومات', // new
+	APPLY_HERE: 'قدم هنا', // new
 	HOME: {
-		SECTION_1_TITLE: 'به HollaEx kit خوش آمدید',
+		SECTION_1_TITLE: 'أهلا بكم في مجموعة أدوات بورصة هولاإكس',
 		SECTION_1_TEXT_1:
-			'با خیالی آسوده اکسچنج تبادل دارایی های دیجیتال خود را بسازید و جزو آینده بازارهای مالی جهان شوید.',
+			'إنشأ بورصة العملات الرقمية قابلة للتطويرالخاصة بك عن طريق مجموعة أدوات هولاإكس و كن جزء في مستقبل التمويل.',
 		SECTION_1_TEXT_2:
-			'هدف ما تسهیل دسترسی افراد به بازارهای مالی از طریق به خدمت گرفتن فن آوری های نوین می باشد.',
-		SECTION_1_BUTTON_1: 'بیشتر بدانید',
-		SECTION_3_TITLE: 'امکانات',
-		SECTION_3_CARD_1_TITLE: 'موتور تطبیق مقایس پذیر',
+			'نحن نسعي لجلب التكنولوجيا المالية إلي الأمام عن طريق التمكن السهل والميسور لتكنولوجيا التداول.',
+		SECTION_1_BUTTON_1: 'إكتشف أكثر',
+		SECTION_3_TITLE: 'الميزات',
+		SECTION_3_CARD_1_TITLE: 'محرك متجانس قابل للتطویر',
 		SECTION_3_CARD_1_TEXT:
-			'موتور تطبیق سفارشات قوی و هوشمند با بهره گیری از بهینه ترین الگوریتم های روز دنیا',
-		SECTION_3_CARD_2_TITLE: 'اتصال به بانک',
+			'محرك متجانس مع أداء عالي و قابل للتطوير عن طريق استخدام الخوارزميات اللتي لديها اكثر كفاءة.',
+		SECTION_3_CARD_2_TITLE: 'دمج البنك',
 		SECTION_3_CARD_2_TEXT:
-			'برای اتصال به بانک ، پلاگین های ویژه با قابلیت سفارشی سازی بالا به شما کمک مینماید تا اکسچنج بومی خود را بسازید',
-		SECTION_3_CARD_3_TITLE: 'امنیت بالا',
+			'يوجد وصلات مع وحدات قابلة للتخصيص لدمج البنوك. نحن نعلم أن التمويل التقليدي و نقدر أن نساعدكم في صنع بورصتكم المحلية.',
+		SECTION_3_CARD_3_TITLE: 'أمان عالي',
 		SECTION_3_CARD_3_TEXT:
-			'HollaEx kit همواره از بهترین روشهای تست امنیت به منظور تامین امنیت دارایی کاربران استفاده می نماید',
-		SECTION_3_CARD_4_TITLE: 'گزارشات پیشرفته',
+			'تستخدم هولاإكس افضل الممارسات الأمنية واكثر الخوارزميات ثقةً و أماناً لإبقاء الأموال في أمان. إنها أولويتنا القصوي و اتخذنا إعتناء خاص به.',
+		SECTION_3_CARD_4_TITLE: 'تبلیغ متقدم',
 		SECTION_3_CARD_4_TEXT:
-			'پنل مدیریتی قوی به منظور ارسال ایمیل ها و گزارشات دقیق از وضعیت سیستم به مدیریت و تیم پشتیبانی ',
-		SECTION_3_CARD_5_TITLE: 'پشتیبانی',
+			'لوحة تحكم تحتوي على بريد إلكتروني قابلة للتخصيص وتقارير لإعلام الدعم والمسؤول عن حالة النظام والمعاملات ',
+		SECTION_3_CARD_5_TITLE: 'الدعم',
 		SECTION_3_CARD_5_TEXT:
-			'ما بطور ویژه توسط تیم پشتیبانی متخصص به درخواست های شما پاسخ می دهیم',
-		SECTION_3_CARD_6_TITLE: 'اتصال به سیستم احراز هویت',
+			'يمكننا أن نعتني باحتياجاتك ولدينا متخصص عبر الإنترنت لمساعدتك في مشاكلك وإستفساراتك',
+		SECTION_3_CARD_6_TITLE: 'تکامل  إعرف عميلك',
 		SECTION_3_CARD_6_TEXT:
-			'سرویس احراز هویت براحتی و سهولت هر چه تمام و متناسب با کشورهای مختلف پیاده سازی می گردد',
-		SECTION_3_BUTTON_1: 'مشاهده دمو',
+			'وحدات مرنة وقابلة للتكامل لتطبيق طرق إعرف عميلك والتحقق من المستخدم في ولايات قضائية مختلفة.',
+		SECTION_3_BUTTON_1: 'مشاهدة ملف Demo',
 	},
 	FOOTER: {
-		FOOTER_LEGAL: ['با افتخار توسعه داده شده در سئول ، کره جنوبی'],
-		FOOTER_LANGUAGE_TEXT: 'زبان',
+		FOOTER_LEGAL: ['صنع بفخر في سيول ، كوريا الجنوبية ،شركة بيت هولا'],
+		FOOTER_LANGUAGE_TEXT: 'اللغة',
 		SECTIONS: {
-			SECTION_1_TITLE: 'درباره',
-			SECTION_1_LINK_1: 'درباره ما',
-			SECTION_1_LINK_2: 'شرایط استفاده',
-			SECTION_1_LINK_3: 'حریم خصوصی',
-			SECTION_1_LINK_4: 'تماس با ما',
-			SECTION_2_TITLE: 'اطلاعات',
-			SECTION_2_LINK_1: 'بلاگ',
-			SECTION_2_LINK_2: 'تماس با ما',
-			SECTION_2_LINK_3: 'شغل',
-			SECTION_3_TITLE: 'توسعه دهندگان',
-			SECTION_3_LINK_1: 'مستندات',
-			SECTION_3_LINK_2: 'انجمن',
+			SECTION_1_TITLE: 'حول',
+			SECTION_1_LINK_1: 'حولنا',
+			SECTION_1_LINK_2: 'تعليمات الاستخدام',
+			SECTION_1_LINK_3: 'سياسة الخصوصية',
+			SECTION_1_LINK_4: 'إتصل بنا',
+			SECTION_2_TITLE: 'معلومات',
+			SECTION_2_LINK_1: 'مدونة',
+			SECTION_2_LINK_2: 'إتصل بنا',
+			SECTION_2_LINK_3: 'مهنة',
+			SECTION_3_TITLE: 'المطورون',
+			SECTION_3_LINK_1: 'توثيق',
+			SECTION_3_LINK_2: 'المنتدى',
 			SECTION_3_LINK_3: 'GitHub',
-			SECTION_3_LINK_4: 'کتابخانه',
-			SECTION_3_LINK_5: 'مستندات API',
-			SECTION_3_LINK_6: 'API معاملات',
-			SECTION_3_LINK_7: 'ابزارهای برنامه نویسی',
-			SECTION_3_LINK_8: 'مستندات',
-			SECTION_4_TITLE: 'اکسچنج',
-			SECTION_4_LINK_1: 'ورود',
-			SECTION_4_LINK_2: 'ثبت نام',
-			SECTION_4_LINK_3: 'تماس با ما',
-			SECTION_4_LINK_4: 'شرایط استفاده',
-			SECTION_5_TITLE: 'منابع',
-			SECTION_5_LINK_1: 'Whitepaper',
-			SECTION_5_LINK_2: 'HollaEx Token (XHT) ',
+			SECTION_3_LINK_4: 'مکتبه',
+			SECTION_3_LINK_5: 'وثيقة API',
+			SECTION_3_LINK_6: 'واجهة برمجة تطبيقات التداول',
+			SECTION_3_LINK_7: 'ادوات المطورين',
+			SECTION_3_LINK_8: 'توثيق',
+			SECTION_4_TITLE: 'بورصة',
+			SECTION_4_LINK_1: 'تسجيل الدخول',
+			SECTION_4_LINK_2: 'تسجيل',
+			SECTION_4_LINK_3: 'اتصل بنا',
+			SECTION_4_LINK_4: 'تعليمات الاستخدام',
+			SECTION_5_TITLE: 'مصادر',
+			SECTION_5_LINK_1: 'وايت بيبر',
+			SECTION_5_LINK_2: 'عملة هولاإكس',
 			SECTION_5_LINK_3: 'GitHub',
-			SECTION_5_LINK_4: 'سوالات متداول', // new
-			SECTION_6_TITLE: 'شبکه های اجتماعی',
+			SECTION_5_LINK_4: 'مكتب المساعدة', // new
+			SECTION_6_TITLE: 'الشبكة الاجتماعية',
 			SECTION_6_LINK_1: 'توییتر',
 			SECTION_6_LINK_2: 'تلگرام',
 		},
 		XHT_DESCRIPTION:
-			'HollaEx kit یک پلتفورم متن باز به منظور مبادله دارایی های دیجیتال بین کاربران می باشد که توسط شرکت bitHolla توسعه و ارایه می شود.',
-		CLICK_HERE: 'اینجا را کلیک کنید',
-		VISIT_HERE: 'اینجا را مشاهده کنید',
+			'مجموعة أدواتHollaEx  عبارة عن منصة تداول مفتوحة المصدر أنشأتها شركة bitHolla Inc. ويمكنك إنشاء وإدراج أي أصول رقمية ومستخدمين على متنها للتداول في البورصة باستخدام مجموعة أدوات التبادل هذه. من أجل تشغيل واحدة بنفسك.',
+		CLICK_HERE: 'انقر هنا',
+		VISIT_HERE: 'زوروا هنا',
 	},
 	ACCOUNTS: {
-		TITLE: 'حساب کاربری',
-		TAB_VERIFICATION: 'تایید حساب کاربری',
-		TAB_SECURITY: 'امنیت',
-		TAB_NOTIFICATIONS: 'اعلانات',
-		TAB_SETTINGS: 'تنظیمات',
-		TAB_PROFILE: 'پروفایل',
-		TAB_WALLET: 'کیف پول',
-		TAB_SUMMARY: 'خلاصه',
-		TAB_API: 'API',
+		TITLE: 'الحساب',
+		TAB_VERIFICATION: 'التحقق',
+		TAB_SECURITY: 'الأمان',
+		TAB_NOTIFICATIONS: 'إشعارات',
+		TAB_SETTINGS: 'إعدادات',
+		TAB_PROFILE: 'الملف الشخصي',
+		TAB_WALLET: 'محفظة النقود',
+		TAB_SUMMARY: 'ملخص',
+		TAB_HISTORY: 'التاریخ',
+		TAB_API: 'واجهة برمجة التطبيقات',
 		TAB_SIGNOUT: 'خروج',
 	},
 	REQUEST_XHT_ACCESS: {
 		// new
-		REQUEST_TITLE: 'درخواست دسترسی',
-		REQUEST_INVITE: 'درخواست دعوت',
-		CATEGORY_PLACEHOLDER: 'به هریک از بخش های زیر پاسخ های متناسب بدهید',
-		INTRODUCTION_LABEL: 'خودتان رو معرفی کنید',
-		INTRODUCTION_PLACEHOLDER:
-			'ساکن کدام کشور هستید ؟ و آیا علاقه به راه اندازی اکسچنج دارید؟',
+		REQUEST_TITLE: 'طلب الدخول',
+		REQUEST_INVITE: 'طلب دعوة',
+		CATEGORY_PLACEHOLDER: 'حدد الفئة التي تناسب مشكلتك',
+		INTRODUCTION_LABEL: 'عرف نفسك',
+		INTRODUCTION_PLACEHOLDER: 'أين تقيم ، هل أنت مهتم بإجراء بورصة؟',
 	},
 	CONTACT_FORM: {
-		CATEGORY_LABEL: 'بخش',
-		CATEGORY_PLACEHOLDER:
-			'هریک از بخش های زیر که با درخواست شما متناسب است را انتخاب کنید',
+		CATEGORY_LABEL: 'الفئة',
+		CATEGORY_PLACEHOLDER: 'حدد الفئة التي تناسب مشكلتك',
 		CATEGORY_OPTIONS: {
-			OPTION_VERIFY: 'تایید کاربر',
-			OPTION_LEVEL: 'ارتقای سطح کاربری',
-			OPTION_DEPOSIT: 'واریز و برداشت',
-			OPTION_BUG: 'گزارش خطا', // ToDo:
-			OPTION_PERSONAL_INFO: 'تغییر اطلاعات شخصی', // ToDo:
-			OPTION_BANK_TRANSFER: 'تراکنش بانکی', // new
-			OPTION_REQUEST: 'درخواست دعوت به اکسچنج HollaEx', // new
+			OPTION_VERIFY: 'التحقق من المستخدم',
+			OPTION_LEVEL: 'زيادة مستوى المستخدم',
+			OPTION_DEPOSIT: 'الإيداع والسحب',
+			OPTION_BUG: 'تقرير خلل برمجي', // ToDo:
+			OPTION_PERSONAL_INFO: 'تغيير المعلومات الشخصية', // ToDo:
+			OPTION_BANK_TRANSFER: 'تحويل بنكي', // new
+			OPTION_REQUEST: 'طلب دعوة لبورصة HollaEx', // new
 		},
 		SUBJECT_LABEL: 'موضوع',
-		SUBJECT_PLACEHOLDER: 'موضوع مشکل خود را تایپ کنید',
-		DESCRIPTION_LABEL: 'توضیحات',
-		DESCRIPTION_PLACEHOLDER: 'مشکل خود را با شرح جزییات بیان نمایید',
-		ATTACHMENT_LABEL: 'حداکثر تا 3 قایل می تواند پیوست کنید', // ToDo:
+		SUBJECT_PLACEHOLDER: 'اكتب موضوع مشكلتك',
+		DESCRIPTION_LABEL: 'وصف',
+		DESCRIPTION_PLACEHOLDER: 'اكتب بالتفصيل ما هي المشكلة',
+		ATTACHMENT_LABEL: 'أضف مرفقات (3 كحد أقصى)', // ToDo:
 		ATTACHMENT_PLACEHOLDER:
-			'برای شرح بهتر مشکل خود می توانید فایل هایی با فرمت PDF,JPG,PNG,GIF پیوست نمایید',
-		SUCCESS_MESSAGE: 'ایمیل به تیم پشتیبانی ارسال شد',
-		SUCCESS_TITLE: 'پیام ارسال شد',
-		SUCCESS_MESSAGE_1: 'مشکل شما به تیم پشتیبانی کاربران ارسال گردید',
-		SUCCESS_MESSAGE_2: 'حداکثر تا 3 روز آینده منتظر پاسخ ما باشید',
+			'أضف ملفًا للمساعدة في إبلاغ مشكلتك. يتم قبول ملفات PDF و JPG و PNG و GIF',
+		SUCCESS_MESSAGE: 'تم إرسال البريد الإلكتروني لموظفينا في قسم الدعم.',
+		SUCCESS_TITLE: 'تم ارسال الرسالة',
+		SUCCESS_MESSAGE_1: 'تم إرسال مشكلتك إلى قسم دعم العملاء',
+		SUCCESS_MESSAGE_2: 'سوف يتم الرد خلال 1-3 أيام.',
 	},
 	DEPOSIT: {
 		CRYPTO_LABELS: {
-			ADDRESS: '{0}آدرس دریافت شما', // new
-			DESTINATION_TAG: 'برچسب مقصد {0 شما}', // new
-			BTC: 'آدرس شما برای دریافت بیتکوین',
-			ETH: 'آدرس شما برای دریافت اتریوم',
-			BCH: 'آدرس شما برای دریافت بیتکوین کش',
+			ADDRESS: 'عنوان الاستلام {0} الخاص بك', // new
+			DESTINATION_TAG: 'ملصق الوجهة {0} الخاصة بك', // new
+			MEMO: 'مذكرتك {0}', // new, Perisna should be added in Persian lang
+			BTC: 'عنوان استلام Bitcoin الخاص بك',
+			ETH: 'عنوان استلام Ethereum الخاص بك',
+			BCH: 'عنوان استلام  Bitcoin Cash الخاص بك',
 		},
-		INCREASE_LIMIT: 'میخواهید سقف برداشت روزانه خود را افزایش دهید',
+		INCREASE_LIMIT: 'هل تريد زيادة الحد اليومي الخاص بك؟',
 		QR_CODE:
-			'کافیست برای ارسال پول توسط دیگران،این کد توسط شخص پرداخت کننده اسکن شود',
-		NO_DATA: 'اطلاعاتی موجود نمی باشد',
-		FULL_MESSAGE_LIMIT: '{0}: {1} {2} {3}', //  0 -> {Daily deposit max amount}:  1 -> {1,000} 2 -> {Currency} 3 -> {(Want to increase your daily limit?)}
+			'يمكن فحص رمز الاستجابة السريعة(QR Code)  هذا بواسطة الشخص الذي يريد إرسال الأموال إليك',
+		NO_DATA: 'لا توجد معلومات متاحة',
+		FULL_MESSAGE_LIMIT: '{0}: {1} {2} {3}', //  0 -> {الحد الأقصى للإيداع اليومي}:  1 -> {1,000} 2 -> {Currency} 3 -> {(تريد زيادة الحد اليومي الخاص بك؟)}
 	},
 	LOGIN: {
-		LOGIN_TO: 'ورود به {0}',
-		CANT_LOGIN: 'نمی توانید وارد شوید؟',
-		NO_ACCOUNT: 'هنوز حساب کاربری ایجاد نکرده اید؟',
-		CREATE_ACCOUNT: 'همین الان یک حساب کاربری بسازید',
-		HELP: 'راهنما',
+		LOGIN_TO: 'تسجيل الدخول إلى {0}',
+		CANT_LOGIN: 'لا تستطيع تسجيل الدخول؟',
+		NO_ACCOUNT: 'ليس لديك حساب؟',
+		CREATE_ACCOUNT: 'قم بإنشاء واحد هنا',
+		HELP: 'مساعدة',
 	},
 	FORM_FIELDS: {
-		EMAIL_LABEL: 'ایمیل',
-		EMAIL_PLACEHOLDER: 'ایمیل خود را وارد کنید',
-		PASSWORD_LABEL: 'کلمه عبور',
-		PASSWORD_PLACEHOLDER: 'کلمه عبور خود را وارد کنید',
-		PASSWORD_REPEAT_LABEL: 'مجددا کلمه عبور خود را وارد کنید',
-		PASSWORD_REPEAT_PLACEHOLDER: 'مجددا کلمه عبور خود را وارد کنید',
+		EMAIL_LABEL: 'البريد الإلكتروني',
+		EMAIL_PLACEHOLDER: 'اكتب البريد الالكتروني الخاص بك',
+		PASSWORD_LABEL: 'كلمه السر',
+		PASSWORD_PLACEHOLDER: 'اكتب كلمة المرور الخاصة بك',
+		PASSWORD_REPEAT_LABEL: 'أعد كتابة كلمة المرور الخاصة بك',
+		PASSWORD_REPEAT_PLACEHOLDER: 'أعد كتابة كلمة المرور الخاصة بك',
 	},
 	VALIDATIONS: {
-		OTP_LOGIN: 'رمزیکبارمصرف خود را وارد نمایید',
-		CAPTCHA: 'Expired Session. Please refresh the page',
-		FROZEN_ACCOUNT: 'این حساب بسته شده است',
-		INVALID_EMAIL: 'آدرس ایمیل نامعتبر است',
-		TYPE_EMAIL: 'ایمیل خود را وارد کنید',
-		REQUIRED: 'فیلد ضروری',
-		INVALID_DATE: 'تاریخ اشتباه',
+		OTP_LOGIN: 'أدخل رمز السري المتغير لتسجيل الدخول',
+		CAPTCHA: 'فترة منتهية. يرجى تحديث الصفحة',
+		FROZEN_ACCOUNT: 'تم تجميد هذا الحساب',
+		INVALID_EMAIL: 'عنوان البريد الإلكتروني غير صالح',
+		TYPE_EMAIL: 'اكتب بريدك الإلكتروني',
+		REQUIRED: 'یرجي إدخال ألبريد ألإلكتروني الخاص بك',
+		INVALID_DATE: 'تاريخ غير صالح',
 		INVALID_PASSWORD:
-			'کلمه عبور معتبر نمی باشد.کلمه عبور باید حداقل 8 کاراکتر و شامل اعداد و کاراکترهای خاص باشد',
+			'رمز مرور خاطئ. يجب أن يحتوي على 8 أحرف على الأقل ، و رقم واحد في كلمة المرور ، و حرف خاص.',
 		INVALID_PASSWORD_2:
-			'کلمه عبور معتبر نمی باشد.کلمه عبور باید حداقل 8 کاراکتر و شامل اعداد و کاراکترهای خاص باشد',
-		INVALID_CURRENCY: 'آدرس{1} نامعتبر{0}',
-		INVALID_BALANCE:
-			'موجودی کافی({0})برای انجام عملیات مورد نظر را ندارید({1})',
-		MIN_VALUE: 'مقدار باید{0 و یا بزرگتر باشد}',
-		MAX_VALUE: 'مقدار باید {0 و یا کوچکتر باشد}',
-		INSUFFICIENT_BALANCE: 'موجودی حساب ناکافی',
-		PASSWORDS_DONT_MATCH: 'کلمه عبور مطابقت ندارد',
-		USER_EXIST: 'این ایمیل قبلا ثبت شده است ',
-		ACCEPT_TERMS: 'شما شرایط استفاده و حریم خصوصی را تایید ننموده اید',
-		STEP: 'مقدار نامعتبر ،مقدار مجاز اضافه کردن {0}',
-		ONLY_NUMBERS: 'مقدار فقط می تواند شامل اعداد باشد',
+			'رمز مرور خاطئ. يجب أن يحتوي على 8 أحرف على الأقل ، و علي الأقل رقم واحد في كلمة المرور ، و حرف خاص.',
+		INVALID_CURRENCY: 'عنوان {0} غير صالح ({1})',
+		INVALID_BALANCE: 'رصيد الموجود غير كافٍ ({0}) لإجراء العملية ({1}).',
+		MIN_VALUE: 'يجب أن تكون القيمة {0} أو أعلى.',
+		MAX_VALUE: 'يجب أن تكون القيمة {0} أو أقل.',
+		MIN_VALUE_NE: 'يجب أن تكون القيمة أكبر من {0}.',
+		MAX_VALUE_NE: 'يجب أن تكون القيمة أقل من {0}.',
+		INSUFFICIENT_BALANCE: 'رصيد غير كاف',
+		PASSWORDS_DONT_MATCH: 'كلمة المرور غير متطابقة',
+		USER_EXIST: 'هذا البريد الإلكتروني مسجل من سابق',
+		ACCEPT_TERMS: 'لم توافق على شروط الاستخدام وسياسة الخصوصية',
+		STEP: 'قيمة غير صحيحة ، الخطوة هي {0}',
+		ONLY_NUMBERS: 'قيمة غير صحيحة ، الخطوة هي {0}',
 	},
 	LEGAL: {
 		PRIVACY_POLICY: {
-			TITLE: 'حریم خصوصی',
+			TITLE: 'سياسة الخصوصية',
 			SUBTITLE:
-				'بروزرسانی شده در اول آپریل 2019 .نسخه قبلی حریم خصوصی با این نسخه جایگزین شده است.',
+				'تم التحديث الأخير في 1 أبريل 2019. يستبدل الإصدار السابق بالكامل.',
 			TEXTS: [
 				'پلتفورم تحت وب HollaEx یک پلتفورم مبادله دارایی های دیجیتال می باشد که مالکیت آن تماماً دراختیار شرکت bitHolla در کشور کره جنوبی می باشد .از این پس به شرکت bitHoll اختصاراً bitHolla گفته میشود.',
 				'استفاده از وب سایت HollaEx (که از این پس به آن "وبسایت" گفته می شود )  و خدمات ارائه شده در آن  (که از این پس به آن "خدمات" گفته می شود )  با شرایط مندرج در صفحه شرایط و مقررات (که از این پس به آن " مقررات"  گفته می شود ) تنظیم و تعیین می شود. این توافق نامه کاملاً توافق طرفین را تشکیل می دهد. کلیه اطلاعات ارائه شده در وب سایت یا اظهارات شفاهی یا کتبی دیگر از این توافق نامه مستثنی هستند. سیاست های اکسچنج فقط جنبه  راهنمایی داشته  و توافق حقوقی بین طرفین نمی باشد.',
@@ -249,1101 +250,1153 @@ const nestedContent = {
 	},
 	NOTIFICATIONS: {
 		BUTTONS: {
-			OKAY: 'تایید',
-			START_TRADING: 'شروع معاملات',
-			SEE_HISTORY: 'تاریخچه',
+			OKAY: 'حسنا',
+			START_TRADING: 'إبدأ بالتداول',
+			SEE_HISTORY: 'مشاهدة السجل',
 		},
 		DEPOSITS: {
-			TITLE_RECEIVED: 'واریزی دریافت شد{0}',
-			TITLE_INCOMING: 'واریزی {0}',
-			SUBTITLE_RECEIVED: 'شما مقدار {0دریافت نمودید}',
-			SUBTITLE_INCOMING: 'شما یک واریزی دارید {0}',
+			TITLE_RECEIVED: '{0} تم استلام الإيداع',
+			TITLE_INCOMING: 'واردة {0}',
+			SUBTITLE_RECEIVED: 'لقد تلقيت إيداعك بقيمة {0}',
+			SUBTITLE_INCOMING: 'لديك {0} واردة',
 			INFORMATION_PENDING_1:
-				'تراکنش {0 شما حداقل به یک تایید نیاز دارد تا بتوانید معامله را شروع کنید}',
+				'يتطلب {0} تصديقاً واحدًا قبل أن تتمكن من بدء التداول.',
 			INFORMATION_PENDING_2:
-				'مابه محض تایید {0 شما بر روی شبکه بلاکچین یک ایمیل برای شما ارسال خواهیم کرد. این زمان ممکن است بین 10 تا 30 دقیقه بطول بیانجامد}',
+				'قد يستغرق ذلك 10-30 دقيقة. سنرسل بريداً إلكترونياً بمجرد تصديق {0} على البلوك تشين.',
 		},
 	},
 	REFERRAL_SUCCESS: {
-		TITLE: 'درخواست ارسال شد',
-		BUTTON_TEXT: 'تایید',
+		TITLE: 'تم ارسال الطلب',
+		BUTTON_TEXT: 'حسناً',
 	},
 	OTP_FORM: {
-		OTP_FORM_TITLE: 'برای ادامه ، کد تایید خود را وارد نمایید',
-		OTP_LABEL: 'رمز یکبار مصرف',
-		OTP_PLACEHOLDER: 'کد تایید را وارد نمایید',
-		OTP_TITLE: 'کد تایید',
-		OTP_HELP: 'راهنما',
-		OTP_BUTTON: 'ارسال',
-		ERROR_INVALID: 'رمز یکبار مصرف اشتباه است',
+		OTP_FORM_TITLE: 'أدخل رمز المصادقة الخاص بك للمتابعة',
+		OTP_LABEL: 'رمز السري المتغير',
+		OTP_PLACEHOLDER: 'أدخل رمز المصادقة',
+		OTP_TITLE: 'رمز المصدق',
+		OTP_HELP: 'مساعدة',
+		OTP_BUTTON: 'إرسال',
+		ERROR_INVALID: 'رمز السري المتغير غير صالح',
 	},
 	QUICK_TRADE_COMPONENT: {
-		TITLE: 'سریع و آسان',
-		TOTAL_COST: 'مجموع هزینه',
-		BUTTON: 'بازنگری {0 سفارش}',
-		INPUT: '{0}به {1}',
+		TITLE: 'التداول السريع',
+		TOTAL_COST: 'التكلفة الإجمالية',
+		BUTTON: 'إعادة نظر الطلب',
+		INPUT: 'من {0} إلى {1}',
 		TRADE_TITLE: '{0} {1}', // quick buy
 	},
-	PREVIOUS_PAGE: 'صفحه قبل',
-	NEXT_PAGE: 'صفحه بعد',
+	PREVIOUS_PAGE: 'الصفحة السابقة',
+	NEXT_PAGE: 'الصفحة التالية',
 	WALLET: {
-		TOTAL_ASSETS: 'مجموع دارایی ها',
-		AVAILABLE_WITHDRAWAL: 'دارایی موثر قابل معامله',
-		AVAILABLE_TRADING: 'دارایی موثر قابل برداشت',
-		ORDERS_PLURAL: 'سفارشات',
-		ORDERS_SINGULAR: 'سفارش',
+		TOTAL_ASSETS: 'جاري تحميل الأصول ...',
+		AVAILABLE_WITHDRAWAL: 'إجمالي الأصول',
+		AVAILABLE_TRADING: 'متاح للتداول',
+		ORDERS_PLURAL: 'الطلبات',
+		ORDERS_SINGULAR: 'الطلب',
 		HOLD_ORDERS:
-			'شما {0} سفارش تکمیل نشده دارید, که منجر به کسر {2} {3} از دارایی {4} شما شده است',
+			'لديك {0} مفتوحة {1} ، مما أدى إلى إمتلاك {2} {3} في رصيدك بعملة {4}',
 	},
 	REQUEST_RESET_PASSWORD: {
-		TITLE: 'بازیابی حساب کاربری',
-		SUBTITLE: `حساب کاربری خود را بازیابی کنید`,
-		SUPPORT: 'تماس با پشتیبانی',
-		BUTTON: 'ارسال لینک بازیابی',
+		TITLE: 'استرجاع الحساب',
+		SUBTITLE: `استرجع حسابك أدناه`,
+		SUPPORT: 'اتصل بالدعم',
+		BUTTON: 'أرسل رابط الاسترداد',
 	},
 	REQUEST_RESET_PASSWORD_SUCCESS: {
-		TITLE: 'درخواست کلمه عبور جدید ارسال گردید',
+		TITLE: 'تم إرسال إعادة تعيين كلمة المرور',
 		TEXT:
-			'اگر با این ایمیل قبلا حساب کاربری ایجاد کرده باشید ، ایمیل بازیابی کلمه عبور به آن ارسال شده است . لطفا مراحل را طبق آن دنبال نمایید',
+			'إذا كان هناك حساب لعنوان البريد الإلكتروني ، فقد تم إرسال بريد إلكتروني إليه مع تعليمات إعادة التعيين. يرجى التحقق من بريدك الإلكتروني والنقر فوق الرابط لإكمال إعادة تعيين كلمة المرور الخاصة بك.',
 	},
 	RESET_PASSWORD: {
-		TITLE: 'کلمه عبور جدید تعریف کنید',
-		SUBTITLE: 'کلمه عبور جدید تعریف کنید',
-		BUTTON: 'کلمه عبور جدید تعریف کنید',
+		TITLE: 'قم بتعيين كلمة مرور جديدة',
+		SUBTITLE: 'قم بتعيين كلمة مرور جديدة',
+		BUTTON: 'قم بتعيين كلمة مرور جديدة',
 	},
 	RESET_PASSWORD_SUCCESS: {
-		TEXT_1: 'شما با موفقیت کلمه عبور جدید خود را تعریف کردید',
-		TEXT_2: 'دکمه ورود در پایین را فشار دهید',
+		TEXT_1: 'لقد نجحت في إعداد كلمة مرور جديدة.',
+		TEXT_2: 'انقر على تسجيل الدخول أدناه للمتابعة.',
 	},
 	SIGN_UP: {
-		SIGNUP_TO: 'ثبت نام در {0}',
-		NO_EMAIL: 'هنوز ایمیلی دریافت نکرده ایید؟',
-		REQUEST_EMAIL: 'درخواست مجدد',
-		HAVE_ACCOUNT: 'در حال حاضر حساب کاربری دارید؟',
-		GOTO_LOGIN: 'به صفحه ورود بروید',
+		SIGNUP_TO: 'سجل في {0}',
+		NO_EMAIL: 'ألم تتلق البريد الإلكتروني؟',
+		REQUEST_EMAIL: 'اطلب واحدة أخرى هنا',
+		HAVE_ACCOUNT: 'هل لديك حساب؟',
+		GOTO_LOGIN: 'اذهب إلى صفحة تسجيل الدخول',
+		AFFILIATION_CODE: 'معرف الإحالة (إختياري)', // new
+		AFFILIATION_CODE_PLACEHOLDER: 'اكتب معرف الإحالة الخاص بك', //
 		TERMS: {
-			terms: 'شرایط عمومی',
-			policy: 'حریم خصوصی',
-			text: 'من با مطالعه و آگاهی با {0 و {1 موافقت می نمایم}}',
+			terms: 'شروط عامة',
+			policy: 'سياسة الخصوصية',
+			text: 'لقد قرأت وأوافق على {0} و {1}',
 		},
 	},
 	VERIFICATION_TEXTS: {
-		TITLE: 'ایمیل ارسال شد',
-		TEXT_1: 'ایمیل خود را چک کنید و لینک تایید را فشار دهید',
+		TITLE: 'أرسل البريد الإلكتروني',
+		TEXT_1:
+			'تحقق من بريدك الإلكتروني وانقر على الرابط للتحقق من بريدك الإلكتروني.',
 		TEXT_2:
-			'اگر ایمیل تایید را تاکنون دریافت نکرده ایید به بخش هرزنامه مراجعه نمایید',
+			'إذا ما تلقيت أي تأكيد عبر البريد الإلكتروني وقمت بفحص البريد الغير هام الخاص بك ، فيمكنك محاولة النقر علی إعادة الإرسال أدناه.',
 	},
 	VERIFICATION_EMAIL_REQUEST: {
-		TITLE: 'ارسال مجدد درخواست ایمیل',
-		BUTTON: 'درخواست ایمیل',
+		TITLE: 'إعادة إرسال طلب البريد الإلكتروني',
+		BUTTON: 'طلب بريد إلكتروني',
 	},
 	VERIFICATION_EMAIL_REQUEST_SUCCESS: {
-		TITLE: 'ارسال مجدد ایمیل',
+		TITLE: 'إعادة إرسال البريد الإلكتروني',
 		TEXT_1:
-			'اگر بعد از چند دقیقه همچنان ایمیلی را دریافت ننموده اید با تیم پشتیبانی ما تماس حاصل فرمایید',
+			'إذا لم تتلق رسالة التحقق من البريد الإلكتروني بعد بضع دقائق ، فيرجى الاتصال بنا أدناه.',
 	},
 	VERIFICATION_EMAIL: {
-		INVALID_UUID: 'کد نامعتبر است',
-		TEXT_1: 'شما با موفقیت ایمیل خود را تایید نمودید',
-		TEXT_2: 'اکنون می توانید وارد شوید',
+		INVALID_UUID: 'الرمز غير صحيح',
+		TEXT_1: 'لقد نجحت في التحقق من بريدك الإلكتروني.',
+		TEXT_2: 'يمكنك الآن متابعة تسجيل الدخول',
 	},
 	USER_VERIFICATION: {
-		INFO_TXT:
-			'اینجا شما می توانید وضعیت فعلی و روند ارتقای حساب کاربری خود را مشاهده نمایید',
+		INFO_TXT: 'هنا يمكنك مراقبة سيرك نحو التحقق وترقيات الحساب.',
 		INFO_TXT_1:
-			'لطفا اطلاعات خواسته شده در هر بخش را با دقت وارد نمایید .مستحضر باشید پس از تکمیل همه اطلاعات خواسته شده ، درخواست ارتقای حساب کاربری شما مورد ارزیابی قرار خواهد گرفت',
-		INFO_TXT_2: '* روند احراز هویت شما نیازمند بررسی مدارک هویتی شما می باشد',
-		DOCUMENTATIONS: 'بارگزاری',
-		COMPLETED: 'تکمیل شد',
-		PENDING_VERIFICATION: 'تایید حساب کاربری در حال انتظار است ',
-		TITLE_EMAIL: 'ایمیل',
-		MY_EMAIL: 'ایمیل من',
-		MAKE_FIRST_DEPOSIT: 'اولین واریز خود را انجام دهید', // new
-		OBTAIN_XHT: 'کسب XHT', // new
-		TITLE_USER_DOCUMENTATION: 'مدرک شناسایی',
-		TITLE_ID_DOCUMENTS: 'بارگزاری',
-		TITLE_BANK_ACCOUNT: 'حساب بانکی',
-		TITLE_MOBILE_PHONE: 'شماره تلفن همراه',
-		TITLE_PERSONAL_INFORMATION: 'اطلاعات شخصی',
-		VERIFY_EMAIL: 'ایمیل خود را تایید کنید',
-		VERIFY_MOBILE_PHONE: 'شماره موبایل خود را تایید کنید',
-		VERIFY_USER_DOCUMENTATION: 'تایید مدارک کاربر',
-		VERIFY_ID_DOCUMENTS: 'تایید مدارک شناسایی',
-		VERIFY_BANK_ACCOUNT: 'تایید حساب بانکی',
-		BUTTON: 'درخواست تایید مدارک را ارسال کنید',
-		TITLE_IDENTITY: 'مدارک شناسایی',
-		TITLE_MOBILE: 'تلفن همراه',
-		TITLE_MOBILE_HEADER: 'شماره تلفن همراه',
-		TITLE_BANK: 'بانک',
-		TITLE_BANK_HEADER: 'اطلاعات بانک',
-		CHANGE_VALUE: 'تغییر مقادیر',
-		PENDING_VERIFICATION_PERSONAL_INFORMATION:
-			'اطلاعات شخصی شما در حال بررسی می باشد',
-		PENDING_VERIFICATION_BANK: 'مشخصات حساب بانکی شمادر حال بررسی می باشد',
-		PENDING_VERIFICATION_DOCUMENTS: 'مدارک شما در حال بررسی می باشد',
-		GOTO_VERIFICATION: 'رفتن به بخش تایید حساب کاربری',
-		GOTO_WALLET: 'به بخش کیف پول برو', // new
-		CONNECT_BANK_ACCOUNT: 'اتصال حساب بانکی',
-		ACTIVATE_2FA: 'فعال سازی رمز دوعاملی',
-		INCOMPLETED: 'تکمیل نشده است',
-		BANK_VERIFICATION: 'تایید بانک',
-		IDENTITY_VERIFICATION: 'تایید مدارک شناسایی',
-		PHONE_VERIFICATION: 'تایید شماره تلفن',
-		DOCUMENT_VERIFICATION: 'تایید مدارک',
-		START_BANK_VERIFICATION: 'شروع روند تایید حساب بانکی',
-		START_IDENTITY_VERIFICATION: 'شروع روند تایید اطلاعات هویتی',
-		START_PHONE_VERIFICATION: 'شروع روند تایید شماره تلفن',
-		START_DOCUMENTATION_SUBMISSION: 'شروع ارسال مدارک',
-		GO_BACK: 'برگرد به عقب',
+			'يرجى تقديم المعلومات ذات الصلة المطلوبة لكل قسم أدناه. فقط عند اكتمال عمليات الإرسال لجميع الأقسام ، ستتم مراجعة معلوماتك والموافقة عليها لترقية الحساب.',
+		INFO_TXT_2: 'يتطلب التحقق لقسم الهوية منك {0} مستندات معينة.',
+		DOCUMENTATIONS: 'تحمیل',
+		COMPLETED: 'منجز',
+		PENDING_VERIFICATION: 'في انتظار التحقق',
+		TITLE_EMAIL: 'االبريد الإلكتروني',
+		MY_EMAIL: 'بريدي الالكتروني',
+		MAKE_FIRST_DEPOSIT: 'قم بعمل أول إيداع', // new
+		OBTAIN_XHT: 'احصل على عملة XHT', // new
+		TITLE_USER_DOCUMENTATION: 'تطابق',
+		TITLE_ID_DOCUMENTS: 'تحميل',
+		TITLE_BANK_ACCOUNT: 'حساب البنك',
+		TITLE_MOBILE_PHONE: 'الهاتف المحول',
+		TITLE_PERSONAL_INFORMATION: 'الهاتف المحول',
+		VERIFY_EMAIL: 'التحقق من البريد الإلكتروني',
+		VERIFY_MOBILE_PHONE: 'تحقق من الهاتف المحمول',
+		VERIFY_USER_DOCUMENTATION: 'تحقق من وثائق المستخدم',
+		VERIFY_ID_DOCUMENTS: 'تحقق من وثائق الهوية',
+		VERIFY_BANK_ACCOUNT: 'تحقق من الحساب المصرفي',
+		BUTTON: 'إرسال طلب التحقق',
+		TITLE_IDENTITY: 'هوية',
+		TITLE_MOBILE: 'الهاتف المحمول',
+		TITLE_MOBILE_HEADER: ' رقم الهاتف المحمول',
+		TITLE_BANK: 'بنك',
+		TITLE_BANK_HEADER: 'التفاصيل المصرفية',
+		CHANGE_VALUE: 'تغيير القيمة',
+		PENDING_VERIFICATION_PERSONAL_INFORMATION: 'تتم معالجة معلوماتك الشخصية',
+		PENDING_VERIFICATION_BANK: 'يتم التحقق من التفاصيل المصرفية الخاصة بك',
+		PENDING_VERIFICATION_DOCUMENTS: 'يتم التحقق من المستندات الخاصة بك',
+		GOTO_VERIFICATION: 'إذهب إلى التحقق',
+		GOTO_WALLET: 'اذهب إلى المحفظة', // new
+		CONNECT_BANK_ACCOUNT: 'اتصال الحساب المصرفي',
+		ACTIVATE_2FA: 'تفعيل توثيق ذو عاملين',
+		INCOMPLETED: 'غير مكتمل',
+		BANK_VERIFICATION: 'التحقق من البنك',
+		IDENTITY_VERIFICATION: 'التحقق من الهوية',
+		PHONE_VERIFICATION: 'التحقق من الهاتف',
+		DOCUMENT_VERIFICATION: 'التحقق من الوثيقة',
+		START_BANK_VERIFICATION: 'بدء التحقق من البنك',
+		START_IDENTITY_VERIFICATION: 'ابدأ التحقق من الهوية',
+		START_PHONE_VERIFICATION: 'ابدأ التحقق من الهاتف',
+		START_DOCUMENTATION_SUBMISSION: 'بدء تقديم الوثائق',
+		GO_BACK: 'إرجع',
 		BANK_VERIFICATION_TEXT_1:
-			'شما 3 حساب بانکی می توانید به حساب کاربری خود متصل نمایید',
+			'يمكنك إضافة ما يصل إلى 3 حسابات بنكية. لإستخدام الحسابات المصرفية الدولية ، سيُطلب منك الاتصال بدعم العملاء وسيكون لديك حدود سحب محدودة.',
 		BANK_VERIFICATION_TEXT_2:
-			'با تایید حساب بانکی خود موارد زیر برای ممکن می گردد',
-		BASE_WITHDRAWAL: 'برداشت تومان',
-		BASE_DEPOSITS: 'واریز تومان',
-		ADD_ANOTHER_BANK_ACCOUNT: 'یک بانک دیگر اضافه کنید',
-		BANK_NAME: 'نام بانک',
-		ACCOUNT_NUMBER: 'شماره حساب',
-		CARD_NUMBER: 'شماره کارت',
+			'من خلال التحقق من حسابك المصرفي ، يمكنك الحصول على ما يلي:',
+		BASE_WITHDRAWAL: 'سحب نقدي(فیات)',
+		BASE_DEPOSITS: 'الودائع النقدية(فیات)',
+		ADD_ANOTHER_BANK_ACCOUNT: 'Add Another Bank Account', // ماذاهذا
+		BANK_NAME: 'اسم البنك',
+		ACCOUNT_NUMBER: 'رقم الحساب',
+		CARD_NUMBER: 'رقم البطاقة',
 		BANK_VERIFICATION_HELP_TEXT:
-			'برای تایید این بخش شما نیاز به تکمیل قسمت{0 دارید}',
-		DOCUMENT_SUBMISSION: 'ارسال مدارک',
-		REVIEW_IDENTITY_VERIFICATION: 'بررسی تایید مدارک',
-		PHONE_DETAILS: 'مشخصات شماره تلفن',
-		PHONE_COUNTRY_ORIGIN: 'کد کشور محل سکونت',
-		MOBILE_NUMBER: 'شماره تلفن همراه',
-		DOCUMENT_PROOF_SUBMISSION: 'کارت ملی',
-		START_DOCUMENTATION_RESUBMISSION: 'ارسال مجدد مدارک',
+			'من أجل التحقق لهذا القسم، يجب عليك إكمال قسم {0}.',
+		DOCUMENT_SUBMISSION: 'تقديم الوثائق',
+		REVIEW_IDENTITY_VERIFICATION: 'مراجعة التحقق من الهوية',
+		PHONE_DETAILS: 'تفاصيل الهاتف',
+		PHONE_COUNTRY_ORIGIN: 'بلد منشأ الهاتف',
+		MOBILE_NUMBER: 'رقم الهاتف المحمول',
+		DOCUMENT_PROOF_SUBMISSION: 'تقديم إثبات الوثائق',
+		START_DOCUMENTATION_RESUBMISSION: 'بدء إعادة تقديم الوثائق',
 		SUBMISSION_PENDING_TXT:
-			'*اطلاعات مربوط به این بخش قبلا ارسال گردیده است. ارسال مجدد مدارک،جایگزین مدارک قبلی خواهد شد.',
-		CUSTOMER_SUPPORT_MESSAGE: 'پیام تیم پشتیبانی',
+			'تم تقديم هذا القسم سابقاً. إجراء التغييرات وإعادة التقديم،سيؤدي إلى تغيير معلوماتك السابقة.',
+		CUSTOMER_SUPPORT_MESSAGE: 'رسالة دعم العملاء',
 		DOCUMENT_PENDING_NOTE:
-			'مدارک شما ارسال گردیده و درحال بررسی می باشند. لطفا شکیبا باشید.',
-		DOCUMENT_VERIFIED_NOTE: 'مدارک شما کامل شده اند.',
-		NOTE_FROM_VERIFICATION_DEPARTMENT: ' پیام از طرف واحد احراز هویت',
-		CODE_EXPIRES_IN: 'اعتبار کد تا',
+			'يتم تقديم المستندات الخاصة بك وهي قيد المراجعة. يرجى التحلي بالصبر.',
+		DOCUMENT_VERIFIED_NOTE: 'لقد تم تقديم المستندات الخاصة بك.',
+		NOTE_FROM_VERIFICATION_DEPARTMENT: 'ملاحظة من قسم التحقق',
+		CODE_EXPIRES_IN: 'تنتهي صلاحية الرمز في',
 		USER_DOCUMENTATION_FORM: {
 			FORM_FIELDS: {
-				FIRST_NAME_LABEL: 'نام',
-				FIRST_NAME_PLACEHOLDER: 'نام خود را دقیقا مطابق کارت ملی تایپ کنید',
-				LAST_NAME_LABEL: 'نام خانوادگی',
+				FIRST_NAME_LABEL: 'الاسم الاول',
+				FIRST_NAME_PLACEHOLDER:
+					'اكتب اسمك الأول كما يظهر في وثيقة الهوية الخاصة بك',
+				LAST_NAME_LABEL: 'اسم العائلة',
 				LAST_NAME_PLACEHOLDER:
-					'نام خانوادگی خود را دقیقا مطابق کارت ملی تایپ کنید',
-				FULL_NAME_LABEL: 'نام و نام خانوادگی',
-				FULL_NAME_PLACEHOLDER: 'نام کامل خود را به دقت وارد کنید',
-				GENDER_LABEL: 'جنسيت',
-				GENDER_PLACEHOLDER: 'جنسیت خود را انتخاب کنید',
+					'اكتب اسمك عائلتك كما يظهر في وثيقة الهوية الخاصة بك.',
+				FULL_NAME_LABEL: 'اسمك الكامل',
+				FULL_NAME_PLACEHOLDER:
+					'اكتب اسمك بالكامل كما يظهر في وثيقة الهوية الخاصة بك',
+				GENDER_LABEL: 'الجنس',
+				GENDER_PLACEHOLDER: 'اكتب ما هو جنسك',
 				GENDER_OPTIONS: {
-					MAN: 'مرد',
-					WOMAN: 'زن',
+					MAN: 'ذكر',
+					WOMAN: 'أنثى',
 				},
-				NATIONALITY_LABEL: 'ملیت',
-				NATIONALITY_PLACEHOLDER: 'ملیت خود را تایپ کنید',
-				DOB_LABEL: 'تاریخ تولد',
-				COUNTRY_LABEL: 'کشوری که در آن اقامت دارید',
-				COUNTRY_PLACEHOLDER:
-					'کشوری که در حال حاضر در آن اقامت دارید را انتخاب کنید',
-				CITY_LABEL: 'شهر',
-				CITY_PLACEHOLDER: 'شهر محل سکونت',
-				ADDRESS_LABEL: 'نشانی',
-				ADDRESS_PLACEHOLDER: 'آدرس کامل محل سکونت',
-				POSTAL_CODE_LABEL: 'کد پستی',
-				POSTAL_CODE_PLACEHOLDER: 'کد پستی 10 رقمی',
-				PHONE_CODE_LABEL: 'کشور',
-				PHONE_CODE_PLACEHOLDER:
-					'کشوری که شماره تلفن شما در آن ثبت شده را تایپ کنید',
-				PHONE_CODE_DISPLAY: '({0}) {1}', // 0 -> (+21)  1 -> South Korea
-				PHONE_NUMBER_LABEL: 'شماره تلفن',
-				PHONE_NUMBER_PLACEHOLDER: 'شماره موبایل خود را وارد نمایید',
-				CONNECTING_LOADING: 'بارگذاری',
-				SMS_SEND: 'ارسال پیامک',
-				SMS_CODE_LABEL: 'کد دریافتی',
-				SMS_CODE_PLACEHOLDER: 'کد دریافتی را وارد نمایید',
+				NATIONALITY_LABEL: 'الجنسية',
+				NATIONALITY_PLACEHOLDER: 'اكتب ما هي جنسيتك في وثيقة الهوية الخاصة بك',
+				DOB_LABEL: 'تاريخ الولادة',
+				COUNTRY_LABEL: 'البلد الذي تقيم فيه',
+				COUNTRY_PLACEHOLDER: 'حدد البلد الذي تقيم فيه حاليا',
+				CITY_LABEL: 'مدينة',
+				CITY_PLACEHOLDER: 'اكتب المدينة التي تعيش فيها',
+				ADDRESS_LABEL: 'عنوان',
+				ADDRESS_PLACEHOLDER: 'اكتب العنوان الذي تعيش فيه حاليا',
+				POSTAL_CODE_LABEL: 'رقم البريد',
+				POSTAL_CODE_PLACEHOLDER: 'اكتب رقم البريد الخاص بك',
+				PHONE_CODE_LABEL: 'بلد',
+				PHONE_CODE_PLACEHOLDER: 'حدد البلد الذي يتصل به هاتفك',
+				PHONE_CODE_DISPLAY: '({0}) {1}', // 0 -> (+21) 1 -> كوريا الجنوبية
+				PHONE_NUMBER_LABEL: 'رقم الهاتف',
+				PHONE_NUMBER_PLACEHOLDER: 'اكتب رقم هاتفك',
+				CONNECTING_LOADING: 'يتم الاتصال',
+				SMS_SEND: 'أرسل رسالة نصية قصيرة',
+				SMS_CODE_LABEL: 'رمز الرسالة النصية القصيرة',
+				SMS_CODE_PLACEHOLDER: 'أدخل رمز الرسالة القصيرة الخاص بك',
 			},
 			INFORMATION: {
 				TEXT:
-					'نکته: نام و نام خانوادگی خود را مطابق با شناسنامه و به فارسی وارد نمایید.',
-				TITLE_PERSONAL_INFORMATION: 'اطلاعات شخصی',
-				TITLE_PHONE: 'موبایل',
+					'هام: أدخل اسمك في الفراغ تماماً كما يظهر في وثائق هويتك (الاسم الأول الكامل ، وأي اسم اوسط واسم (أسماء) العائلة بالكامل). هل انتم شرکة ؟ اتصل بدعم العملاء لحساب الشركة.',
+				TITLE_PERSONAL_INFORMATION: 'معلومات شخصية',
+				TITLE_PHONE: 'هاتف',
 				PHONE_VERIFICATION_TXT:
-					'گزارش تمام واریز ها و برداشت ها از حساب کاربری، از طریق پیامک به شماره موبایل شما ارسال خواهد شد.',
+					'سيساعدنا تقديم تفاصيل اتصال صالحة بشكل كبير في حل النزاعات مع منع المعاملات الغير مرغوب فيها على حسابك.',
 				PHONE_VERIFICATION_TXT_1:
-					'گزارش تمام واریز ها و برداشت ها از حساب کاربری، از طریق پیامک به شماره موبایل شما ارسال خواهد شد.',
+					'تلقي تحديثات فورية لعمليات الإيداع والسحب من خلال مشاركة رقم هاتفك المحمول.',
 				PHONE_VERIFICATION_TXT_2:
-					'برای ارایه خدمات بهتر لطفا شمارهتلفن ثابت خود را نیز ثبت نمایید',
+					'قم بإثبات هويتك وعنوانك من خلال مشاركة رقم هاتف LAN الخاص بك (اختياري).',
 			},
 		},
 		ID_DOCUMENTS_FORM: {
 			VALIDATIONS: {
-				ID_TYPE: 'لطفا یکی از مدارک هویتی را انتخاب کنید',
-				ID_NUMBER: 'لطفا شماره سند هویتی را درست وارد کنید',
-				ISSUED_DATE: 'لطفا تاریخ صدور مدرک خود را انتخاب کنید',
-				EXPIRATION_DATE: 'لطفا تاریخ انقضای مدرک خود را انتخاب کنید',
-				FRONT: 'لطفا تصویر مدرک هویتی خود را آپلود کنید',
-				PROOF_OF_RESIDENCY: 'لطفا تصویر مدرک اثبات آدرس خود را آپلود کنید',
-				SELFIE_PHOTO_ID:
-					'لطفا سلفی خود را در حال در دست داشتن متن و کارت بارگذاری کنید',
+				ID_TYPE: 'الرجاء تحديد نوع وثيقة الهوية',
+				ID_NUMBER: 'الرجاء كتابة رقم الوثائق الخاصة بك',
+				ISSUED_DATE: 'الرجاء تحديد تاريخ إصدار الوثيقة الخاصة بك',
+				EXPIRATION_DATE:
+					'يرجى تحديد التاريخ الذي تنتهي فيه صلاحية الوثيقة الخاصة بك.',
+				FRONT: 'يرجى تحميل نسخة من جواز سفرك',
+				PROOF_OF_RESIDENCY:
+					'يرجى تحميل نسخة ممسوحة ضوئيًا من الوثيقة الذي تثبت عنوان الذي تقيم فيه حاليًا',
+				SELFIE_PHOTO_ID: 'يرجى تحميل صورة شخصية مع جواز السفر والملاحظة',
 			},
 			FORM_FIELDS: {
-				TYPE_LABEL: 'نوع مدرک',
-				TYPE_PLACEHOLDER: 'کارت ملی یا شناسنامه جدید',
+				TYPE_LABEL: 'نوع وثيقة الهوية',
+				TYPE_PLACEHOLDER: 'حدد نوع وثيقة الهوية',
 				TYPE_OPTIONS: {
-					ID: 'سند هویت',
-					PASSPORT: 'کارت ملی',
+					ID: 'هویة',
+					PASSPORT: 'جواز سفر',
 				},
-				ID_NUMBER_LABEL: 'کد ملی',
-				ID_NUMBER_PLACEHOLDER: 'کد ملی 10 رقمی خود را وارد کنید',
-				ID_PASSPORT_NUMBER_LABEL: 'کارت ملی',
-				ID_PASSPORT_NUMBER_PLACEHOLDER: 'شماره کارت ملی خود را وارد نمایید',
-				ISSUED_DATE_LABEL: 'تاریخ صدور',
-				EXPIRATION_DATE_LABEL: 'تاریخ پایان اعتبار',
-				FRONT_LABEL: 'تصویر کارت ملی',
-				FRONT_PLACEHOLDER:
-					'تصویر کارت ملی یا شناسنامه جدید خود را بارگذاری نمایید',
-				BACK_LABEL: 'عکس سلفی',
+				ID_NUMBER_LABEL: 'رقم جواز السفر',
+				ID_NUMBER_PLACEHOLDER: 'اكتب رقم جواز سفرك',
+				ID_PASSPORT_NUMBER_LABEL: 'رقم جواز السفر',
+				ID_PASSPORT_NUMBER_PLACEHOLDER: 'اكتب رقم جواز سفرك',
+				ISSUED_DATE_LABEL: 'تاريخ اصدار جواز السفر',
+				EXPIRATION_DATE_LABEL: 'تاريخ انتهاء الجواز',
+				FRONT_LABEL: 'جواز سفر',
+				FRONT_PLACEHOLDER: 'أضف نسخة من جواز سفرك',
+				BACK_LABEL: 'الجانب الخلفي من جواز السفر',
 				BACK_PLACEHOLDER:
-					'عکس سلفی خود همراه کارت ملی و دستخطی با نام سایت را بارگذاری کنید',
-				PASSPORT_LABEL: 'گذرنامه',
-				PASSPORT_PLACEHOLDER: 'اسکن صفحه اول گذرنامه خود را بارگذاری کنید',
-				POR_LABEL: 'سند اثبات آدرس',
-				POR_PLACEHOLDER: 'تصویر سند اثبات آدرس خود را براگذاری نمایید',
-				SELFIE_PHOTO_ID_LABEL: 'تصویر سلفی',
+					'أضف نسخة من ظهر الهوية الخاصة بك (إذا كان قابلاً للتطبيق)',
+				PASSPORT_LABEL: 'وثيقة جواز السفر',
+				PASSPORT_PLACEHOLDER: 'أضف نسخة من جواز سفر الخاص بك',
+				POR_LABEL: 'وثيقة تثبت عنوانك',
+				POR_PLACEHOLDER: 'أضف نسخة من وثيقة تثبت عنوانك',
+				SELFIE_PHOTO_ID_LABEL: 'صورتك الشخصية مع جواز السفر والملاحظة',
 				SELFIE_PHOTO_ID_PLACEHOLDER:
-					'تصویر سلفی، همراه با مدرک شناسایی و متن دستنویس را بارگذاری کنید',
+					'أضف نسخة من صورتك الشخصية مع جواز السفر والملاحظة',
 			},
 			INFORMATION: {
-				IDENTITY_DOCUMENT: 'مدرک احراز هویت',
-				PROOF_OF_RESIDENCY: 'مدرک احراز محل اقامت',
+				IDENTITY_DOCUMENT: 'وثيقة الهوية',
+				PROOF_OF_RESIDENCY: 'اثبات الإقامة',
 				ID_SECTION: {
-					TITLE:
-						'لطفا هنگام بارگذاری تصویر کارت ملی خود به نکات زیر دقت نمایید:',
+					TITLE: 'يرجى التأكد من أن الوثائق التي قدمتها هي:',
 					LIST_ITEM_1:
-						'مدارک باید بصورت رنگی و با کیفیت بالا و حجم حداکثر 300 کیلو بایت بارگزاری شوند.',
-					LIST_ITEM_2: 'اطلاعات درج شده باید کاملا خوانا باشد.',
-					LIST_ITEM_3:
-						'تنها کارت ملی که تاریخ اعتبار آن منقضی نشده است ، معتبر می باشد.',
+						'جودة عالية (صور ملونة ، دقة 300 نقطة في البوصة أو أعلى).',
+					LIST_ITEM_2: 'مرئية بالكامل (العلامات المائية مسموح بها).',
+					LIST_ITEM_3: 'صالح ، مع تاريخ انتهاء الصلاحية واضح بالكامل.',
 					WARNING_1:
-						'تنها کارت ملی  معتبر پذیرفته می شود. عکس با کیفیت بالا یا تصاویر اسکن شده از آن قابل قبول است:',
+						'يتم قبول جواز سفرصالح فقط ؛ تُقبل الصور عالية الجودة أو الصور الممسوحة ضوئيًا لهذه الوثائق:',
 					WARNING_2:
-						'مطمئن شوید که اسناد شخصی خود را بارگذاری می کنید. هرگونه استفاده از اسناد شخص دیگر یا جعلی عواقب قانونی به همراه خواهد داشت و باعث می شود  حساب شما فوراً مسدود شود.',
-					WARNING_3:
-						'برای احراز محل اقامت خود از بارگزاری کارت ملی ، شناسنامه و پاسپورت خودداری نمایید',
+						'تأكد من أنك تقوم بتحميل المستندات الخاصة بك. أي استخدام لوثائق خاطئة أو مزيفة سيكون له عواقب قانونية ويؤدي إلى تجميد حسابك على الفور.',
+					WARNING_3: 'يرجى عدم تقديم جواز السفر كإثبات على إقامتك.',
 				},
 				POR: {
 					SECTION_1_TEXT_1:
-						'برای احراز هویت هر چه سریعتر حساب کاربری خود ،لطفا به موارد ذیل توجه فرمایید',
+						'لتجنب التأخير عند التحقق من حسابك ، يرجى التأكد من:',
 					SECTION_1_TEXT_2:
-						'نام، آدرس، تاریخ صدور و مرجع صادر کننده به وضوح قابل مشاهده باشد.',
+						'يمكنك رؤية اسمك وعنوانك وتاريخ الإصدار والمُصدر بوضوح.',
 					SECTION_1_TEXT_3:
-						'اثبات ارائه سند اقامت نباید قدیمی تر از سه ماه گذشته باشد.',
+						'وثيقة إثبات الإقامة المقدمة ليست أقدم من ثلاثة أشهر.',
 					SECTION_1_TEXT_4:
-						'تصاویر رنگی یا اسکن شده را با کیفیت بالا (حداقل 300 DPI) ارسال نمایید',
-					SECTION_2_TITLE: 'موارد قابل قبول احراز محل اقامت:',
-					SECTION_2_LIST_ITEM_1: 'سند اجاره و یا مالکیت محل اقامت',
-					SECTION_2_LIST_ITEM_2: 'کلیه قبوض حاوی آدرس و کد پستی',
-					SECTION_2_LIST_ITEM_3: 'گواهی کد پستی محل سکونت',
-					WARNING: '',
+						'ارسل صور فوتوغرافية ملونة أو صور ممسوحة ضوئيًا بجودة عالية (300 نقطة في البوصة على الأقل)',
+					SECTION_2_TITLE: 'إثبات الإقامة المقبول هو:',
+					SECTION_2_LIST_ITEM_1: 'كشف حساب بنكي.',
+					SECTION_2_LIST_ITEM_2: 'فاتورة خدمات (كهرباء ، مياه ، انترنت).',
+					SECTION_2_LIST_ITEM_3:
+						'وثيقة صادرة عن الحكومة (الإقرار الضريبي ، شهادة إقامة).',
+					WARNING:
+						'لا يمكننا قبول العنوان الموجود في وثيقة الهوية الخاصة بك كإثبات صالح على الإقامة.', //IN PERSIAN ?
 				},
 				SELFIE: {
-					TITLE: 'تصویر سلفی',
+					TITLE: 'صورة شخصية مع جواز السفر والملاحظة',
 					INFO_TEXT:
-						'لطفاً تصویر خود را با در دست داشتن سند هویتی خود بگیرید.در تصویر ارسالی تاریخ امروز و امضای شما مشخص باشد. هم چنین مطمئن شوید که صورت شما به وضوح قابل مشاهده است و جزئیات سند هویتی شما نیز به وضوح قابل خواندن باشد.',
-					REQUIRED: 'لطفا تصویر سلفی خود را مطابق با شرایط زیر ارسال نمایید::',
-					INSTRUCTION_1: 'صورت و شانه ها به وضوح مشخص باشند.',
-					INSTRUCTION_2: 'مدرک هویتی و دستنوشته شما واضح و خوانا باشد.',
-					INSTRUCTION_3: 'درج نوشته exir.io',
-					INSTRUCTION_4: 'درج تاریخ امروز',
-					INSTRUCTION_5: 'امضای شما',
+						'يرجى تقديم صورة لك وأنت تحمل جواز سفرك. في نفس الصورة مع إشارة إلى عنوان URL البورصة ، تاريخ اليوم وتوقيعك معروض. تأكد من أن وجهك مرئي بوضوح وأن تفاصيل الهوية الخاصة بك قابلة للقرائة.',
+					REQUIRED: 'مطلوب:',
+					INSTRUCTION_1: 'وجهك مرئي بوضوح',
+					INSTRUCTION_2: 'جواز السفر قابل للقرائة بوضوح',
+					INSTRUCTION_3: 'اكتب اسم البورصة',
+					INSTRUCTION_4: 'اكتب تاريخ اليوم',
+					INSTRUCTION_5: 'اكتب توقيعك',
 					WARNING:
-						'در صورت مشاهده خطای network error حجم تصاویر را به زیر 300 کیلو بایت کاهش دهید.',
+						'سيتم رفض الصورة الشخصية بجواز سفر مختلف عن المحتوى الذي تم تحميله',
 				},
 			},
 		},
 		BANK_ACCOUNT_FORM: {
 			VALIDATIONS: {
 				ACCOUNT_OWNER:
-					'لطفا نام و نام خانوادگی خود را با حساب بانکی خود وارد کنید',
-				ACCOUNT_NUMBER: 'شماره حساب بانکی شما باید حداکثر 24 رقمی باشد',
-				ACCOUNT_NUMBER_MAX_LENGTH: 'شماره حساب حداکثر 50 عدد می باشد',
-				CARD_NUMBER: 'شماره کارت باید حتما 16 رقمی باشد',
+					'الرجاء كتابة اسمك الأول والأخير كما هو مترابط بحسابك المصرفي',
+				ACCOUNT_NUMBER: 'يجب أن يكون رقم حسابك المصرفي أقل من 50 رقمًا',
+				ACCOUNT_NUMBER_MAX_LENGTH: 'حد رقم حسابك المصرفي هو 50 حرفًا',
+				CARD_NUMBER: 'شكل رقم حسابك غير صحيح ',
 			},
 			FORM_FIELDS: {
-				BANK_NAME_LABEL: 'نام بانک',
-				BANK_NAME_PLACEHOLDER: 'نام بانک خود را وارد کنید',
-				ACCOUNT_NUMBER_LABEL: 'شماره حساب بانکی',
-				ACCOUNT_NUMBER_PLACEHOLDER: 'شماره حساب بانکی خود را وارد کنید',
-				ACCOUNT_OWNER_LABEL: 'نام صاحب حساب بانکی',
-				ACCOUNT_OWNER_PLACEHOLDER:
-					'نام و نام خانوادگی صاحب حساب بانکی را  وارد کنید',
-				CARD_NUMBER_LABEL: 'شماره کارت',
-				CARD_NUMBER_PLACEHOLDER: 'شماره 16 رقمی بر روی کارت خود را وارد کنید',
+				BANK_NAME_LABEL: 'اسم البنك',
+				BANK_NAME_PLACEHOLDER: 'اكتب اسم البنك الذي تتعامل معه',
+				ACCOUNT_NUMBER_LABEL: 'رقم الحساب المصرفي',
+				ACCOUNT_NUMBER_PLACEHOLDER: 'اكتب رقم حسابك المصرفي',
+				ACCOUNT_OWNER_LABEL: 'اسم صاحب الحساب المصرفي',
+				ACCOUNT_OWNER_PLACEHOLDER: 'اكتب الاسم كما هو موجود في حسابك المصرفي',
+				CARD_NUMBER_LABEL: 'رقم البطاقة المصرفية',
+				CARD_NUMBER_PLACEHOLDER:
+					'اكتب الرقم المكون من 16 رقمًا الموجود في مقدمة بطاقتك المصرفية',
 			},
 		},
 		WARNING: {
-			TEXT_1: 'با تکمیل احراز هویت، موارد زیر برای شما میسر می شود:',
-			LIST_ITEM_1: 'افزایش محدودیت های برداشت',
-			LIST_ITEM_2: 'افزایش محدودیت های سپرده',
-			LIST_ITEM_3: 'کارمزد پایین',
+			TEXT_1: 'من خلال التحقق من هويتك يمكنك الحصول على ما يلي:',
+			LIST_ITEM_1: 'زيادة حدود السحب',
+			LIST_ITEM_2: 'زيادة حدود الودائع',
+			LIST_ITEM_3: 'رسوم أقل',
 		},
 	},
 	USER_SETTINGS: {
 		TITLE_TEXT_1:
-			'تنظیمات حساب خود را تغییر دهید. از رابط کاربری، اعلان ها، نام کاربری و موارد شخصی سازی دیگر.',
-		TITLE_TEXT_2: 'با ذخیره تنظیمات ، تغییرات شما اعمال و ذخیره می شود.',
-		TITLE_NOTIFICATION: 'اعلان ها',
-		TITLE_INTERFACE: 'رابط کاربری',
-		TITLE_LANGUAGE: 'زبان',
-		TITLE_CHAT: 'چت',
-		TITLE_AUDIO_CUE: 'اعلان صوتی',
-		TITLE_MANAGE_RISK: 'مدیریت ریسک',
-		ORDERBOOK_LEVEL: 'سطح سفارش (حداکثر 20)',
-		SET_TXT: 'تنظیم',
-		CREATE_ORDER_WARING: 'ایجاد اخطار سفارش ',
-		RISKY_TRADE_DETECTED: 'شناسایی معاملات پرخطر',
+			'قم بتغيير إعدادات حسابك. من واجهة المستخدم والإشعارات واسم المستخدم والتخصيصات الأخرى.',
+		TITLE_TEXT_2: 'سيؤدي حفظ الإعدادات إلى تطبيق التغييرات وحفظها.',
+		TITLE_NOTIFICATION: 'إشعارات',
+		TITLE_INTERFACE: 'إشعارات',
+		TITLE_LANGUAGE: 'لغة',
+		TITLE_CHAT: 'محادثة',
+		TITLE_AUDIO_CUE: 'شغل إشاره الصوت',
+		TITLE_MANAGE_RISK: 'إدارة المخاطر',
+		ORDERBOOK_LEVEL: 'مستويات دفتر الطلبات (20 بحد أقصى)',
+		SET_TXT: 'مجموعة',
+		CREATE_ORDER_WARING: 'إنشاء أمر تحذير',
+		RISKY_TRADE_DETECTED: 'کشف تداول محفوظ بالخطر',
 		RISKY_WARNING_TEXT_1:
-			'این مقدار سفارشات بیشتر از مبلغ تعیین شده شمامی باشد {0} .',
-		RISKY_WARNING_TEXT_2: '({0} سبد معامله)',
+			'تتجاوز قيمة هذا الطلب مبلغ الحد المخصص للطلب الذي عينته {0}.',
+		RISKY_WARNING_TEXT_2: '({0} من المحفظة)',
 		RISKY_WARNING_TEXT_3:
-			' لطفاً بررسی و سپس تأیید کنید که می خواهید این معامله را انجام دهید.',
-		GO_TO_RISK_MANAGMENT: 'به بخش مدیریت ریسک برو',
+			'يرجى التحقق والتأكد من أنك تريد حقًا إجراء هذا التداول.',
+		GO_TO_RISK_MANAGMENT: 'اذهب إلى إدارة المخاطر',
 		CREATE_ORDER_WARING_TEXT:
-			'ایجاد هشدار درهنگامی که سفارشات شما از سقف تعیین شده توسط شما فراتر میرود.',
-		ORDER_PORTFOLIO_LABEL: 'درصد سبد معامله:',
+			'أنشئ تحذيراً منبثقًا عندما يستخدم طلب التداول الخاص بك أكثر من {0} من محفظتك.',
+		ORDER_PORTFOLIO_LABEL: 'نسبة المحفظة مبلغ:',
 		NOTIFICATION_FORM: {
-			TRADE_POPUPS: 'اعلان های مربوط به معاملات',
-			POPUP_ORDER_CONFIRMATION: 'تاییدیه، قبل از ارسال سفارش ',
-			POPUP_ORDER_COMPLETED: 'پس از تکمیل سفارش ، به من اطلاع بده',
-			POPUP_ORDER_PARTIALLY_FILLED:
-				'پس از تکمیل بخشی از سفارش ، به من اطلاع بده',
+			TRADE_POPUPS: 'النوافذ المنبثقة للتداول',
+			POPUP_ORDER_CONFIRMATION: 'اطلب التأكيد قبل تقديم الطلبات',
+			POPUP_ORDER_COMPLETED: 'أظهر نافذة منبثقة عند اكتمال الطلب',
+			POPUP_ORDER_PARTIALLY_FILLED: 'أظهر نافذة منبثقة عند تنفيذ الطلب جزئيًا',
 		},
 		AUDIO_CUE_FORM: {
-			ORDERS_COMPLETED_AUDIO: 'وقتی سفارش تکمیل شد یک اعلان صوتی پخش شود',
-			ORDERS_PARTIAL_AUDIO:
-				'وقتی بخشی از سفارش تکمیل شد ، یک اعلان صوتی  پخش شود',
-			PUBLIC_TRADE_AUDIO: 'در هر خرید و فروش یک اعلان صوتی پخش شود',
+			// new
+			ALL_AUDIO: 'جميع إشارات الصوت',
+			PUBLIC_TRADE_AUDIO: 'عند إتمام إجراء تداول عام',
+			ORDERS_PARTIAL_AUDIO: 'عندما يتم تنفيذ أحد طلباتك جزئيًا',
+			ORDERS_PLACED_AUDIO: 'عندما يتم وضع طلب',
+			ORDERS_CANCELED_AUDIO: 'عندما يتم إلغاء الطلب',
+			ORDERS_COMPLETED_AUDIO: 'عندما يتم تنفيذ أحد طلباتك بالكامل',
+			CLICK_AMOUNTS_AUDIO: 'عند النقر على الكميات والأسعار في دفتر الطلبات',
+			GET_QUICK_TRADE_AUDIO: 'عند الحصول على عرض أسعار للتداول السريع',
+			SUCCESS_QUICK_TRADE_AUDIO: 'عندما يحدث تداول سريع ناجح',
+			QUICK_TRADE_TIMEOUT_AUDIO: 'عندما ينفذ وقت التداول السريع',
 		},
 		RISK_MANAGEMENT: {
 			INFO_TEXT:
-				'وقتی مقدار سفارش خرید و فروش بیش از درصد مشخصی از سبد معاملات شما می شود ، هشدار داده شود',
-			INFO_TEXT_1: 'ارزش کل دارایی در {0}:{1}',
-			PORTFOLIO: 'درصد سبد معاملات',
-			TOMAN_ASSET: 'ارزش تقریبی',
-			ADJUST: '(تنظیم درصد)',
-			ACTIVATE_RISK_MANAGMENT: 'مدیریت ریسک را فعال کنید',
-			WARNING_POP_UP: 'هشدارها',
+				'قم بإنشاء تحذير منبثق عندما تتجاوز قيمة طلب التداول نسبة مئوية محددة من محفظتك',
+			INFO_TEXT_1: 'إجمالي قيمة الأصول بعملة {0}: {1}',
+			PORTFOLIO: 'نسبة المحفظة',
+			TOMAN_ASSET: 'القيمة التقريبية',
+			ADJUST: '(ضبط النسبة المئوية)',
+			ACTIVATE_RISK_MANAGMENT: 'تفعيل إدارة المخاطر',
+			WARNING_POP_UP: 'النوافذ المنبثقة للتحذير',
 		},
 	},
 	TRANSACTION_HISTORY: {
-		TITLE: 'ناریخچه',
-		TITLE_TRADES: 'تاریخچه خرید و فروش',
-		TITLE_DEPOSITS: 'تاریخچه واریزی ها',
-		TITLE_WITHDRAWALS: 'تاریخچه برداشت ها',
-		TEXT_DOWNLOAD: 'دانلود تاریخچه',
-		TRADES: 'خریدو فروش',
-		DEPOSITS: 'واریزی ها',
-		WITHDRAWALS: 'برداشت ها',
+		TITLE: 'سجل',
+		TITLE_TRADES: 'سجل التداولات',
+		TITLE_DEPOSITS: 'سجل الودائع',
+		TITLE_WITHDRAWALS: 'سجل عمليات السحب',
+		TEXT_DOWNLOAD: 'سجل التحميل',
+		TRADES: 'التداولات',
+		DEPOSITS: 'الودائع',
+		WITHDRAWAL: 'عمليات السحب',
 	},
 	ACCOUNT_SECURITY: {
 		TITLE_TEXT:
-			'Adjust the security settings for your account. From Two-factor authentication, password, API keys and other security related functions.',
+			'اضبط إعدادات الأمان لحسابك. من المصادقة ذات العاملين ، وكلمة المرور ، ومفاتيح واجهة برمجة التطبيقات (API)، والوظائف الأخرى المتعلقة بالأمان.',
 		OTP: {
-			TITLE: 'رمز دو عاملی',
-			OTP_ENABLED: 'رمز یکبار مصرف را فعال کنید',
-			OTP_DISABLED: 'لطفا رمز دو عاملی را  فعال کنید',
+			TITLE: 'المصادقة ذات العاملين',
+			OTP_ENABLED: 'تمكين رقم السري المتغير',
+			OTP_DISABLED: 'يرجى تشغيل المصادقة ذات العاملين',
 			ENABLED_TEXTS: {
-				TEXT_1: 'هنگام ورود به سیستم ، به OTP نیاز دارید',
-				TEXT_2: 'هنگام برداشت وجوه به OTP نیاز دارید',
+				TEXT_1: 'طلب رقم السري المتغير عند تسجيل الدخول',
+				TEXT_2: 'طلب رقم السري المتغير عند سحب الأموال',
 			},
 			DIALOG: {
-				SUCCESS: 'شما OTP را با موفقیت فعال کرده اید',
-				REVOKE: 'شما OTP خود را با موفقیت غیرفعال کردید',
+				SUCCESS: 'لقد قمت بتنشيط  رقم السري المتغير بنجاح',
+				REVOKE: 'لقد قمت بإبطال رقم السري المتغير الخاص بك بنجاح',
 			},
 			CONTENT: {
-				TITLE: 'تأیید هویت دو عاملی را فعال کنید',
-				MESSAGE_1: 'اسکن Qrcode',
+				TITLE: 'تنشيط المصادقة ذات العاملين',
+				MESSAGE_1: 'مسح ضوئي',
 				MESSAGE_2:
-					' کد Qrcode را در زیر با نرم افزار Google Authenticator اسکن کنید تا به طور خودکار احراز هویت دو عاملی را در دستگاه خود تنظیم شود..',
+					'امسح رمز الاستجابة السريع أدناه باستخدام Google Authenticator أو Authy لإعداد المصادقة ذات العاملين تلقائيًا في جهازك.',
 				MESSAGE_3:
-					'اگر در اسکن مشکلی دارید ، می توانید کد زیر را به صورت دستی وارد کنید',
+					'إذا كنت تواجه مشكلات في مسح هذا ، فيمكنك إدخال الرمز يدويًا أدناه',
 				MESSAGE_4:
-					' این کد را در جایی مطمئن ذخیره کنید تا در صورت تغییر یا از بین رفتن تلفن همراهتان احراز هویت دوعاملی را به راحتی بازیابی کنید.',
-				MESSAGE_5: 'دستی',
-				INPUT: 'رمز یک بار ورود را وارد کنید',
+					'يجب عليك تخزين هذا الرمز بشكل آمن لاستعادة المصادقة ذات العاملين الخاص بك في حالة تغيير هاتفك المحمول أو فقده في المستقبل.',
+				MESSAGE_5: 'يدوي',
 				WARNING:
-					'اکیدا توصیه می کنیم رمز دو عاملی حساب خود را فعال کنید. این کار امنیت حساب شما را به طور قابل توجهی افزایش می دهد.',
-				ENABLE: 'رمز دو عاملی را فعال کنید',
-				DISABLE: 'غیر فعال کردن رمز دو عاملی',
-				SECRET_1: 'Enter yor secret key',
-				SECRET_2: 'Please enter your secret key to confirm you wrote it down.',
-				SECRET_3:
-					'This secret key will help you recover your account if you lost access to your phone.',
-				INPUT_1: 'Secret Key',
+					'نوصي بشدة بإعداد المصادقة اذات العاملين(2FA) .سيؤدي القيام بذلك إلى زيادة أمان أموالك بشكل كبير.',
 
-				TITLE_2: 'Enter One-Time Password (OTP)',
-				MESSAGE_6: 'Please enter your 6-digit one-time password below.',
-				INPUT_2: 'One-Time Password (OTP)',
+				ENABLE: 'مَكِّن المصادقة الثنائية',
+				DISABLE: 'تعطيل المصادقة ذات العاملين',
 			},
 			FORM: {
-				PLACEHOLDER: ' ارائه شده توسط Google Authenticator را وارد کنید',
-				BUTTON: 'فعال کردن رمز دو عاملی',
+				PLACEHOLDER: 'أدخل الرقم السري المتغير المقدم من Google Authenticator.',
+				BUTTON: 'تمكين المصادقة ذات العاملين',
 			},
 		},
 		CHANGE_PASSWORD: {
-			TITLE: 'نغییر رمز عبور',
+			TITLE: 'كلمة المرور',
 			ACTIVE: 'فعال',
 			DIALOG: {
-				SUCCESS: 'شما با موفقیت رمز عبورتان را تغییر دادید',
+				SUCCESS: 'لقد غيرت كلمة سرك بنجاح',
 			},
 			FORM: {
-				BUTTON: 'تغییر رمز عبور',
+				BUTTON: 'تغيير كلمة المرور',
 				CURRENT_PASSWORD: {
-					label: ' رمز عبور فعلی',
-					placeholder: 'رمز عبور کنونی خود را وارد کنید',
+					label: 'كلمة المرور الحالية',
+					placeholder: 'ادخل كلمة مرورك الحالية',
 				},
 				NEW_PASSWORD: {
-					label: 'رمز عبور جدید',
-					placeholder: 'یک رمز عبور جدید تایپ کنید',
+					label: 'كلمة المرور الجديدة',
+					placeholder: 'اكتب كلمة مرور جديدة',
 				},
 				NEW_PASSWORD_REPEAT: {
-					label: 'تایید رمز جدید',
-					placeholder: 'رمز عبور جدید خود را دوباره وارد کنید',
+					label: 'تأكيد كلمة المرور الجديدة',
+					placeholder: 'أعد كتابة كلمة المرور الجديدة',
 				},
 			},
 		},
 		LOGIN: {
-			TITLE: 'Login History',
+			TITLE: 'سجل تسجيل الدخول',
+			IP_ADDRESS: 'عنوان IP',
+			TIME: 'التاريخ / الوقت',
 			CONTENT: {
-				TITLE: 'Logins History',
+				TITLE: 'سجل عمليات تسجيل الدخول',
 				MESSAGE:
-					'Below is login history list with details IP, country and time details. If you see any suspicious activity you should change your password and contact support',
+					'يوجد أدناه قائمة محفوظات تسجيل الدخول مع تفاصيل IP والبلد والوقت. إذا رأيت أي عمليات مريبة، يجب عليك تغيير كلمة المرور والاتصال بالدعم',
 			},
 		},
 		FREEZE: {
-			TITLE: 'Freeze Account',
+			TITLE: 'تجميد الحساب',
 			CONTENT: {
 				MESSAGE_1:
-					'Freezing your account will stop whitdrawals and halts all tradings.',
-				WARNING_1:
-					'Use only if you fear that your account has been compromised',
-				TITLE_1: 'Freeze your Account',
-				TITLE_2: 'Account freezing',
+					'سيؤدي تجميد حسابك إلى إيقاف عمليات السحب وإيقاف جميع التداولات.',
+				WARNING_1: 'استخدم فقط إذا كنت تخشى أن يتم اختراق حسابك',
+				TITLE_1: 'جَمِّد حسابك',
+				TITLE_2: 'تجميد الحساب',
 				MESSAGE_2:
-					'Freezing your account may help guard your account from cyber attacks.',
-				MESSAGE_3:
-					'The following will occur if you choose to freeze your account:',
-				MESSAGE_4: '1. Pending withdrawals will be canceled.',
-				MESSAGE_5:
-					'2. All tradings will be halted and unfilled orders will be canceled.',
-				MESSAGE_6:
-					'3. Containing support will be required to reactivate your account.',
-				WARNING_2: 'Do you really want to freeze your account?',
+					'قد يساعد تجميد حسابك في حماية حسابك من الهجمات الإلكترونية.',
+				MESSAGE_3: 'سيحدث ما يلي إذا اخترت تجميد حسابك:',
+				MESSAGE_4: '1. سيتم إلغاء عمليات السحب التي في قيد الانتظار.',
+				MESSAGE_5: '2. سيتم إيقاف جميع التداولات وإلغاء الطلبات الغير منفذة.',
+				MESSAGE_6: '3. يلزم الاتصال بالدعم لإعادة تنشيط حسابك.',
+				WARNING_2: 'هل تريد حقًا تجميد حسابك؟',
 			},
 		},
 	},
-	CURRENCY: 'واحد پول',
+	CURRENCY: 'عملة',
 	TYPE: 'نوع',
 	TYPES_VALUES: {
-		market: 'بازار',
-		limit: 'محدود',
+		market: 'سوق',
+		limit: 'حد',
 	},
 	TYPES: [
-		{ value: 'market', label: 'بازار' },
-		{ value: 'limit', label: 'محدود' },
+		{ value: 'market', label: 'سوق' },
+		{ value: 'limit', label: 'حد' },
 	],
-	SIDE: 'طرف',
+	SIDE: 'جانب',
 	SIDES_VALUES: {
-		buy: 'حرید',
-		sell: 'فروش',
+		buy: 'الشراء',
+		sell: 'بيع',
+	},
+	SIDES_VERBS: {
+		buy: 'تم الشراء',
+		sell: 'تم البيع',
 	},
 	SIDES: [
-		{ value: 'حرید', label: 'حرید' },
-		{ value: 'فروش', label: 'فروش' },
-	],
+		{ value: 'buy', label: 'الشراء' },
+		{ value: 'sell', label: 'بيع' },
+	], // DO NOT CHANGE value, ONLY TRANSLATE label
 	DEFAULT_TOGGLE_OPTIONS: [
-		{ value: true, label: 'روشن' },
-		{ value: false, label: 'خاموش' },
+		{ value: true, label: 'تشغيل' }, // DO NOT CHANGE value, ONLY TRANSLATE label
+		{ value: false, label: ' إيقاف' }, // DO NOT CHANGE value, ONLY TRANSLATE label
 	],
-	SIZE: 'مفدار',
-	PRICE: 'قیمت',
-	FEE: 'کارمزد',
-	FEES: 'کارمزد',
-	LIMIT: 'محدود',
-	TIME: 'زمان',
-	TIMESTAMP: 'Timestamp',
-	MORE: 'بسشتر',
-	VIEW: 'مشاهده',
-	STATUS: 'وضعیت',
-	AMOUNT: 'مقدار',
-	COMPLETE: 'تکمیل',
-	PENDING: 'درحال انتظار',
-	REJECTED: 'مردود',
-	ORDERBOOK: 'کتاب سفارشات',
-	CANCEL: 'لغو',
-	CANCEL_ALL: 'لغو همه',
-	GO_TRADE_HISTORY: 'به تاریخچه معاملات بروید',
-	ORDER_ENTRY: 'ثبت سفارش',
-	TRADE_HISTORY: 'همه مبادلات',
-	CHART: 'نمودار قیمت',
-	ORDERS: 'سفارش های فعال من',
-	TRADES: 'مبادلات گذشته من',
-	RECENT_TRADES: 'سفارشات اخیر من', // ToDo
-	PUBLIC_SALES: 'فروش عمومی', // ToDo
-	REMAINING: 'باقی مانده',
-	FULLFILLED: '{0} % تکمیل شده',
-	FILLED: 'تکمیل', // new
-	LOWEST_PRICE: 'کمترین قیمت ({0})', // new
-	PHASE: 'پایه', // new
-	INCOMING: 'ورودی', // new
-	PRICE_CURRENCY: 'قیمت ({0})',
-	AMOUNT_SYMBOL: 'مقدار ({0})',
-	MARKET_PRICE: 'قیمت بازار',
-	ORDER_PRICE: 'قیمت سفارش',
-	TOTAL_ORDER: 'کل سفارش',
-	NO_DATA: 'اطلاعاتی وجود ندارد',
-	LOADING: 'بارگذاری',
+	SIZE: 'حجم',
+	PRICE: 'السعر',
+	FEE: 'مصاريف',
+	FEES: 'مصاريف',
+	LIMIT: 'حد',
+	TIME: 'وقت',
+	TIMESTAMP: 'الطابع الزمني',
+	MORE: 'أكثر',
+	VIEW: 'رؤية',
+	STATUS: 'حالة',
+	AMOUNT: 'كمية',
+	COMPLETE: 'كامل',
+	PENDING: 'قيد الانتظار',
+	REJECTED: 'مرفوض',
+	ORDERBOOK: 'دفتر الطلبات',
+	CANCEL: 'إلغاء',
+	CANCEL_ALL: 'إلغاء الكل',
+	GO_TRADE_HISTORY: 'إذهب الى سجل التداولات',
+	ORDER_ENTRY: 'ادخال الطلبية',
+	TRADE_HISTORY: 'history',
+	CHART: 'price chart',
+	ORDERS: 'my active orders',
+	TRADES: 'my transaction history',
+	RECENT_TRADES: 'my recent trades', // ToDo
+	ORDER_HISTORY: 'Order history',
+	PUBLIC_SALES: 'المبيعات العامة',
+	REMAINING: 'متبقي',
+	FULLFILLED: '{0}٪ مكتمل',
+	FILLED: 'مكتمل',
+	LOWEST_PRICE: 'أقل سعر ({0})',
+	PHASE: 'مرحلة',
+	INCOMING: 'واردة',
+	PRICE_CURRENCY: 'السعر',
+	AMOUNT_SYMBOL: 'المبلغ',
+	MARKET_PRICE: 'سعر السوق',
+	ORDER_PRICE: 'سعر الطلب',
+	TOTAL_ORDER: 'الطلب الكلي',
+	NO_DATA: 'لايوجد بيانات',
+	LOADING: 'جاري التحميل',
 	CHART_TEXTS: {
-		d: 'تاریخ',
-		o: 'شروع',
-		h: 'بالا',
-		l: 'پایین',
-		c: 'پایان',
-		v: 'حجم',
+		d: 'تاريخ',
+		o: 'فتح',
+		h: 'قمة',
+		l: 'القعر',
+		c: 'إغلاق',
+		v: 'الحجم',
 	},
-	QUICK_TRADE: ' خرید و فروش آسان',
-	PRO_TRADE: 'خرید و فروش حرفه ای',
-	ADMIN_DASH: 'صفحه مدیر',
-	WALLET_TITLE: 'کیف پول',
-	TRADING_MODE_TITLE: 'خرید و فروش',
-	TRADING_TITLE: 'خرید و فروش',
-	LOGOUT: 'خروج',
+	QUICK_TRADE: 'تداول سريع',
+	PRO_TRADE: 'تداول مهني',
+	ADMIN_DASH: 'صفحة الإدارة',
+	WALLET_TITLE: 'محفظة',
+	TRADING_MODE_TITLE: 'حالة التداول',
+	TRADING_TITLE: 'تداول',
+	LOGOUT: 'تسجيل الخروج',
 	WITHDRAWALS_MIN_VALUE_ERROR:
-		'تراکنش برای ارسال بسیار کوچک است. مقدار بیشتری را امتحان کنید.',
+		'المعاملة صغيرة جدًا بحيث غير قابلة للإرسال. جرب كمية أكبر.',
 	WITHDRAWALS_MAX_VALUE_ERROR:
-		'تراکنش برای ارسال بسیار بزرگ است. مقدار کمتری  را امتحان کنید.',
-	WITHDRAWALS_LOWER_BALANCE: 'شما برای انجام این معامله مبلغ {0} کافی ندارید',
-	WITHDRAWALS_FEE_TOO_LARGE: 'کارمزد بزرگتر از {0}% از این تراکنش است.',
+		'المعاملة كبيرة جدًا بحيث غير قابلة للإرسال. جرب كمية أقل.',
+	WITHDRAWALS_LOWER_BALANCE:
+		'ليس لديك ما يكفي من {0} في رصيدك لإرسال هذه المعاملة.',
+	WITHDRAWALS_FEE_TOO_LARGE: 'الرسوم أكثر من {0}٪ من إجمالي معاملتك.',
+
 	WITHDRAWALS_BTC_INVALID_ADDRESS:
-		'آدرس بیتکوین نامعتبر است لطفا با دقت آدرس را وارد کنید',
+		'عنوان البتكوين غير صالح. يرجى التحقق بعناية وإعادة الإدخال',
 	WITHDRAWALS_ETH_INVALID_ADDRESS:
-		'آدرس اتریوم اشتباه است. آدرس صحیح را وارد کنید.',
-	WITHDRAWALS_BUTTON_TEXT: 'مرور برداشت',
-	WITHDRAWALS_FORM_ADDRESS_LABEL: 'آدرس گیرنده',
-	WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER: 'آدرس را وارد کنید',
-	WITHDRAWALS_FORM_DESTINATION_TAG_LABEL: 'جزئیات انتقال (اختیاری)', // new
-	WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER: 'آدرس مقصد را تایپ کنید', // new
-	WITHDRAWALS_FORM_AMOUNT_LABEL: '{0} مقدار',
-	WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER:
-		'مقدار {0} را که می خواهید برداشت کنید تایپ کنید',
-	WITHDRAWALS_FORM_FEE_COMMON_LABEL: ' کارمزد معاملات',
-	WITHDRAWALS_FORM_FEE_FIAT_LABEL: 'کارمزد برداشت بانک',
+		'آعنوان الايثيريوم غير صالح. يرجى التحقق بعناية وإعادة الإدخال',
+	WITHDRAWALS_BUTTON_TEXT: 'مراجعة عمليات السحب',
+	WITHDRAWALS_FORM_ADDRESS_LABEL: 'عنوان الوجهة',
+	WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER: 'اكتب العنوان',
+	WITHDRAWALS_FORM_DESTINATION_TAG_LABEL: 'ملصق الوجهة (اختياري)', // new
+	WITHDRAWALS_FORM_MEMO_LABEL: 'مذكرة (اختياري)', // new
+	WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER: 'اكتب ملصق الوجهة', // new
+	WITHDRAWALS_FORM_MEMO_PLACEHOLDER: 'اكتب مذكرة المعاملة', // new
+	WITHDRAWALS_FORM_AMOUNT_LABEL: '{0} المبلغ المراد سحبه',
+	WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER: 'اكتب مبلغ {0} الذي ترغب في سحبه',
+	WITHDRAWALS_FORM_FEE_COMMON_LABEL: 'رسوم عملیات التحويل',
+	WITHDRAWALS_FORM_FEE_FIAT_LABEL: 'رسوم السحب من البنك',
 	WITHDRAWALS_FORM_FEE_PLACEHOLDER:
-		'مقدار {0} که میخواهید در این تراکنش استفاده کنید را وارد کنید',
-	WITHDRAWALS_FORM_FEE_OPTIMAL_VALUE: 'کارمزد مطلوب: {0} {1}', // TODO {0} -> amount {1} -> currency name
-	DEPOSITS_FORM_AMOUNT_LABEL: 'مبلغ',
-	DEPOSITS_FORM_AMOUNT_PLACEHOLDER:
-		'مقدار {0} را که می خواهید واریز کنید تایپ کنید',
-	DEPOSITS_BUTTON_TEXT: 'تایید',
-	DEPOSIT_PROCEED_PAYMENT: 'پرداخت',
+		'اكتب مبلغ {0} الذي ترغب في استخدامه في رسوم المعاملة',
+	WITHDRAWALS_FORM_FEE_OPTIMAL_VALUE: 'الرسوم الأمثل: {0} {1}', // TODO {0} -> amount {1} -> currency name
+	DEPOSITS_FORM_AMOUNT_LABEL: '{0} المبلغ المراد إيداعه',
+	DEPOSITS_FORM_AMOUNT_PLACEHOLDER: 'اكتب مبلغ {0} الذي ترغب في سحبه',
+	DEPOSITS_BUTTON_TEXT: 'مراجعة الإيداع',
+	DEPOSIT_PROCEED_PAYMENT: 'إدفع',
 	DEPOSIT_BANK_REFERENCE:
-		'برای شناسایی سپرده، این کد "{0}" را به تراکنش بانکی اضافه کنید',
-	DEPOSIT_METHOD: 'روش پرداخت',
-	DEPOSIT_METHOD_DIRECT_PAYMENT: 'کارت بانکی',
-	DEPOSIT_METHOD_DIRECT_PAYMENT_MESSAGE_1: 'به درگاه پرداخت کارت بانکی بروید.',
-	DEPOSIT_METHOD_DIRECT_PAYMENT_MESSAGE_2:
-		'برای پرداخت شما سایت  را ترک میکنید و پس از انجام تراکنش مجددا به سایت باز خواهی گشت',
-	DEPOSIT_VERIFICATION_WAITING_TITLE: 'تأیید پرداخت',
+		'أضف هذا الرمز "{0}" إلى المعاملة المصرفية لتحديد الإيداع',
+	DEPOSIT_METHOD: 'طريقة الدفع', //{} IS MISSED
+	DEPOSIT_METHOD_DIRECT_PAYMENT: 'بطاقة ائتمان',
+	DEPOSIT_METHOD_DIRECT_PAYMENT_MESSAGE_1:
+		'انتقل إلى طريقة الدفع ببطاقة الائتمان.',
+	DEPOSIT_METHOD_DIRECT_PAYMENT_MESSAGE_2: 'سوف تغادر المنصة لإجراء الدفع.',
+	DEPOSIT_VERIFICATION_WAITING_TITLE: 'التحقق من الدفع',
 	DEPOSIT_VERIFICATION_WAITING_MESSAGE:
-		'لطفا این صفحه را تا زمانی که پرداخت شما در حال تایید می باشد، نبندید ',
+		'الرجاء عدم إغلاق التطبيق أثناء التحقق من الدفع',
 	DEPOSIT_VERIFICATION_WARNING_MESSAGE:
-		'واریز شما در حال بررسی میباشد. به محض تایید، ایمیل تایید واریز برای شما ارسال می گردد و موجودی حساب شما در سیستم افزایش می یابد',
+		'إذا حدث خطأ ما في عملية التحقق ، يرجى الاتصال بنا.',
 	DEPOSIT_VERIFICATION_WARNING_INFORMATION:
-		'این شناسه عملیات است: "{0}" ، لطفا این شناسه را در اختیار ما قرار دهید تا به شما کمک کنیم.',
-	DEPOSIT_VERIFICATION_SUCCESS: 'پرداخت تأیید شد',
-	DEPOSIT_VERIFICATION_ERROR: 'خطا در پرداخت.',
-	DEPOSIT_VERIFICATION_ERROR_VERIFIED: 'این شناسه واریزی قبلاً تأیید شده است',
-	DEPOSIT_VERIFICATION_ERROR_STATUS: 'وضعیت نامعتبر',
+		'هذا هو معرف العملية: "{0}" ، يرجى تزويدنا بهذا المعرف لمساعدتك.',
+	DEPOSIT_VERIFICATION_SUCCESS: 'تم التحقق من الدفع',
+	DEPOSIT_VERIFICATION_ERROR: 'كان هناك خطأ في التحقق من الإيداع.',
+	DEPOSIT_VERIFICATION_ERROR_VERIFIED: 'تم التحقق من الإيداع سابقاً',
+	DEPOSIT_VERIFICATION_ERROR_STATUS: 'حالة غير صالحة',
 	DEPOSIT_VERIFICATION_ERROR_USER_MATCH:
-		' از کارتی که در پروفایل خود ثبت کرده اید ، اقدام به واریز وجه نقد نموده اید ، مبلغ مورد نظر  تایید نگردیده و  به کیف پول تومانی شما اضافه نشده است. چنانچه مبلغ از حساب بانکی شما کسر  گردیده است ، ظرف مدت حداکثر 72 ساعت به حساب شما عودت داده خواهد شد.',
-	QUOTE_MESSAGE: 'شما به {0} {1} {2} برای {3} {4}',
+		'البطاقة التي قمت بالإيداع معها ليست مماثلة لبطاقتك المسجلة. لذلك تم رفض إيداعك وسيتم استرداد أموالك في أقل من ساعة.',
+	QUOTE_MESSAGE: 'أنت ذاهب إلى {0} {1} {2} مقابل {3} {4}',
 	QUOTE_BUTTON: 'قبول',
-	QUOTE_REVIEW: 'بازبینی',
-	QUOTE_COUNTDOWN_MESSAGE: 'شما {0} ثانیه برای این تراکنش وقت دارید',
-	QUOTE_EXPIRED_TOKEN: 'اعتبار قیمت داده شده منقضی شده',
-	QUOTE_SUCCESS_REVIEW_TITLE: 'خرید و فروش آسان',
-	QUOTE_SUCCESS_REVIEW_MESSAGE: 'شما با موفقیت {0} {1} {2} برای {3} {4}', // you have successfully buy 1 btc from x toman
-	COUNTDOWN_ERROR_MESSAGE: 'شمارش معکوس به اتمام رسید.',
+	QUOTE_REVIEW: 'مراجعة',
+	QUOTE_COUNTDOWN_MESSAGE: 'لديك {0} ثواني لإجراء التداول',
+	QUOTE_EXPIRED_TOKEN: 'انتهت صلاحية رمز عرض السعر',
+	QUOTE_SUCCESS_REVIEW_TITLE: 'التداول السريع',
+	QUOTE_SUCCESS_REVIEW_MESSAGE: 'لقد نجحت في {0} {1} {2} لـ {3} {4}', // you have successfully buy 1 btc from x toman
+	COUNTDOWN_ERROR_MESSAGE: 'انتهى العد التنازلي',
 	WITHDRAW_PAGE: {
-		BANK_TO_WITHDRAW: 'نام بانک دریافت کننده',
-		MESSAGE_ABOUT_SEND: 'شما در آستانه ارسال',
+		BANK_TO_WITHDRAW: 'البنك المراد السحب إليه',
+		MESSAGE_ABOUT_SEND: 'أنت على وشك الإرسال',
 		MESSAGE_BTC_WARNING:
-			'لطفا از درست بودن آدرس خود اطمینان حاصل کنید {0} تراکنش ها غیر قابل بازگشت هستند.',
-		MESSAGE_ABOUT_WITHDRAW: 'شما در حال انجام انتقال به حساب بانکی خود هستید.',
-		MESSAGE_FEE: 'شامل کارمزد {0} ({1})',
-		MESSAGE_FEE_BASE: 'شامل کارمزد {0}',
+			'الرجاء التأكد من دقة هذا العنوان نظراً لأن عمليات نقل {0} لا رجعة فيها',
+		MESSAGE_ABOUT_WITHDRAW: 'أنت على وشك التحويل إلى حسابك المصرفي',
+		MESSAGE_FEE: 'يشمل رسوم المعاملات {0} ({1})',
+		MESSAGE_FEE_BASE: 'يشمل رسوم المعاملات {0}',
 		BASE_MESSAGE_1:
-			'شما فقط می توانید به مقصد حساب (های) بانکی خود که قبلا در حساب کاربری خود ثبت و تایید کرده اید پول برداشت نمایید',
-		BASE_MESSAGE_2: 'حداقل مقدار برداشت',
-		BASE_MESSAGE_3: 'محدودیت برداشت روزانه',
-		BASE_INCREASE_LIMIT: 'افزایش برداشت محدودیت روزانه',
-		CONFIRM_VIA_EMAIL: 'تایید از طریق ایمیل',
-		CONFIRM_VIA_EMAIL_1: 'ایمیل تایید برداشت برای شما ارسال شد',
-		CONFIRM_VIA_EMAIL_2: 'لطفا برای تایید برداشت و تکمیل فرایند ',
-		CONFIRM_VIA_EMAIL_3:
-			'حداکثر تا 5 دقیقه برداشت را از طریق ایمیل خود تایید کنید',
-		WITHDRAW_CONFIRM_SUCCESS_1: 'برداشت شما با موفقیت تایید و ارسال شد',
+			'يمكنك فقط السحب إلى حساب مصرفي باسم يطابق الاسم المسجل في حسابك.',
+		BASE_MESSAGE_2: 'الحد الأدنى للسحب',
+		BASE_MESSAGE_3: 'الحد الأقصى للسحب اليومي',
+		BASE_INCREASE_LIMIT: 'زوّد الحد اليومي الخاص بك',
+		CONFIRM_VIA_EMAIL: 'أكد عبر البريد الإلكتروني',
+		CONFIRM_VIA_EMAIL_1: 'لقد أرسلنا لك رسالة تأكيد بالبريد الإلكتروني للسحب.',
+		CONFIRM_VIA_EMAIL_2: 'من أجل استكمال عملية السحب يرجى التأكيد',
+		CONFIRM_VIA_EMAIL_3: 'السحب عبر بريدك الإلكتروني في غضون 5 دقائق.',
+		WITHDRAW_CONFIRM_SUCCESS_1:
+			'تم تأكيد طلب السحب الخاص بك. سيتم معالجتها قريبا.',
 		WITHDRAW_CONFIRM_SUCCESS_2:
-			'برای مشاهده ی برداشت های خود لطفا به قسمت برداشتها در تاریخچه ی مبادلات خود مراجعه کنید',
-		GO_WITHDRAWAL_HISTORY: 'برو به تاریخچه ی مبادلات',
+			'لعرض حالة السحب الخاصة بك ، يرجى زيارة صفحة سجل السحب الخاصة بك.',
+		GO_WITHDRAWAL_HISTORY: 'اذهب إلى تاريخ الانسحاب',
 	},
-	WALLET_BUTTON_BASE_DEPOSIT: 'واریز',
-	WALLET_BUTTON_BASE_WITHDRAW: 'برداشت',
-	WALLET_BUTTON_CRYPTOCURRENCY_DEPOSIT: 'دریافت',
-	WALLET_BUTTON_CRYPTOCURRENCY_WITHDRAW: 'ارسال',
-	AVAILABLE_TEXT: 'موجودی',
-	AVAILABLE_BALANCE_TEXT: 'موجودی قابل دسترس از {0} به مقدار: {1} {2}', // Available Bitcoin Balance: 2.6 BTC
-	BALANCE_TEXT: 'مقدار',
-	CURRENCY_BALANCE_TEXT: '{0} مقدار',
-	WALLET_TABLE_AMOUNT_IN: `مقدار در {0}`,
-	WALLET_TABLE_TOTAL: 'جمع کل',
-	WALLET_ALL_ASSETS: 'مجموع دارایی ها',
-	HIDE_TEXT: 'مخفی',
+	WALLET_BUTTON_BASE_DEPOSIT: 'الوديعة',
+	WALLET_BUTTON_BASE_WITHDRAW: 'سحب',
+	WALLET_BUTTON_CRYPTOCURRENCY_DEPOSIT: 'تلقى',
+	WALLET_BUTTON_CRYPTOCURRENCY_WITHDRAW: 'أرسل',
+	AVAILABLE_TEXT: 'متاح',
+	AVAILABLE_BALANCE_TEXT: 'الرصيد {0} المتاح: {1} {2}', // Available Bitcoin Balance: 2.6 BTC
+	BALANCE_TEXT: 'رصيد حساب',
+	CURRENCY_BALANCE_TEXT: 'رصيد {0} ',
+	WALLET_TABLE_AMOUNT_IN: `المبلغ بـ {0}`,
+	WALLET_TABLE_TOTAL: 'المجموع الكلي',
+	WALLET_ALL_ASSETS: 'جميع الأصول',
+	WALLET_DEPOSIT_USD:
+		'للإيداع / السحب بالعملة الورقية في بلدان مختلفة واستفسارات أخرى عن المحفظة {0}.', // new
+	WALLET_HIDE_ZERO_BALANCE: 'إخفاء الرصيد الصفري',
+	WALLET_ESTIMATED_TOTAL_BALANCE: 'إجمالي الرصيد المقدر',
+	WALLET_ASSETS_SEARCH_TXT: 'بحث',
+	HIDE_TEXT: 'إخفاء',
 	PAGINATOR_FORMAT: '{0} / {1}',
-	ORDERBOOK_SELLERS: 'فروشندگان',
-	ORDERBOOK_BUYERS: 'خریدارن',
-	ORDERBOOK_SPREAD: '{0} بازه', // 0 -> 660,000 T
+	ORDERBOOK_SELLERS: 'البائعين',
+	ORDERBOOK_BUYERS: 'المشترين',
+	ORDERBOOK_SPREAD: 'الفارغ {0}',
 	ORDERBOOK_SPREAD_PRICE: '{0} {1}', //// 0-> amount  1 -> symbol  600,000 T
-	CALCULATE_MAX: 'بیشترین',
-	DATEFIELD_TOOGLE_DATE_GR: 'تقویم جهانی',
-	VERIFICATION_WARNING_TITLE: 'اطلاعات بانکی خود را تأیید کنید',
+	CALCULATE_MAX: 'أقصى',
+	DATEFIELD_TOOGLE_DATE_GR: 'التقويم الميلادي',
+	VERIFICATION_WARNING_TITLE: 'التحقق من التفاصيل المصرفية الخاصة بك',
 	VERIFICATION_WARNING_MESSAGE:
-		'قبل از انصراف ، باید اطلاعات بانکی خود را تأیید کنید.',
-	ORDER_SPENT: 'خرج شده',
-	ORDER_RECEIVED: 'دریافت شده',
-	ORDER_SOLD: 'فروخته شده',
-	ORDER_BOUGHT: 'خریداری شده',
-	ORDER_AVERAGE_PRICE: ' قیمت میانگین',
-	ORDER_TITLE_CREATED: 'سفارش {0} با موفقیت انجام شد', // 0 -> buy / sell
-	ORDER_TITLE_FULLY_FILLED: 'سفارش {0} تکمیل شد', // 0 -> buy / sell
-	ORDER_TITLE_PARTIALLY_FILLED: 'قسمتی از سفارش {0} تکمیل شد', // 0 -> buy / sell
-	ORDER_TITLE_TRADE_COMPLETE: 'سفارش {0} {1} با موفقیت انجام شد', // 0 -> buy / sell
-	LOGOUT_TITLE: 'شما از حساب خارج شده اید',
-	LOGOUT_ERROR_TOKEN_EXPIRED: 'توکن قیمت دیگر اعتبار ندارد',
-	LOGOUT_ERROR_LOGIN_AGAIN: 'لطفا مجدد وارد شوید', // ip doesnt match
-	LOGOUT_ERROR_INVALID_TOKEN: 'لطفا دوباره وارد شوید',
-	LOGOUT_ERROR_INACTIVE: 'لطفا مجدد وارد شوید',
+		'قبل أن تقوم بالسحب ، تحتاج إلى التحقق من التفاصيل المصرفية الخاصة بك.',
+	ORDER_SPENT: 'اُنفِقَ',
+	ORDER_RECEIVED: 'مستلم',
+	ORDER_SOLD: 'تم البيع',
+	ORDER_BOUGHT: 'تم الشراء',
+	ORDER_AVERAGE_PRICE: 'تم الشراء',
+	ORDER_TITLE_CREATED: 'تم بنجاح إنشاء حد {0}',
+	ORDER_TITLE_FULLY_FILLED: 'تم تنفيذ طلب {0} بنجاح',
+	ORDER_TITLE_PARTIALLY_FILLED: 'اُنفِذَ طلب {0} جزئيًا',
+	ORDER_TITLE_TRADE_COMPLETE: 'طلب {0} {1} كان ناجحًا',
+	LOGOUT_TITLE: 'لقد تم تسجيل خروجك',
+	LOGOUT_ERROR_TOKEN_EXPIRED: 'انتهت صلاحية الرمز',
+	LOGOUT_ERROR_LOGIN_AGAIN: 'تسجيل الدخول مرة أخرى',
+	LOGOUT_ERROR_INVALID_TOKEN: 'رمز غير صالح',
+	LOGOUT_ERROR_INACTIVE: 'لقد تم تسجيل خروجك لأنك كنت غير نشط',
 	ORDER_ENTRY_BUTTON: '{0} {1}', // 0 -> buy/sell 1 -> btc/..
-	QUICK_TRADE_OUT_OF_LIMITS: 'سفارش شما خارج از محدوده است.',
-	QUICK_TRADE_TOKEN_USED: 'توکن معتبر نیست',
-	QUICK_TRADE_QUOTE_EXPIRED:
-		'اعتبار قیمت اعلام شده تمام شده. دوباره امتحان کنید.',
-	QUICK_TRADE_QUOTE_INVALID: 'قیمت اعلام شده اعتبار ندارد',
-	QUICK_TRADE_QUOTE_CALCULATING_ERROR: 'اشتباه در محاسبه قیمت',
-	QUICK_TRADE_ORDER_CAN_NOT_BE_FILLED: 'سفارش با این مقدار تکمیل نخواهد شد',
-	QUICK_TRADE_ORDER_NOT_FILLED: 'موجودی سایت کافی نیست',
-	QUICK_TRADE_NO_BALANCE: 'موجودی شما برای انجام این سفارش کافی نیست',
-	YES: 'بله',
-	NO: 'خیر',
-	NEXT: 'بعدی',
-	SKIP_FOR_NOW: 'بعدا وارد می کنم',
-	SUBMIT: 'ارائه',
-	RESUBMIT: 'ارائه مجدد',
-	VERIFICATION_NOTIFICATION_SKIP_TITLE: ' محدودیت دسترسی',
+	ORDER_ENTRY_ADVANCED: 'Advanced',
+	QUICK_TRADE_OUT_OF_LIMITS: 'حجم الطلب خارج الحدود',
+	QUICK_TRADE_TOKEN_USED: 'الرمز مستخدم سابقاً',
+	QUICK_TRADE_QUOTE_EXPIRED: 'انتهت صلاحية عرض الاسعار',
+	QUICK_TRADE_QUOTE_INVALID: 'العرض سعر غيرصالح',
+	QUICK_TRADE_QUOTE_CALCULATING_ERROR: 'خطأ في حساب عرض السعر',
+	QUICK_TRADE_ORDER_CAN_NOT_BE_FILLED: 'لا يمكن تنفيذ الطلب بالحجم الحالي',
+	QUICK_TRADE_ORDER_NOT_FILLED: 'لم يتم تنفيذ الطلب',
+	QUICK_TRADE_NO_BALANCE: 'رصيد غير كافٍ لأداء الطلب',
+	QUICK_TRADE_SUCCESS: 'نجاح!',
+	QUICK_TRADE_INSUFFICIENT_FUND: 'رصيد غير كاف',
+	QUICK_TRADE_INSUFFICIENT_FUND_MESSAGE:
+		'ليس لديك أموال كافية في محفظتك لإكمال هذه المعاملة.',
+	YES: 'نعم',
+	NO: 'لا',
+	NEXT: 'التالي',
+	SKIP_FOR_NOW: 'تخطي في الوقت الحالي',
+	SUBMIT: 'إرسال',
+	RESUBMIT: 'إعادة الإرسال',
+	VERIFICATION_NOTIFICATION_SKIP_TITLE: 'مستندات مفقودة!',
 	VERIFICATION_NOTIFICATION_SKIP_TEXT:
-		'لطفا در نظر داشته باشید که حساب کاربری شما تا زمانی که بارگذاری مدارک انجام و تایید نشده باشد با محدودیت همراه خواهد بود. شما می توانید به حساب کاربری خود رفته و اطلاعات مربوط به احراز هویت خود را در آنجا بارگذاری کنید.',
-	VERIFICATION_NOTIFICATION_SUCCESS_TITLE: 'موفق!',
+		'للحصول على حق التمكن الكامل إلى وظائف السحب والإيداع ، يجب عليك تقديم مستندات الهوية الخاصة بك على صفحة حسابك.',
+	VERIFICATION_NOTIFICATION_SUCCESS_TITLE: 'نجاح!',
 	VERIFICATION_NOTIFICATION_SUCCESS_TEXT:
-		'هنگامی که اطلاعات شما بررسی گردید، از طریق ایمیل به شما اطلاع می دهیم.',
-	VERIFICATION_NOTIFICATION_BUTTON: 'ورود به HollaEx',
-	ERROR_USER_ALREADY_VERIFIED: 'کاربر قبلا احراز هویت شده است',
-	ERROR_INVALID_CARD_USER: 'مقادیر وارد شده نادرست است',
-	ERROR_INVALID_CARD_NUMBER: 'شماره کارت نادرست است',
-	ERROR_LOGIN_USER_NOT_VERIFIED: 'کاربر احراز هویت نشده است',
-	ERROR_LOGIN_USER_NOT_ACTIVATED: 'حساب کاربری فعال نشده است',
-	ERROR_LOGIN_INVALID_CREDENTIALS: 'ایمیل یا رمز عبور اشتباه است',
-	SMS_SENT_TO: 'به {0} ارسال شد', // TODO check msg
+		'ستتلقى إشعارًا بالبريد الإلكتروني عندما تتم معالجة معلوماتك. يمكن أن تستغرق المعالجة عادةً من يوم إلى ثلاثة أيام.',
+	VERIFICATION_NOTIFICATION_BUTTON: 'انتقل الى البورصة',
+	ERROR_USER_ALREADY_VERIFIED: 'تم التحقق من المستخدم سابقاً',
+	ERROR_INVALID_CARD_USER: 'معلومات البنك أو البطاقة المقدمة غير صحيحة',
+	ERROR_INVALID_CARD_NUMBER: 'رقم البطاقة غير صالح',
+	ERROR_LOGIN_USER_NOT_VERIFIED: 'لم يتم التحقق من المستخدم',
+	ERROR_LOGIN_USER_NOT_ACTIVATED: 'لم يتم تنشيط المستخدم',
+	ERROR_LOGIN_INVALID_CREDENTIALS: 'أوراق الاعتماد(الوثائق) غير صحيحة',
+	SMS_SENT_TO: 'تم إرسال رسالة قصيرة إلى {0}', // TODO check msg
 	SMS_ERROR_SENT_TO:
-		'خطا در ارسال به {0}. لطفا صفحه را دوباره بارگذاری کنید و مجددا امتحان کنید.', // TODO check msg
-	WITHDRAW_NOTIFICATION_TRANSACTION_ID: 'شناسه تراکنش:', // TODO check msg
-	CHECK_ORDER: 'سفارش خود را تایید کنید',
+		'خطأ في إرسال رسالة قصيرة إلى {0}. يرجى تحديث الصفحة وحاول مرة أخرى.', // TODO check msg
+	WITHDRAW_NOTIFICATION_TRANSACTION_ID: 'معرّف المعاملة', // TODO check msg
+	CHECK_ORDER: 'تحقق وتأكد من طلبك',
 	CHECK_ORDER_TYPE: '{0} {1}', // 0 -> maker/limit  1 -> sell/buy
-	CONFIRM_TEXT: 'تایید',
-	GOTO_XHT_MARKET: 'به بازار معاملات XHT بروید', // new
-	INVALID_CAPTCHA: 'کپچا نادرست است',
-	NO_FEE: 'کاربردی ندارد',
-	SETTINGS_LANGUAGE_LABEL:
-		'انتخاب زبان (این گزینه شامل ایمیل های ارسالی از طرف HollaEx نیز می شود)',
-	SETTINGS_LANGUAGE_OPTIONS: LANGUAGES,
-	SETTINGS_ORDERPOPUP_LABEL: 'مشاهده منوی تایید سفارش',
+	CONFIRM_TEXT: 'أيِّد',
+	GOTO_XHT_MARKET: 'انتقل إلى سوق عملة XHT', // new
+	INVALID_CAPTCHA: 'كلمة التحقق غير صالحة',
+	NO_FEE: 'N/A',
+	SETTINGS_LANGUAGE_LABEL: 'تفضيلات اللغة (تشمل رسائل البريد الإلكتروني)',
+	SETTINGS_LANGUAGE_OPTIONS: LANGUAGES, //should not be changed
+	SETTINGS_ORDERPOPUP_LABEL: 'عرض نافذة تأكيد الطلب المنبثقة',
 	SETTINGS_ORDERPOPUP_OPTIONS: [
-		{ value: false, label: 'خیر' },
-		{ value: true, label: 'بله' },
+		{ value: false, label: 'لا' }, // DO NOT CHANGE value, ONLY TRANSLATE label
+		{ value: true, label: 'نعم' }, // DO NOT CHANGE value, ONLY TRANSLATE label
 	],
-	SETTINGS_THEME_LABEL: 'حالت پوسته سایت :', // TODO set right labels // ToDo
+	SETTINGS_THEME_LABEL: 'شكل واجهة المستخدم', // TODO set right labels // ToDo
 	SETTINGS_THEME_OPTIONS: [
-		{ value: 'white', label: 'روشن' },
-		{ value: 'dark', label: 'تیره' },
+		{ value: 'white', label: 'أبيض' }, // DO NOT CHANGE value, ONLY TRANSLATE label
+		{ value: 'dark', label: 'داكن' }, // DO NOT CHANGE value, ONLY TRANSLATE label
 	],
-	SETTING_BUTTON: 'ذخیره',
+	SETTING_BUTTON: 'حفظ',
 	STRING_WITH_PARENTHESIS: '{0} ({1})',
-	VERIFICATION_NO_WITHDRAW_TITLE: 'برداشت فعال نیست',
-	VERIFICATION_NO_WITHDRAW_MESSAGE: 'برداشت از حساب شما امکان پذیر نیست.',
-	UP_TO_MARKET: 'مطابق بازار',
-	VIEW_MY_FEES: 'مشاهده کارمزد', // new
+	VERIFICATION_NO_WITHDRAW_TITLE: 'عمليات السحب معطّلة',
+	VERIFICATION_NO_WITHDRAW_MESSAGE: 'تم تعطيل حسابك لعمليات السحب',
+	UP_TO_MARKET: 'تصل إلى السوق',
+	VIEW_MY_FEES: 'عرض الرسوم الخاصة بي', // new
 	DEVELOPER_SECTION: {
-		TITLE: 'برنامه نویسان',
+		TITLE: 'مفتاح واجهة برمجة التطبيقات(API)',
 		INFORMATION_TEXT:
-			'API امکاناتی از قبیل دسترسی به کیف پول و موجودی، مدیریت سفارشات و خرید و فروش ها، درخواست برداشت و همچنین اطلاعات بازار از جمله آخرین مبدلات، بازار و قیمت لحظه ای را فراهم می کند',
+			'توفر واجهة برمجة التطبيقات(API) وظائف مثل الحصول على أرصدة المحفظة وإدارة طلبات الشراء / البيع وطلب عمليات السحب بالإضافة إلى بيانات السوق مثل التداولات الأخيرة ودفتر الطلبات والمؤشر.',
 		ERROR_INACTIVE_OTP:
-			'برای ساختن کلید API شما باید رمز دو عاملی را فعال کنید.',
-		ENABLE_2FA: 'فعال سازی احراز رمز دو عاملی',
-		WARNING_TEXT: 'کلید خود را با دیگران به اشتراک نگذارید',
-		GENERATE_KEY: 'کلید API خود را بسازید',
-		ACTIVE: 'فعال',
-		INACTIVE: 'غیرفعال',
-		INVALID_LEVEL: 'برای دسترسی به این سرویس نیاز به سطح کاربری بالاتر دارید.', // TODO
+			'لإنشاء مفتاح واجهة برمجة التطبيقات (API) ، تحتاج إلى تمكين المصادقة ذات العاملين(2FA).',
+		ENABLE_2FA: 'تمكين المصادقة ذات العاملين(2FA)',
+		WARNING_TEXT:
+			'لا تشارك مفتاح واجهة برمجة التطبيقات (API) الخاص بك مع الآخرين.',
+		GENERATE_KEY: 'أنشئ مفتاح (API)',
+		ACTIVE: 'نشط',
+		INACTIVE: 'غير نشط',
+		INVALID_LEVEL:
+			'تحتاج إلى ترقية مستوى التحقق لتتمكن من الوصول إلى هذه الميزة', // TODO
 	},
 	DEVELOPERS_TOKENS_POPUP: {
-		GENERATE_TITLE: 'ساخت کلید',
+		GENERATE_TITLE: 'أنشئ مفتاح (API)',
 		GENERATE_TEXT:
-			'لطفا نام کلید API خود را تعیین کنید و پس از ایجاد آن ، در حفظ و نگهداری آن کوشا باشید و آن را در اختیار کسی قرار ندهید. در نظر داشته باشید شما نمی توانید کلید API خود را بازیابی نمایید.',
-		GENERATE: 'ساخت',
-		DELETE_TITLE: 'حذف کلید',
+			'يرجى تسمية مفتاح API الخاص بك والحفاظ على خصوصيته بعد إنشائه. لن تتمكن من استعادته مرة أخرى لاحقًا.',
+		GENERATE: 'أنشئ',
+		DELETE_TITLE: 'حذف مفتاح API',
 		DELETE_TEXT:
-			'آیا مطمئن هستید که میخواهید کلید API خود را پاک کنید؟ (توجه داشته باشید اگر کلید API خود را پاک نمایید ، غیر قابل بازیابی خواهد بود . گرچه هر زمان که بخواهید می توانید یک کلید جدیدایجاد کنید.)',
+			'يعد حذف مفتاح API الخاص بك أمراً لا رجوع فيه على الرغم من أنه يمكنك إنشاء مفتاح API جديد في أي وقت. هل تريد حذف مفتاح API الخاص بك؟',
 		DELETE: 'حذف',
-		FORM_NAME_LABEL: 'نام',
-		FORM_LABLE_PLACEHOLDER: 'نام کلید',
-		API_KEY_LABEL: 'کلید API',
-		SECRET_KEY_LABEL: 'کلید خصوصی',
-		CREATED_TITLE: 'کپی کلید API',
+		FORM_NAME_LABEL: 'اسم',
+		FORM_LABLE_PLACEHOLDER: 'اسم مفتاح API',
+		API_KEY_LABEL: 'مفتاح API',
+		SECRET_KEY_LABEL: 'مفتاح سري',
+		CREATED_TITLE: 'انسخ مفتاح API الخاص بك',
 		CREATED_TEXT_1:
-			'لطفا کلید خود را در جایی امن نگه داری کنید زیرا کلید در آینده قابل دسترس نخواهد بود.',
-		CREATED_TEXT_2: 'کلید خود را در جایی امن نگه داری کنید.',
+			'يرجى نسخ مفتاح API الخاص بك لأنه لن يكون من الممكن الوصول إليه في المستقبل.',
+		CREATED_TEXT_2: 'حافظ على خصوصية مفتاحك.',
 	},
 	DEVELOPERS_TOKENS_TABLE: {
-		NAME: 'نام',
-		API_KEY: 'کلید API',
-		SECRET: 'رمز',
-		CREATED: 'تاریخ ساخت',
-		REVOKE: 'لغو کردن',
-		REVOKED: 'لغو شده',
-		REVOKE_TOOLTIP: 'شما باید رمز دو عاملی خود را برای لغو کلید فعال کنید.', // TODO
+		NAME: 'اسم',
+		API_KEY: 'مفتاح API',
+		SECRET: 'سري',
+		CREATED: 'تاريخ الإنشاء',
+		REVOKE: 'إبطال',
+		REVOKED: 'إنْفَسَخَ',
+		REVOKE_TOOLTIP: 'يجب عليك تفعيل المصادقة ذات العاملين(2FA) لإلغاء الرمز', // TODO
 	},
 	CHAT: {
-		CHAT_TEXT: 'چت',
-		MARKET_CHAT: 'چت',
+		CHAT_TEXT: 'محادثة',
+		MARKET_CHAT: 'محادثة السوق',
 		CHAT_UNREAD: '{0} ({1})', // 0 -> CHAT_TEXT, 1 -> number
-		READ_MORE: 'بیشتر بخوانید',
-		SHOW_IMAGE: 'Show Image',
-		HIDE_IMAGE: 'Hide Image',
-		CHAT_MESSAGE_BOX_PLACEHOLDER: 'متن',
-		SIGN_UP_CHAT: 'ثبت نام چت',
-		JOIN_CHAT: 'نام کاربری چت',
-		TROLLBOX: 'ایموجی ({0})', // new
+		READ_MORE: 'اقرأ أكثر',
+		SHOW_IMAGE: 'إظهار الصورة',
+		HIDE_IMAGE: 'إخفاء الصورة',
+		CHAT_MESSAGE_BOX_PLACEHOLDER: 'رسالة',
+		SIGN_UP_CHAT: 'سجّل للدردشة',
+		JOIN_CHAT: 'تعيين اسم المستخدم للدردشة',
+		TROLLBOX: 'كشك الدردشة ({0})', // new
 	},
 	INVALID_USERNAME:
-		'طول نام کاربری باید بین 3 تا 15 حرف باید باشد. فقط از حروف انگلیسی کوچک، اعداد و کاراکتر underscore استفاده نمایید.',
+		'يجب أن يتراوح اسم المستخدم بين 3 و 15 حرفًا. يحتوي فقط على أحرف صغيرة وأرقام و حرف تسطير سفلي.',
 	USERNAME_TAKEN:
-		'نام کاربری انتخاب شده توسط شما، قبلا توسط دیگر کاربران انتخاب شده است، لطفا نام دیگری انتخاب نمایید. ',
-	USERNAME_LABEL: 'نام کاربری (جهت استفاده در چت)',
-	USERNAME_PLACEHOLDER: 'نام کاربری',
-	TAB_USERNAME: 'نام کاربری',
+		'وقد تم اتخاذ هذا الاسم المستخدم سابقاً. يرجى المحاولة مرة أخرى.',
+	USERNAME_LABEL: 'اسم المستخدم (للدردشة)',
+	USERNAME_PLACEHOLDER: 'اسم المستخدم',
+	TAB_USERNAME: 'اسم المستخدم',
 	USERNAME_WARNING:
-		'نام کاربری شما فقط یکبار می تواند تغییر یابد. لطفا در انتخاب نام کاربری خود دقت فرمایید.',
-	USERNAME_CANNOT_BE_CHANGED: 'نام کاربری نمی تواند تغییر یابد.',
-	UPGRADE_LEVEL:
-		'درخواست افزایش سطح دسترسی کاربری. (تنها برای افراد با حجم خرید و فروش بالا)',
+		'لا يمكن تغيير اسم المستخدم الخاص بك إلا مرة واحدة. يرجى التأكد من أن اسم المستخدم الخاص بك يكون مرغوب فيه.',
+	USERNAME_CANNOT_BE_CHANGED: 'لا يمكن تغيير اسم المستخدم',
+	UPGRADE_LEVEL: 'ترقية مستوى الحساب',
 	LEVELS: {
-		LABEL_LEVEL: 'سطح',
-		LABEL_LEVEL_1: 'میگوی کوچک (مبتدی) ',
-		LABEL_LEVEL_2: 'ماهی قرمز(عادی)',
-		LABEL_LEVEL_3: 'هشت پا (ویژه)',
-		LABEL_MAKER_FEE: 'کارمزد سفارش گذار',
-		LABEL_TAKER_FEE: 'کارمزد پذیرنده سفارش',
-		LABEL_BASE_DEPOSIT: 'محدودیت واریز روزانه تومانی',
-		LABEL_BASE_WITHDRAWAL: 'محدودیت برداشت روزانه تومانی',
-		LABEL_BTC_DEPOSIT: 'محدودیت واریز روزانه بیتکوین',
-		LABEL_BTC_WITHDRAWAL: 'محدودیت برداشت روزانه بیتکوین',
-		LABEL_ETH_DEPOSIT: 'محدودیت واریز روزانه اتریوم',
-		LABEL_ETH_WITHDRAWAL: 'محدودیت برداشت روزانه اتریوم',
-		LABEL_PAIR_MAKER_FEE: '{0} کارمزد سفارش گذار',
-		LABEL_PAIR_TAKER_FEE: '{0} کارمزد پذیرنده سفارش',
-		UNLIMITED: 'نامحدود',
-		BLOCKED: 'Disabled',
+		LABEL_LEVEL: 'مستوى',
+		LABEL_LEVEL_1: 'واحد',
+		LABEL_LEVEL_2: 'اثنين',
+		LABEL_LEVEL_3: 'ثلاثة',
+		LABEL_MAKER_FEE: 'رسوم صانع السوق',
+		LABEL_TAKER_FEE: 'رسوم متلقي الطلبات',
+		LABEL_BASE_DEPOSIT: 'الإيداع اليومي باليورو',
+		LABEL_BASE_WITHDRAWAL: 'سحب يومي من اليورو',
+		LABEL_BTC_DEPOSIT: 'إيداع البتكوين اليومي',
+		LABEL_BTC_WITHDRAWAL: 'سحب البيتكوين اليومي',
+		LABEL_ETH_DEPOSIT: 'إيداع الايثيريوم اليومي',
+		LABEL_ETH_WITHDRAWAL: 'سحب الايثيريوم اليومي',
+		LABEL_PAIR_MAKER_FEE: 'رسوم صانع السوق {0}',
+		LABEL_PAIR_TAKER_FEE: 'رسوم متلقي الطلبات {0}',
+		UNLIMITED: 'غير محدود',
+		BLOCKED: '0',
 	},
-	WALLET_ADDRESS_TITLE: 'ساخت کیف پول {0} ',
-	WALLET_ADDRESS_GENERATE: 'ساخت',
-	WALLET_ADDRESS_MESSAGE:
-		'با ساخت کیف پول، یک آدرس واریز و برداشت که تنها مخصوص شما است، ساخته می شود',
+	WALLET_ADDRESS_TITLE: 'أنشئ محفظة {0}  ',
+	WALLET_ADDRESS_GENERATE: 'أنشئ',
+	WALLET_ADDRESS_MESSAGE: 'عندما تنشئ محفظة ، فإنك تنشئ عنوان إيداع وسحب.',
 	WALLET_ADDRESS_ERROR:
-		'خطا در محاسبه آدرس، لطفا صفحه را رفرش کرده و دوباره تلاش کنید',
-	DEPOSIT_WITHDRAW: 'واریز/برداشت',
-	GENERATE_WALLET: ' ساخت کیف پول',
-	TRADE_TAB_CHART: 'نمودار',
-	TRADE_TAB_TRADE: 'خرید و فروش',
-	TRADE_TAB_ORDERS: 'سفارش ها',
-	TRADE_TAB_POSTS: 'Posts', // new
-	WALLET_TAB_WALLET: 'کیف پول',
-	WALLET_TAB_TRANSACTIONS: 'تراکنش ها',
-	RECEIVE_CURRENCY: 'دریافت {0}',
-	SEND_CURRENCY: 'برداشت {0}',
-	COPY_ADDRESS: ' کپی کردن آدرس',
-	SUCCESFUL_COPY: 'آدرس با موفقیت کپی شد!',
-	QUICK_TRADE_MODE: 'خرید و فروش آسان',
+		'خطأ في إنشاء العنوان ، يرجى التحديث والمحاولة مرة أخرى.',
+	DEPOSIT_WITHDRAW: 'إيداع / سحب',
+	GENERATE_WALLET: 'أنشئ المحفظة',
+	TRADE_TAB_CHART: 'جدول بياني',
+	TRADE_TAB_TRADE: 'تداول',
+	TRADE_TAB_ORDERS: 'الطلبات',
+	TRADE_TAB_POSTS: 'البوستات', // new
+	WALLET_TAB_WALLET: 'المحفظة',
+	WALLET_TAB_TRANSACTIONS: 'المعاملات',
+	RECEIVE_CURRENCY: 'تلقي {0}',
+	SEND_CURRENCY: 'إرسال {0}',
+	COPY_ADDRESS: 'نسخ العنوان',
+	SUCCESFUL_COPY: 'تم النسخ بنجاح!',
+	QUICK_TRADE_MODE: 'حالة التداول السريع',
 	JUST_NOW: 'الآن',
 	PAIR: 'زوج',
-	ZERO_ASSET: 'دارایی شما صفر می باشد',
-	DEPOSIT_ASSETS: 'واریز دارایی',
-	SEARCH_TXT: 'جستجو',
-	SEARCH_ASSETS: 'جستجوی دارایی',
-	TOTAL_ASSETS_VALUE: 'ارزش کل دارایی ها در {0}: {1}',
+	ZERO_ASSET: 'ليس لديك أي أصول',
+	DEPOSIT_ASSETS: 'أودع اصولاً',
+	SEARCH_TXT: 'بحث',
+	SEARCH_ASSETS: 'البحث في الأصول',
+	TOTAL_ASSETS_VALUE: 'إجمالي قيمة الأصول بعملة {0}: {1}',
 	SUMMARY: {
-		TITLE: 'خلاصه وضعیت',
-		TINY_PINK_SHRIMP_TRADER: 'کاربر مبتدی (میگوی کوچک)',
-		TINY_PINK_SHRIMP_TRADER_ACCOUNT: 'حساب کاربر مبتدی (میگوی کوچک)',
-		LITTLE_RED_SNAPPER_TRADER: 'کاربر عادی (ماهی قرمز)',
-		LITTLE_RED_SNAPPER_TRADER_ACCOUNT: 'حساب کاربر عادی (ماهی قرمز)',
-		CUNNING_BLUE_KRAKEN_TRADING: 'کاربر ویژه (هشت پا)',
-		CUNNING_BLUE_KRAKEN_TRADING_ACCOUNT: 'حساب کاربری ویژه (هشت پا)',
-		BLACK_LEVIATHAN_TRADING: 'کاربر حرفه ایی (نهنگ سیاه)',
-		BLACK_LEVIATHAN_TRADING_ACCOUNT: 'حساب کاربری حرفه ایی (نهنگ سیاه)',
-		URGENT_REQUIREMENTS: ' موارد ضروری',
-		TRADING_VOLUME: 'حجم معامله',
-		ACCOUNT_ASSETS: 'دارایی های حساب کاربری',
-		ACCOUNT_DETAILS: ' جزئیات حساب کاربری',
-		SHRIMP_ACCOUNT_TXT_1: 'آغاز ماجراجویی شما اینجاست!',
-		SHRIMP_ACCOUNT_TXT_2: 'برای متمایز شدن از سایرین به تلاش خود ادامه دهید.',
-		SNAPPER_ACCOUNT_TXT_1: ' مسیر زندگی خود را با تورم بازار بگذرانید',
+		TITLE: 'ملخص',
+		TINY_PINK_SHRIMP_TRADER: 'متداول الجمبري الوردي الصغير',
+		TINY_PINK_SHRIMP_TRADER_ACCOUNT: 'حساب تداول الجمبري الوردي الصغير',
+		LITTLE_RED_SNAPPER_TRADER: 'متداول النهّاش الأحمر الصغير',
+		LITTLE_RED_SNAPPER_TRADER_ACCOUNT: 'حساب تداول النهّاش الأحمر الصغير',
+		CUNNING_BLUE_KRAKEN_TRADING: 'متداول كراكن الازرق الماكر',
+		CUNNING_BLUE_KRAKEN_TRADING_ACCOUNT: 'حساب تداول كراكن الازرق الماكر',
+		BLACK_LEVIATHAN_TRADING: 'تداول ليفياثان الأسود',
+		BLACK_LEVIATHAN_TRADING_ACCOUNT: 'حساب تداول ليفياثان الأسود',
+		URGENT_REQUIREMENTS: 'متطلبات عاجلة',
+		TRADING_VOLUME: 'حجم التداول',
+		ACCOUNT_ASSETS: 'أصول الحساب',
+		ACCOUNT_DETAILS: 'تفاصيل الحساب',
+		SHRIMP_ACCOUNT_TXT_1: 'تبدأ رحلتك من هنا!',
+		SHRIMP_ACCOUNT_TXT_2:
+			'حافظ على صحة السباحة ، ستخرج قريبًا عن بقية المياه الضحلة',
+		SNAPPER_ACCOUNT_TXT_1: 'تهانينا على البقاء في مسارك خلال توّرم السوق.',
 		SNAPPER_ACCOUNT_TXT_2:
-			'با ادامه تلاش و مبارزه، به گنجینه دارایی های خود بیافزایید.',
+			'تقدم وحارب الموجة للحصول على المزيد من كنوز العملات الرقمية في المستقبل.',
 		KRAKEN_ACCOUNT_TXT_1:
-			'کسی که در میان طوفان ایستادگی کند، از سایرین متمایز خواهد شد.',
+			'من المرجح أن تكسر النكات أكثر من الهياكل ، هذه القشريات قد نجت من حصتها من العواصف!',
 		LEVIATHAN_ACCOUNT_TXT_1:
-			'اساتید واقعی ترید، فرصت های بازار را غنیمت شمرده و از آنها استفاده می نمایند.',
-		VIEW_FEE_STRUCTURE: 'جدول کارمزدها و سقف برداشت',
-		UPGRADE_ACCOUNT: ' ارتقا حساب کاربری',
-		ACTIVE_2FA_SECURITY: 'فعال سازی رمز دوعاملی',
-		ACCOUNT_ASSETS_TXT_1: 'خلاصه وضعیت دارایی های شما',
+			'وحش من الهاوية ، يرى من خلال العملات الرقمية إلى أعماق لا يسبر غورها ، سادة مياه منتصف الليل وموجات المد والجزر.',
+		VIEW_FEE_STRUCTURE: 'عرض تركيبة الرسوم وحدودها',
+		UPGRADE_ACCOUNT: 'حدّث الحساب',
+		ACTIVE_2FA_SECURITY: 'تفعيل أمن ذات العاملين',
+		ACCOUNT_ASSETS_TXT_1: 'المعروض هو ملخص لجميع الأصول الخاصة بك.',
 		ACCOUNT_ASSETS_TXT_2:
-			'نگهداری دارایی ها و مبادله بیشتر، به شما در ارتقا سطح کاربری و بهره مندی از مزایای آن کمک می نماید.',
+			'امتلاك كميات كبيرة من الأصول سيؤهلك لتحديث الحساب الذي يتضمن شارة فريدة ورسوم تداول أقل.',
 		TRADING_VOLUME_TXT_1:
-			'تاریخچه معاملات شما به {0} ، در پایان هر ماه برای هر یک از کوین های که معامله شده، محاسبه و نمایش داده می شود.',
+			'يتم عرض سجل حجم التداول الخاص بك بعملة {0} ويتم حسابه اسميًا في نهاية كل شهر من جميع أزواج التداول.',
 		TRADING_VOLUME_TXT_2:
-			'فعالیت تجاری بالا به شما امکان ارتقاء حساب را می دهد و سبب ارائه ویژگی های منحصر به فرد HollaEx برای  حساب کاربری شما می شود.',
+			'سيؤهلك نشاط التداول المرتفع لترقية الحساب الذي يمنحك شارة فريدة وامتيازات أخرى.',
 		ACCOUNT_DETAILS_TXT_1:
-			'سطح کاربری شما بیانگر میزان کارمزد و سقف برداشت شما می باشد.',
+			'يحدد نوع حسابك شارة حسابك ورسوم التداول والودائع وحدود السحب.',
 		ACCOUNT_DETAILS_TXT_2:
-			' تاریخ عضویت، میزان فعالیت و همچنین میزان دارایی های شما بر روی پلتفورم می باشد.',
+			'سيحدد عمر حساب التداول الخاص بك ومستوى النشاط ومبلغ أصول الحساب الإجمالي ما إذا كان حسابك مؤهلاً للترقية.',
 		ACCOUNT_DETAILS_TXT_3:
-			'حفظ سطح حساب کاربری شما نیازمند به فعالیت مداوم شما در بازار HollaEx است',
+			'يتطلب الحفاظ على مستوى حسابك تداولًا مستمرًا والحفاظ على قدر معين من الأصول المودعة.',
 		ACCOUNT_DETAILS_TXT_4:
-			'شرایط فوق بصورت دوره ای مورد ارزیابی قرار گرفته و در صورت عدم احراز این شرایط، سطح کاربری تنزل می یابد.',
-		REQUIREMENTS: 'ملزومات',
-		ONE_REQUIREMENT: 'فقط یک مورد:', // new
-		REQUEST_ACCOUNT_UPGRADE: 'درخواست افزایش سطح کاربری',
-		FEES_AND_LIMIT: '{0} جدول کارمزد های و محدودیت های هر سطح کاربری', // new
+			'سيحدث التخفيض الدوري للحسابات إذا لم يتم الحفاظ على النشاط والأصول.',
+		REQUIREMENTS: 'متطلبات',
+		ONE_REQUIREMENT: 'متطلب واحد فقط:', // new
+		REQUEST_ACCOUNT_UPGRADE: 'طلب ترقية الحساب',
+		FEES_AND_LIMIT: 'تركيب الرسوم والحد {0}', // new
 		FEES_AND_LIMIT_TXT_1:
-			'با تدبیر،اراده و سرعت وارد دنیای رمزارزها شده و به یاد داشته باشید که تنها با فرو رفتن در عمق دریا به گوهرهای آن دسترسی پیدا خواهید نمود.',
-		FEES_AND_LIMIT_TXT_2:
-			'هر حساب کاربری کارمزد و سقف واریز و برداشت منحصر به خود را دارد ، برای اطلاعات بیشتر به{0}مراجعه نمایید.',
-		DEPOSIT_WITHDRAWAL_ALLOWENCE: 'مقدار مجاز واریز و برداشت',
-		TRADING_FEE_STRUCTURE: 'ساختار کارمزد معاملات',
-		WITHDRAWAL: 'برداشت',
-		DEPOSIT: 'واریز',
-		TAKER: 'پذیرنده سفارش ',
-		MAKER: 'سفارش گذار',
-		WEBSITE: 'وبسایت',
-		VIP_TRADER_ACCOUNT_ELIGIBLITY: 'شایستگی ارتقا به حساب کاربری ویژه',
-		PRO_TRADER_ACCOUNT_ELIGIBLITY: 'شایستگی ارتقا به حساب کاربری حرفه ایی',
-		TRADER_ACCOUNT_ELIGIBILITY: ' داشتن شرایط سطح کاربری {0}',
-		NOMINAL_TRADING: 'مقدار نامی معامل',
-		NOMINAL_TRADING_WITH_MONTH: 'حجم معاملات ماه گذشته{0}',
-		ACCOUNT_AGE_OF_MONTHS: 'قدمت حساب کاربری{0}ماه',
-		TRADING_VOLUME_EQUIVALENT: '{0} {1} معادل حجم معاملات',
-		LEVEL_OF_ACCOUNT: ' {0} سطح حساب کاربری',
-		LEVEL_TXT_DEFAULT: 'توضیحات سطح خود را اینجا اضافه کنید',
+			'أن تصبح متداولاً للعملات المشفرة يمثل بداية جديدة. مسلحًا بالذكاء والإرادة والسرعة فقط من خلال المخاطرة والتداول ، سيسمح لك بتحديث حسابك.',
+		FEES_AND_LIMIT_TXT_2: 'كل حساب له رسومه الخاصة وحدود الإيداع والسحب.',
+		DEPOSIT_WITHDRAWAL_ALLOWENCE: 'مخصص الايداع و السحب',
+		TRADING_FEE_STRUCTURE: 'تركيب رسوم التداول',
+		WITHDRAWAL: 'سحب',
+		DEPOSIT: 'ايداع',
+		TAKER: 'متلقي الطلبات',
+		MAKER: 'صانع السوق',
+		WEBSITE: 'موقع الكتروني',
+		VIP_TRADER_ACCOUNT_ELIGIBLITY: 'أهلية ترقية حساب VIP Trader (متداول أعيان)',
+		PRO_TRADER_ACCOUNT_ELIGIBLITY: 'أهلية ترقية حساب المتداول المحترف',
+		TRADER_ACCOUNT_ELIGIBILITY: 'أهلية ترقية حساب مستوى {0} ',
+		NOMINAL_TRADING: 'التداول الاسمي',
+		NOMINAL_TRADING_WITH_MONTH: 'يستمر التداول الاسمي لـ {0}',
+		ACCOUNT_AGE_OF_MONTHS: 'عمر الحساب {0} شهر',
+		TRADING_VOLUME_EQUIVALENT: '{0} {1} ما يعادل حجم التداول',
+		LEVEL_OF_ACCOUNT: 'حساب مستوی {0}',
+		TITLE_OF_ACCOUNT: '{0} Account', // was not translated
+		LEVEL_TXT_DEFAULT: 'أضف وصف مستواك هنا',
 		LEVEL_1_TXT:
-			'سفر شما از اینجا آغاز می شود! برای به دست آوردن سود بیشتر می توانید به بررسی بازار بپردازید و همچنین با فعالیت بیشتر به کاهش کارمزد معاملات و استفاده از ویژگی های منحصر به فرد هر سطح کاربری بپردازید.', // new
+			'رحلتك تبدأ هنا أيها المتداول عملات المشفرة الشاب! للحصول على المكافآت ، يمكنك التحقق من هويتك وكذلك الحصول على حد إيداع وسحب أكبر مع رسوم تداول مخفضة.',
 		LEVEL_2_TXT:
-			'شما می توانید با ثبت حجم معاملات ماهانه 3000 دلار و یا داشتن متوسط بالانس 5000 توکن XHT به سطح 2 رسیده و از کارمزد های کمتر و سقف برداشت های بیشتر بهره مند گردید.', // new
+			'ببساطة تداول شهرياً بمبلغ يزيد عن 3000 دولار أمريكي أو مع رصيد يزيد عن 5000 XHT، إستمتع برسوم تداول أقل.',
 		LEVEL_3_TXT:
-			'اینجاست که همه چیز رنگ و بوی واقعی به خود می گیرد ! برای بهره مندی از کارمزد های کمتر و سقف برداشت های بیشتر ، حساب کاربری خود را احراز هویت کنید.', // new
+			'من هنا تبدأ المتعة! تمتع برسوم تداول مخفضة وحدود كبيرة للإيداع والسحب. للوصول إلى المستوى 3 ، يجب عليك إكمال التحقق.',
 		LEVEL_4_TXT:
-			'شما می توانید با ثبت حجم معاملات ماهانه 10،000 دلار و یا داشتن متوسط بالانس 10،000 توکن XHT به سطح 4 رسیده و از کارمزد های کمتر و سقف برداشت های بیشتر بهره مند گردید.', // new
+			'ببساطة تداول شهرياً بمبلغ يزيد عن 10,000 دولار أمريكي أو مع رصيد يزيد عن  XHT10,000، إستمتع برسوم تداول أقل.',
 		LEVEL_5_TXT:
-			'شما موفق شدید ! سطح کاربری 5 یک حساب کاربری ویژه است که ویژه اشخاصی که میخواهد اکسچنج راه انداری نمایند و یا کاربران سرویس Vault و HAP می باشد. از کارمزد صفر معاملات لذت ببرید.', // new
+			'لقد نجحت! حساب المستوى 5 هو حساب نادر فقط لمشغلي التبادل أو مستخدمي Vault أو برنامج شركاء هولا إكس (HAP). استمتع بحدود كبيرة واستمتع برسوم خالیة من رسوم صانع السوق.',
 		LEVEL_6_TXT:
-			'شما می توانید با ثبت حجم معاملات ماهانه 300،000 دلار و یا داشتن متوسط بالانس 100،000 توکن XHT به سطح 6 رسیده و از کارمزد های کمتر و سقف برداشت های بیشتر بهره مند گردید.', // new
+			'ببساطة تداول شهرياً بمبلغ يزيد عن 300,000 دولار أمريكي أومع رصيد يزيد عن 100,000 XHT ،استمتع برسوم تداول أقل و زيادة مبلغ السحب.',
 		LEVEL_7_TXT:
-			'شما می توانید با ثبت حجم معاملات ماهانه 500،000 دلار و یا داشتن متوسط بالانس 300،000 توکن XHT به سطح 7 رسیده و از کارمزد های کمتر و سقف برداشت های بیشتر بهره مند گردید.', // new
+			'ببساطة تداول شهريًا بمبلغ يزيد عن 500,000 دولار أمريكي أو مع رصيد يزيد عن  300,000 XHT  ، استمتع برسوم تداول أقل و زيادة مبلغ السحب.',
 		LEVEL_8_TXT:
-			'شما می توانید با ثبت حجم معاملات ماهانه 600،000 دلار و یا داشتن متوسط بالانس 400،000 توکن XHT به سطح 8 رسیده و از کارمزد های کمتر و سقف برداشت های بیشتر بهره مند گردید.', // new
+			'ببساطة تداول شهرياً بمبلغ يزيد عن 600,000 دولار أمريكي أو مع رصيد يزيد عن 400,000 XHT ، استمتع برسوم تداول أقل.',
 		LEVEL_9_TXT:
-			'شما می توانید با ثبت حجم معاملات ماهانه 2,000,000 دلار و یا داشتن متوسط بالانس 1,000،000 توکن XHT به سطح 9 رسیده و از کارمزد های کمتر و سقف برداشت های بیشتر بهره مند گردید.', // new
+			'ببساطة تداول شهريًا بمبلغ یزيد عن 2,000,000 دولار أمريكي أو مع رصيد يزيد عن 1,000,000 XHT ، استمتع برسوم تداول أقل.',
 		LEVEL_10_TXT:
-			'حساب کاربری سطح 10 ویژه کاربرانی که بازار گردانی میکنند ، می باشد و نه تنها کارمزد نمی دهند بلکه می تواننداز محل معاملات انجام شده، درآمد نیز کسب نمایند.', // new
-		CURRENT_TXT: 'فعلی',
+			'يكسبك حساب تداول الحوت المال مقابل صناعة السوق. للحصول على هذا الحساب الخاص ، يرجى التواصل معنا.',
+		CURRENT_TXT: 'الحالي',
 		TRADER_ACCOUNT_XHT_TEXT:
-			'حساب کاربری شما در دوره پیش فروش XHT ایجاد شده است و این به این معنی است که شما می توانید هر XHT را با قیمت 0.1 دلار خریداری نمایید.',
-		TRADER_ACCOUNT_TITLE: 'حساب - دوره پیش فروش', // new
-		HAP_ACCOUNT: 'حساب کاربری HAP', // new
+			'حسابك في فترة البيع المسبق لـعملة XHT ، وهذا يعني أنه يمكنك الحصول على عملة XHT مقابل 0.10 دولار لكل عملة واحدة من XHT. سيتم تحويل جميع الودائع إلى عملة XHT بمجرد تصفية المعاملة.',
+		TRADER_ACCOUNT_TITLE: 'الحساب - فترة ما قبل البيع', // new
+		HAP_ACCOUNT: 'حساب HAP (برنامج شركاء هولا إكس)', // new
 		HAP_ACCOUNT_TXT:
-			' شما دارای یک حساب کاربری تایید شده در برنامه HAP می باشید. اکنون می توانید برای هر شخصی که توسط شما به HollaEx پیوسته و در آن فعالیت می کند ، 10٪ سود کسب کنید.', // new
-		EMAIL_VERIFICATION: 'تأیید ایمیل', // new
-		DOCUMENTS: 'اسناد', // new
-		HAP_TEXT: 'برنامه HAP{0}', // new
-		LOCK_AN_EXCHANGE: 'مبادله را مسدود کنید {0}', // new
-		WALLET_SUBSCRIPTION_USERS: 'کاربران استفاده کننده از سرویس Vault {0}', // new
-		TRADE_OVER_XHT: 'خرید و فروش بیشتر از  {0} تومان', // new
-		TRADE_OVER_BTC: 'خرید و فروش بیشتر از  {0} بیتکوین', // new
-		XHT_IN_WALLET: '{0} XHT موجود در کیف پول', // new
-		REWARDS_BONUS: 'جوایز و پاداش ها', // new
-		COMPLETE_TASK_DESC:
-			'فعالیت های موجود را انجام دهید و جوایزی به ارزش بیش از 10،000 دلار کسب کنید.', // new
-		TASKS: 'وظایف', // new
-		MAKE_FIRST_DEPOSIT: 'بااولین واریز خود XHT دریافت کنید 1 ', // new
-		BUY_FIRST_XHT: 'بااولین خرید خود XHT دریافت کنید 5 ', // new
+			'حسابك هو حساب برنامج شركاء هولا إكس مثبَت. يمكنك الآن الحصول على مكافأة 10٪ لكل شخص تقوم بدعوته ويشتري عملة XHT.', // new
+		EMAIL_VERIFICATION: 'تأكيد بواسطة البريد الالكتروني', // new
+		DOCUMENTS: 'الوثائق', // new
+		HAP_TEXT: 'برنامج شركاء هولا إكس (HAP) {0}', // new
+		LOCK_AN_EXCHANGE: 'أتمم تبادلاً {0}', // new
+		WALLET_SUBSCRIPTION_USERS: 'مستخدمو الاشتراك في Vault {0}', // new
+		TRADE_OVER_XHT: 'تداول بمبلغ يزيد عن USDT {0}', // new
+		TRADE_OVER_BTC: 'تداول بمبلغ يزيد عن  BTC {0}', // new
+		XHT_IN_WALLET: '{0} XHT في المحفظة', // new
+		REWARDS_BONUS: 'المكافآت والجوائز', // new
+		COMPLETE_TASK_DESC: 'أكمل المهام واكسب مكافآت تزيد قيمتها عن 10,000 دولار.', // new
+		TASKS: 'مهام', // new
+		MAKE_FIRST_DEPOSIT: 'قم بعمل إيداعك الأول واحصل على 1 XHT', // new
+		BUY_FIRST_XHT: 'اشترِ XHT الأول واحصل على مكافأة قدرها 5 XHT', // new
 		COMPLETE_ACC_VERIFICATION:
-			'مشخصات حساب کاربری خود را کامل کنید و 20 XHT دریافت کنید', // new
-		INVITE_USER: 'دوستان خود را دعوت کرده و از کمیسیون خود لذت ببرید', // new
+			'أكمل عملية التحقق من الحساب واحصل على مكافأة قدرها 20 XHT', // new
+		INVITE_USER: 'قم بدعوة المستخدمين واستمتع بعمولات من تداولاتهم', // new
 		JOIN_HAP:
-			'به برنامه واسط(HAP) بپیوندید و برای هر نسخه HollaEx kit که می فروشید ، 10٪ درآمد کسب کنید', // new
-		EARN_RUNNING_EXCHANGE: 'برای اجرای مبادله شخصی خود درآمد جداگانه کسب کنید', // new
-		XHT_WAVE_AUCTION: ' موج حراجی XHT ', // new
-		XHT_WAVE_DESC_1: 'توزیع توکن HollaEx (XHT) از طریق موج حراجی انجام می شود.', // new
+			'انضم إلى HAP (برنامج شركاء هولا إكس) واكسب 10٪ على كل مجموعة أدوات هولاإكس تبيعها.', // new
+		EARN_RUNNING_EXCHANGE: 'احصل على دخلاً سلبياً مع تشغيل البورصة الخاصة بك', // new
+		XHT_WAVE_AUCTION: 'بيانات مزادات موجات  XHT', // new
+		XHT_WAVE_DESC_1: 'يتم توزيع عملة هولاإكس (XHT) من خلال موجات من المزادات.', // new
 		XHT_WAVE_DESC_2:
-			'موج حراجی یک مقدار تصادفی XHT را در مواقع تصادفی به بالاترین پیشنهاد دهنده در سفارسات موجود می فروشد', // new
-		XHT_WAVE_DESC_3:
-			'در زیر اطلاعات مربوط به تاریخچه موج حراجی نمایش داده می شود', // new
-		WAVE_AUCTION_PHASE: 'مراحل موج حراجی {0}', // new
-		LEARN_MORE_WAVE_AUCTION: 'درباره موج حراجی بیشتر بدانید', // new
-		WAVE_NUMBER: 'شماره موج', // new
-		DISCOUNT: '( {0}% تخفیف )', // new
-		MY_FEES_LIMITS: ' کارمزدها و محدودیت ها', // new
+			'تبيع مزاد الموجة كمية عشوائية من عملة XHT في أوقات عشوائية لأعلى مزايدين في دفتر الطلبات', // new
+		XHT_WAVE_DESC_3: 'يعرض أدناه البيانات التاريخية في سجل مزادات الموجة.', // new
+		WAVE_AUCTION_PHASE: 'مرحلة المزاد الموجي {0}', // new
+		LEARN_MORE_WAVE_AUCTION: 'تعرف على المزيد حول المزاد الموجي', // new
+		WAVE_NUMBER: 'رقم الموجة', // new
+		DISCOUNT: '({0}٪ خصم)', // new
+		MY_FEES_LIMITS: 'رسوماتي و حدودي', // new
+		MARKETS: 'أسواق', // new
+		CHANGE_24H: 'التغييرات في 24 ساعة', // new
+		VOLUME_24H: 'الحجم في 24 ساعة', // new
+		PRICE_GRAPH_24H: 'الرسم البياني للأسعار في 24 ساعة', // new
+		VIEW_MORE_MARKETS: 'عرض المزيد من الأسواق', // new
 	},
 	REFERRAL_LINK: {
-		TITLE: ' دوست خود را دعوت کنید', // new
+		TITLE: 'ادعو صديقك', // new
 		INFO_TEXT:
-			'با ارائه این لینک به دوستان خود و  ثبت نام آنها از طریق لینک ارائه شده، دوستان شما {0} % تخفیف دریافت می کنند.', // new
-		INFO_TEXT_1:
-			'{0}%  از معاملات صورت گرفته توسط افرادی که از طریق لینک ارسالی شما به اقدام به ثبت نام نموده اند ، ماهانه به حساب شما واریز می شود.', // new
-		COPY_FIELD_LABEL:
-			'لینک زیر را با دوستان خود به اشتراک بگذارید و کمیسیون کسب کنید:', // new
-		REFERRED_USER_COUT: 'شما کاربران {0} را دعوت کرده اید', // new
-		COPY_LINK_BUTTON: 'کپی لینک دعوت نامه', // new
-		XHT_TITLE: 'دعوت نامه من', // new
-		XHT_INFO_TEXT: 'با دعوت از دوستان خود کمیسیون کسب کنید.', // new
-		XHT_INFO_TEXT_1: 'کمیسیون به طور دوره ای به کیف پول شما پرداخت می شود', // new
-		APPLICATION_TXT:
-			'برای تبدیل شدن به یک انتشار دهنده کیت HollaEx لطفاً درخواست خود را پر کنید.', // new
-		TOTAL_REFERRAL: 'مجموع خرید های انجام شده از معارفه های شما:', // new
-		PENDING_REFERRAL: 'حق کمیسیون های در انتظار:', // new
-		EARN_REFERRAL: 'کمیسیون های کسب شده:', // new
+			'قم بإحالة أصدقائك من خلال إعطاء هذا الرابط واحصل على مزايا من خلال تأهيل أشخاص آخرين.',
+		COPY_FIELD_LABEL: 'شارك الرابط أدناه مع أصدقائك واكسب عمولات:', // new
+		REFERRED_USER_COUT: 'لقد قمت بإحالة {0} من ائمستخدمين', // new
+		COPY_LINK_BUTTON: 'انسخ رابط الإحالة', // new
+		XHT_TITLE: 'إحالاتي', // new
+		XHT_INFO_TEXT: 'اكسب عمولات بدعوة أصدقائك.', // new
+		XHT_INFO_TEXT_1: 'يتم دفع العمولات بشكل دوري إلى محفظتك', // new
+		APPLICATION_TXT: 'لكي تصبح موزعًا لمجموعة أدوات هولاإكس ، يرجى ملئ الطلب.', // new
+		TOTAL_REFERRAL: 'إجمالي المشتريات من الإحالات:', // new
+		PENDING_REFERRAL: 'العمولات التي في قيد الانتظار:', // new
+		EARN_REFERRAL: 'العمولات المكتسبة:', // new
 		XHT_COUNT: '{0} XHT', // new
-		APPLY_BUTTON: 'درخواست دادن', // new
+		APPLY_BUTTON: 'قدم طلباً', // new
 	},
 	STAKE_TOKEN: {
-		TITLE: 'سهام توکن HollaEx', // new
+		TITLE: 'حصِّص عملة هولاإكس (XHT) ', // new
 		INFO_TXT1:
-			'توکن HollaEx (XHT).برای اجرای نرم افزار تبادل HollaEx نیازمند وثیقه(staked) است.', // new
+			'يجب أن تكون عملات هولاإكس (XHT) مضمونة (مدعومة) لتشغيل برنامج مجموعة أدوات بورصة هولاإكس.', // new
 		INFO_TXT2:
-			'می توانید توکن HollaEx خود را با روشی یکسان تضمین کنید و XHT را که در موج حراجی فروخته نشده است را کسب کنید.', // new
+			'يمكنك ضمانة عملة هولاإكس الخاصة بك بطريقة مماثلة وكسب عملة XHT التي لم يتم بيعها خلال مزادات الموجة.', // new
 		INFO_TXT3:
-			'به dash.bitholla.com بروید ، مبادله شخصی خود را اتضمین کنید و XHT رایگان کسب کنید', // new
-		BUTTON_TXT: 'اطلاعات بیشتر', // new
+			'ما عليك سوى الانتقال إلى dash.bitholla.com وإضمان البورصة الخاصة بك اليوم واكتسب عملة XHT مجانًا', // new
+		BUTTON_TXT: 'اكتشف المزيد', // new
 	},
 	TERMS_OF_SERVICES: {
 		// new
-		TITLE: 'توافق نامه خرید توکن HollaEx',
-		SERVICE_AGREEMENT: AGREEMENT,
-		PROCEED: 'اقدامات',
-		AGREE_TERMS_LABEL: 'من توافقنامه خرید توکن HollaEx را خوانده ام و موافقم',
-		RISK_INVOLVED_LABEL: 'من خطرات ناشی از آن را درک می کنم',
-		DOWNLOAD_PDF: 'PDF دریافت فایل',
-		DEPOSIT_FUNDS:
-			'برای به دست آوردن توکن HollaEx (XHT) وجوه خود را به کیف پول خود واریز کنید.',
-		READ_FAG: ' سؤالات متداول HollaEx {0}',
-		READ_DOCUMENTATION: 'گزارشات HollaEx را اینجا بخوانید: {0}',
-		READ_WAVES: 'قوانین مربوط به موج حراج عمومی دسامبر پیش رو{0}', // new
-		DOWNLOAD_BUY_XHT:
-			'PDF را دریافت کنید تا یک نمای مرحله به مرحله از فرایند را ببینید{0}',
-		HOW_TO_BUY: 'نحوه خرید توکن HollaEx (XHT)',
-		PUBLIC_SALES: ' موج حراجی عمومی', // new
+		TITLE: 'اتفاقية شراء عملة هولاإكس',
+		SERVICE_AGREEMENT: AGREEMENT, //إتفاقية
+		PROCEED: 'تقدم',
+		AGREE_TERMS_LABEL: 'لقد قرأت و وافقت على اتفاقية شراء عملة هولاإكس',
+		RISK_INVOLVED_LABEL: 'أنا أدرك المخاطر التي تنطوي عليها',
+		DOWNLOAD_PDF: 'قم بتنزيل ملف PDF',
+		DEPOSIT_FUNDS: 'قم بإيداع الأموال في محفظتك للحصول على عملة هولاإكس (XHT)',
+		READ_FAG: 'اقرأ الأسئلة الشائعة لـ هولاإكس هنا: {0}',
+		READ_DOCUMENTATION: 'اقرأ المستند التقني لهولاإكس هنا: {0}',
+		READ_WAVES: 'قواعد مزاد الموجة العامة لشهر ديسمبر المقبل {0}', // new
+		DOWNLOAD_BUY_XHT: 'قم بتنزيل ملف PDF للاطلاع على الدليل البصري على {0}',
+		HOW_TO_BUY: 'كيفية شراء عملة هولاإكس (XHT)',
+		PUBLIC_SALES: 'مزاد الموجة العام', // new
 		CONTACT_US:
-			'برای اطلاعات بیشتر و در صورت داشتن هرگونه مشکل از طریق ارسال ایمیل به ما در تماس باشید. {0}',
-		VISUAL_STEP: 'یک نمای مرحله به مرحله از فرایند را مشاهده کنید {0}', // new
+			'لا تتردد في الاتصال بنا للحصول على مزيد من المعلومات وأي مشكلات عن طريق إرسال بريد إلكتروني إلينا إلى {0}',
+		VISUAL_STEP: 'شاهد الدليل البصري على {0}', // new
 		WARNING_TXT:
-			'ما درخواست شما را بررسی خواهیم کرد و دستورالعمل های بیشتر در مورد نحوه دسترسی به صرافی HollaEx را به ایمیل شما ارسال خواهیم کرد.', // new
+			'سنراجع طلبك ونرسل مزيدًا من الإرشادات إلى بريدك الإلكتروني حول كيفية الوصول إلى بورصة هولاإكس.', // new
 		WARNING_TXT1:
-			'در این مدت می توانید خود را با شبکه HollaEx از طریق منابع زیر آشنا کنید', // new
-		XHT_ORDER_TXT_1: 'برای شروع خرید و فروش توکن HollaEx (XHT) باید وارد شوید', // new
-		XHT_ORDER_TXT_2:
-			'توکن HollaEx از طریق موج حراجی توزیع می شود که در یک زمان تصادفی، روزانه  مقداری  توکن HollaEx را به بالاترین پیشنهاد دهنده سفارشات فروخته می شود .', // new
-		XHT_ORDER_TXT_3: '{0}برای پیوستن به موج ها یا{1}', // new
+			'في غضون ذلك ، يمكنك التعرف على شبكة هولاإكس باستخدام الموارد أدناه', // new
+		XHT_ORDER_TXT_1: 'لبدء التداول يجب عليك تسجيل الدخول', // new
+		XHT_ORDER_TXT_2: '', // new
+		XHT_ORDER_TXT_3: '{0} أو {1}', // new
 		XHT_TITLE: 'XHT', //new
-		XHT_TRADE_TXT_1: 'برای دیدن معاملات اخیر خود وارد شوید', //new
-		XHT_TRADE_TXT_2:
-			'{0}می توانید برای دیدن تاریخچه معاملات اخیر خود داشته باشید', //new
-		LOGIN_HERE: 'اینجا وارد شوید',
+		XHT_TRADE_TXT_1: 'قم بتسجيل الدخول لترى تداولاتك الأخيرة', //new
+		XHT_TRADE_TXT_2: 'يمكنك {0} الاطلاع على تاريخ تداولات الحديثة الخاصة بك', //new
+		LOGIN_HERE: 'تسجيل الدخول هنا',
 	},
 	WAVES: {
 		// new
-		TITLE: 'اطلاعات موج',
-		NEXT_WAVE: 'موج بعدی',
-		WAVE_AMOUNT: 'مقدار موجود موج',
-		FLOOR: 'کف',
-		LAST_WAVE: 'آخرین موج',
+		TITLE: 'معلومات الموجة',
+		NEXT_WAVE: 'الموجة المقبلة',
+		WAVE_AMOUNT: 'الحجم في الموجة',
+		FLOOR: 'الأرض',
+		LAST_WAVE: 'الموجة الأخيرة',
 	},
 	TYPES_OF_POSTS: {
 		// new
-		TITLE: 'اطلاعیه ها',
-		ANNOUNCEMEN: 'اعلان ها',
-		SYSTEM_UPDATE: 'بروز رسانی سیستم',
-		LAST_WAVE: 'آخرین موج',
+		TITLE: 'البوستات',
+		ANNOUNCEMEN: 'إعلان',
+		SYSTEM_UPDATE: 'تحديث النظام',
+		LAST_WAVE: 'الموجة الأخيرة',
 		ANNOUNCEMENT_TXT:
-			'XHT رایگان به کلیه کیف پولهایی که توزیع می شود اعمال می شوند',
-		SYSTEM_UPDATE_TIME: 'Time: 12:31 PM, December 19th, 2019	',
-		SYSTEM_UPDATE_DURATION: '1 hour',
+			'سيتم توزيع عملة  XHTالمجاني على جميع المحافظ التي تنطبق عليها',
+		SYSTEM_UPDATE_TIME: 'الوقت: 12:31 ظهرًا ، 19 ديسمبر 2019	',
+		SYSTEM_UPDATE_DURATION: '1 ساعة',
 		LAST_WAVE_AMOUNT: '100, 213 XHT',
 		LAST_WAVE_REDISTRIBUTED: ' 11, 211',
-		LAST_WAVE_TIME: ' 12: 31 PM, December 19th, 2019',
+		LAST_WAVE_TIME: '12:31 مساءً ، 19 ديسمبر 2019',
 	},
-	USER_LEVEL: 'سطح کاربری', // new
-	LIMIT_AMOUNT: 'مقدار محدود', // new
-	FEE_AMOUNT: 'مقدار کارمزد', // new
-	COINS: 'Coins', // new
-	PAIRS: 'Pairs', // new
-	NOTE_FOR_EDIT_COIN:
-		'توجه: برای حذف و اضافه کردن {0} لطفاً مراجعه کنید به {1}', // new
-	REFER_DOCS_LINK: 'اسناد', // new
+	USER_LEVEL: 'مستوى المستخدم', // new
+	LIMIT_AMOUNT: 'مبلغ الحد', // new
+	FEE_AMOUNT: 'مبلغ الرسوم', // new
+	COINS: 'عملات', // new
+	PAIRS: 'أزواج', // new
+	NOTE_FOR_EDIT_COIN: 'ملاحظة: لإضافة وإزالة {0} يرجى الرجوع إلى {1}.', // new
+	REFER_DOCS_LINK: 'الوثائق', // new
 	RESTART_TO_APPLY:
-		'برای اعمال این تغییرات ، باید مبادله خود را مجدداً راه اندازی کنید.', // new
+		'تحتاج إلى إعادة تشغيل البورصة الخاص بك لتطبيق هذه التغييرات.', // new
 	TRIAL_EXCHANGE_MSG:
-		'شما از نسخه آزمایشی {0}  استفاده می کنید که طی روز {1} منقضی می شود.', // new
+		'أنت تستخدم إصدار إختباري من {0} وستنتهي صلاحيته في غضون {1} يوم.', // new
 	EXPIRY_EXCHANGE_MSG:
-		'مبادله شما منقضی شده است برای فعال کردن دوباره آن به dash.bitholla.com بروید.', // new
-	EXPIRED_INFO_1: 'نسخه آزمایشی HollaEx شما به پایان رسید.', // new
-	EXPIRED_INFO_2: 'مبادله خود را مجدد فعال کنید.', // new
-	EXPIRED_BUTTON_TXT: 'مبادله فعال', // new
+		'انتهت صلاحية بورصتك. انتقل إلى dash.bitholla.com لتنشيطها مرة أخرى.', // new
+	EXPIRED_INFO_1: 'انتهت الفترة الإختبارية الخاصة بك.', // new
+	EXPIRED_INFO_2: 'إضمن البورصة لتنشيطها مرة أخرى.', // new
+	EXPIRED_BUTTON_TXT: 'تنشيط البورصة', // new
 	TRADE_POSTS: {
 		// new
-		ANNOUNCEMENT: 'اعلان ها',
+		ANNOUNCEMENT: 'إعلان',
 		ANNOUNCEMNT_TXT_3:
-			'راه اندازی عمومی و موج حراجی در اول ژانویه سال 2020 تنظیم شده است. سپرده کیف پول و برداشت ها اکنون باز است.',
+			'تمت إعادة جدولة الإطلاق العام ومزاد الموجة إلى 1 يناير 2020. ودائع وسحب المحفظة مفتوحة الآن.',
 		ANNOUNCEMNT_TXT_4:
-			'سال نو مبارک؛ ما از سال 2020 با همراهی شما در تلاشیم با ارائه یک بازار باز، مارکت جدیدی را تولید می کنیم.',
+			'كل عام وأنتم بخيريا عميلين هولاإكس. نحن نحقق إنجازاً جديداً بدءًا من عام 2020 مع إطلاق منصة التداول الأكثر شفافيةً بمساعدتكم جميعًا.',
 		ANNOUNCEMNT_TXT_1:
-			'با معرفی دوستان خود به hollaex.com ، با برنامه واسط hollaEX (HAP) درآمدزایی کنید.',
-		DEFAULT_ANNOUNCEMENT:
-			'در این صفحه اطلاعیه های عمومی در مورد اکسچنج شما نمایش داده می شود! {0}',
+			'اكسب عملة XHT مع برنامج HAP (برنامج شركاء هولاإكس) من خلال تقديم البورصة لأصدقائك. {0}.',
+		DEFAULT_ANNOUNCEMENT: 'يعرض هذا القسم الإعلانات العامة لالبورصة الخاصة بك!',
 		ANNOUNCEMENT_TXT_2:
-			'XHT رایگان در کلیه کیف پولهایی که {0} دارند توزیع می شود.',
-		LEARN_MORE: 'بیشتر بدانید',
-		APPLY_TODAY: 'امروز اقدام کنید', // new
+			'سيتم توزيع عملة XHT المجانية على جميع محفظات التي {0}.',
+		LEARN_MORE: 'إعلم المزيد',
+		APPLY_TODAY: 'قدّم اليوم', // new
+	},
+	OPEN_WALLET: 'محفظة مفتوحة', // new
+	AGO: 'منذ', // new
+	CUMULATIVE_AMOUNT_SYMBOL: 'تراكمي',
+	POST_ONLY: 'نشر فقط',
+	CLEAR: 'مسح',
+	ORDER_TYPE: 'اكتب',
+	TRIGGER_CONDITIONS: 'شروط التنشيط',
+	TRANSACTION_STATUS: {
+		PENDING: 'قيد الانتظار',
+		REJECTED: 'مرفوض',
+		COMPLETED: 'مكتمل',
+	},
+	DEPOSIT_STATUS: {
+		// new
+		NEW: 'جديد',
+		SEARCH_FIELD_LABEL: 'الصق معرّف معاملتك',
+		SEARCH: 'بحث',
+		SEARCHING: 'جاري البحث',
+		CHECK_DEPOSIT_STATUS: 'تحقق من حالة الايداع',
+		STATUS_DESCRIPTION:
+			'يمكنك التحقق من حالة الإيداع الخاص بك عن طريق إضافة معرف المعاملة أدناه.',
+		TRANSACTION_ID: 'معرف المعاملة ',
+		SEARCH_SUCCESS: 'تم العثور على المعاملة!',
+		ADDRESS_FIELD_LABEL:
+			'المعاملة غير موجودة. يرجى التحقق من الهوية والمحاولة مرة أخرى. إذا كنت تعتقد أن هناك مشكلة يرجى الاتصال بالدعم.', // new
+		CURRENCY_FIELD_LABEL: 'Select the currency', // new
+	},
+	CANCEL_ORDERS: {
+		HEADING: 'Cancel orders',
+		SUB_HEADING: 'Cancel all orders',
+		INFO_1: 'This will cancel your open orders for this markets.',
+		INFO_2: 'Are you sure you want to cancel all your open orders?',
+	},
+	AMOUNT_IN: 'Amount in',
+	LIMITS_BLOCK: {
+		HEADER_ROW_DESCRIPTION:
+			'Deposit and withdrawal allowance for all assets ({0})',
+		HEADER_ROW_TYPE: 'Type (All assets)',
+		HEADER_ROW_AMOUNT: 'Amount ({0})',
+	},
+	MARKETS_TABLE: {
+		TITLE: 'Live markets',
+		MARKETS: 'Markets',
+		LAST_PRICE: 'Last price',
+		CHANGE_24H: 'Change (24 hours)',
+		VOLUME_24h: 'Volume (24 hours)',
+		CHART_24H: 'Chart (24 hours)',
+		VIEW_MARKETS: 'View Markets',
 	},
-	OPEN_WALLET: 'کیف پول را باز کنید', // new
-	AGO: 'پیش', // new
 };
 
 const content = flatten(nestedContent, options);
+
 export default content;
diff --git a/web/src/config/lang/de.js b/web/src/config/lang/de.js
index cfb7ba464b..c099f34c32 100644
--- a/web/src/config/lang/de.js
+++ b/web/src/config/lang/de.js
@@ -796,8 +796,8 @@ export default {
 	LOWEST_PRICE: 'Niedrigster Preis ({0})', // new
 	PHASE: 'Phase', // new
 	INCOMING: 'Eingehend', // new
-	PRICE_CURRENCY: 'PREIS ({0})',
-	AMOUNT_SYMBOL: 'BETRAG ({0})',
+	PRICE_CURRENCY: 'PREIS',
+	AMOUNT_SYMBOL: 'BETRAG',
 	MARKET_PRICE: 'Marktpreis',
 	ORDER_PRICE: 'Bestellpreis',
 	TOTAL_ORDER: 'Order Total',
diff --git a/web/src/config/lang/en.js b/web/src/config/lang/en.js
index d1810ac81f..5e919f2336 100644
--- a/web/src/config/lang/en.js
+++ b/web/src/config/lang/en.js
@@ -20,7 +20,7 @@ const nestedContent = {
 	HOUR_FORMAT: 'HH:mm:ss',
 	LOGIN_TEXT: 'Login',
 	SIGN_IN: 'Sign In',
-	SIGNUP_TEXT: 'Sign Up',
+	SIGNUP_TEXT: 'Sign up',
 	REGISTER_TEXT: 'Register',
 	ACCOUNT_TEXT: 'Account',
 	HOME_TEXT: 'Home',
@@ -35,6 +35,11 @@ const nestedContent = {
 	HELPFUL_RESOURCES_TEXT: 'Helpful resources',
 	HELP_RESOURCE_GUIDE_TEXT:
 		'Feel free to contact us for more information and any issues by sending us an email',
+	HELP_RESOURCE_GUIDE: {
+		CONTACT_US: 'contact us',
+		TEXT:
+			'Feel free to {0} for more information and any issues by sending us an email',
+	},
 	HELP_TELEGRAM_TEXT: 'Check out open API documentation:',
 	HELP_TELEGRAM_LINK: 'https://apidocs.hollaex.com',
 	NEED_HELP_TEXT: 'Need help?', // new
@@ -50,7 +55,14 @@ const nestedContent = {
 	GO_TRADE: 'Go Trade', // new
 	VIEW_INFO: 'View info page', // new
 	APPLY_HERE: 'Apply Here', // new
+	CONVERT: 'Convert', // new
+	TO: 'To', // new
 	HOME: {
+		MAIN_TITLE: 'Cryptocurrency trading exchange',
+		MAIN_TEXT:
+			'Easily buy and sell crypto assets. Simply sign up with your email and trade the major crypto assets 24/7.',
+		TRADE_CRYPTO: 'Start trading',
+		VIEW_EXCHANGE: 'View exchange',
 		SECTION_1_TITLE: 'Welcome to HollaEx Exchange Kit!',
 		SECTION_1_TEXT_1:
 			'Build your own scalable digital asset exchange with HollaEx Kit and be part of the future of finance.',
@@ -824,9 +836,10 @@ const nestedContent = {
 	LOWEST_PRICE: 'Lowest Price ({0})', // new
 	PHASE: 'Phase', // new
 	INCOMING: 'Incoming', // new
-	PRICE_CURRENCY: 'PRICE ({0})',
-	AMOUNT_SYMBOL: 'AMOUNT ({0})',
+	PRICE_CURRENCY: 'Price',
+	AMOUNT_SYMBOL: 'Amount',
 	MARKET_PRICE: 'Market Price',
+	ESTIMATED_PRICE: 'Estimated Price',
 	ORDER_PRICE: 'Order Price',
 	TOTAL_ORDER: 'Order Total',
 	NO_DATA: 'No Data',
@@ -859,6 +872,19 @@ const nestedContent = {
 	WITHDRAWALS_ETH_INVALID_ADDRESS:
 		'The Ethereum address is invalid. Please check carefully and input again',
 	WITHDRAWALS_BUTTON_TEXT: 'review withdrawal',
+	WITHDRAWALS_FORM_NETWORK_LABEL: 'Network',
+	DEPOSIT_FORM_NETWORK_WARNING:
+		'Make sure the network selected is compatible with the senders wallets network',
+	DEPOSIT_FORM_TITLE_WARNING_DESTINATION_TAG:
+		'Enter both Address and Tag, which are required to deposit Ripple into your account successfully.',
+	WITHDRAW_PAGE_DESTINATION_TAG_NONE: 'None',
+	WITHDRAW_PAGE_DESTINATION_TAG_MESSAGE: 'Destination tag: {0}',
+	WITHDRAW_PAGE_NETWORK_TYPE_MESSAGE: '{0} address network type: {1}',
+	WITHDRAWALS_FORM_NETWORK_WARNING:
+		'Make sure the network selected is compatible with the destination wallet',
+	WITHDRAWALS_FORM_DESTINATION_TAG_WARNING:
+		'Check if receiving address requires a Tag. Also known as Memo, digital ID, label, and notes.',
+	WITHDRAWALS_FORM_NETWORK_PLACEHOLDER: 'Select a network',
 	WITHDRAWALS_FORM_ADDRESS_LABEL: 'Destination address',
 	WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER: 'Type the address',
 	WITHDRAWALS_FORM_DESTINATION_TAG_LABEL: 'Destination tag (optional)', // new
@@ -966,7 +992,7 @@ const nestedContent = {
 	ORDER_TITLE_PARTIALLY_FILLED: '{0} order partially filled', // 0 -> buy / sell
 	ORDER_TITLE_TRADE_COMPLETE: '{0} {1} order was successful', // 0 -> buy / sell
 	LOGOUT_TITLE: 'You have been logged out',
-	LOGOUT_ERROR_TOKEN_EXPIRED: 'Token is expired',
+	LOGOUT_ERROR_TOKEN_EXPIRED: 'Your session is expired. Please login again.',
 	LOGOUT_ERROR_LOGIN_AGAIN: 'Login again', // ip doesnt match
 	LOGOUT_ERROR_INVALID_TOKEN: 'Invalid token',
 	LOGOUT_ERROR_INACTIVE:
@@ -1117,7 +1143,7 @@ const nestedContent = {
 	WALLET_ADDRESS_TITLE: 'Generate {0} Wallet',
 	WALLET_ADDRESS_GENERATE: 'Generate',
 	WALLET_ADDRESS_MESSAGE:
-		'When you generate a wallet, you create a deposit and withdrawal address.',
+		'When you generate a wallet, you create a deposit address.',
 	WALLET_ADDRESS_ERROR:
 		'Error generating the address, please refresh and try again.',
 	DEPOSIT_WITHDRAW: 'Deposit/Withdraw',
@@ -1387,10 +1413,11 @@ const nestedContent = {
 	},
 	OPEN_WALLET: 'Open wallet', // new
 	AGO: 'ago', // new
-	CUMULATIVE_AMOUNT_SYMBOL: 'Cumulative',
+	CUMULATIVE_AMOUNT_SYMBOL: 'Total', //new
 	POST_ONLY: 'Post only',
 	CLEAR: 'Clear',
 	ORDER_TYPE: 'type',
+	ORDER_MODE: 'Order mode', //new
 	TRIGGER_CONDITIONS: 'Trigger conditions',
 	TRANSACTION_STATUS: {
 		PENDING: 'Pending',
@@ -1420,10 +1447,26 @@ const nestedContent = {
 	AMOUNT_IN: 'Amount in',
 	LIMITS_BLOCK: {
 		HEADER_ROW_DESCRIPTION:
-			'Deposit and withdrawal allowance for all assets ({0})',
+			'24h Deposit and withdrawal allowance for all assets ({0})',
 		HEADER_ROW_TYPE: 'Type (All assets)',
-		HEADER_ROW_AMOUNT: 'Amount ({0})',
+		HEADER_ROW_AMOUNT: '24h Amount ({0})',
+	},
+	MARKETS_TABLE: {
+		TITLE: 'Live markets',
+		MARKETS: 'Markets',
+		LAST_PRICE: 'Last price',
+		CHANGE_24H: 'Change (24 hours)',
+		VOLUME_24h: 'Volume (24 hours)',
+		CHART_24H: 'Chart (24 hours)',
+		VIEW_MARKETS: 'View Markets',
 	},
+	PAGE_UNDER_CONSTRUCTION:
+		'This page is under construction. Please revisit this page soon.',
+	UNDEFINED_ERROR_TITLE: 'You’ve Encountered an Unidentified Error',
+	UNDEFINED_ERROR:
+		'Wow! An unknown error has occurred. This could be a connection issue or a number of other things. You can try again later or try refreshing.',
+	POST_ONLY_TOOLTIP: 'Post only orders only execute as a limit order.', // new
+	REFRESH: 'Refresh',
 };
 
 const content = flatten(nestedContent, options);
diff --git a/web/src/config/lang/es.js b/web/src/config/lang/es.js
index 516f3572ff..c7c2daddd3 100644
--- a/web/src/config/lang/es.js
+++ b/web/src/config/lang/es.js
@@ -830,8 +830,8 @@ export default {
 	LOWEST_PRICE: 'Precio más bajo ({0})', // new
 	PHASE: 'Fase', // new
 	INCOMING: 'Recibido', // new
-	PRICE_CURRENCY: 'PRECIO ({0})',
-	AMOUNT_SYMBOL: 'CANTIDAD ({0})',
+	PRICE_CURRENCY: 'PRECIO',
+	AMOUNT_SYMBOL: 'CANTIDAD',
 	MARKET_PRICE: 'Precio de mercado',
 	ORDER_PRICE: 'Predio de la orden',
 	TOTAL_ORDER: 'Orden total',
diff --git a/web/src/config/lang/fa.js b/web/src/config/lang/fa.js
index 880fbf9be9..33511e8f37 100644
--- a/web/src/config/lang/fa.js
+++ b/web/src/config/lang/fa.js
@@ -801,8 +801,8 @@ const nestedContent = {
 	LOWEST_PRICE: 'کمترین قیمت ({0})', // new
 	PHASE: 'پایه', // new
 	INCOMING: 'ورودی', // new
-	PRICE_CURRENCY: 'قیمت ({0})',
-	AMOUNT_SYMBOL: 'مقدار ({0})',
+	PRICE_CURRENCY: 'قیمت',
+	AMOUNT_SYMBOL: 'مقدار',
 	MARKET_PRICE: 'قیمت بازار',
 	ORDER_PRICE: 'قیمت سفارش',
 	TOTAL_ORDER: 'کل سفارش',
diff --git a/web/src/config/lang/fr.js b/web/src/config/lang/fr.js
index 293494b9be..b327986ba6 100644
--- a/web/src/config/lang/fr.js
+++ b/web/src/config/lang/fr.js
@@ -837,8 +837,8 @@ export default {
 	LOWEST_PRICE: 'Prix le plus bas ({0})', // new
 	PHASE: 'Phase', // new
 	INCOMING: 'Entrante', // new
-	PRICE_CURRENCY: 'PRIX ({0})',
-	AMOUNT_SYMBOL: 'MONTANT ({0})',
+	PRICE_CURRENCY: 'PRIX',
+	AMOUNT_SYMBOL: 'MONTANT',
 	MARKET_PRICE: 'Prix du marché',
 	ORDER_PRICE: 'Prix de la transaction',
 	TOTAL_ORDER: 'Total de la transaction',
diff --git a/web/src/config/lang/id.js b/web/src/config/lang/id.js
index 194025ef51..2ac40bd644 100644
--- a/web/src/config/lang/id.js
+++ b/web/src/config/lang/id.js
@@ -822,8 +822,8 @@ export default {
 	LOWEST_PRICE: 'Lowest Price ({0})', // new
 	PHASE: 'Phase', // new
 	INCOMING: 'Incoming', // new
-	PRICE_CURRENCY: 'PRICE ({0})',
-	AMOUNT_SYMBOL: 'AMOUNT ({0})',
+	PRICE_CURRENCY: 'PRICE',
+	AMOUNT_SYMBOL: 'AMOUNT',
 	MARKET_PRICE: 'Harga Pasar',
 	ORDER_PRICE: 'Harga Pesan',
 	TOTAL_ORDER: 'Jumlah Pesan',
diff --git a/web/src/config/lang/ja.js b/web/src/config/lang/ja.js
index 696a1d5ad5..5563d4a0d5 100644
--- a/web/src/config/lang/ja.js
+++ b/web/src/config/lang/ja.js
@@ -795,8 +795,8 @@ export default {
 	LOWEST_PRICE: 'Lowest Price ({0})', // new
 	PHASE: 'Phase', // new
 	INCOMING: 'Incoming', // new
-	PRICE_CURRENCY: '価格 ({0})',
-	AMOUNT_SYMBOL: '数量 ({0})',
+	PRICE_CURRENCY: '価格',
+	AMOUNT_SYMBOL: '数量',
 	MARKET_PRICE: '市場価格',
 	ORDER_PRICE: '注文価格',
 	TOTAL_ORDER: '総額',
diff --git a/web/src/config/lang/ko.js b/web/src/config/lang/ko.js
index e8e818d396..bfc97665a7 100644
--- a/web/src/config/lang/ko.js
+++ b/web/src/config/lang/ko.js
@@ -784,8 +784,8 @@ const nestedContent = {
 	PUBLIC_SALES: 'public sales', // ToDo
 	REMAINING: 'Remaining',
 	FULLFILLED: '{0} % Filled',
-	PRICE_CURRENCY: 'PRICE ({0})',
-	AMOUNT_SYMBOL: 'AMOUNT ({0})',
+	PRICE_CURRENCY: 'PRICE',
+	AMOUNT_SYMBOL: 'AMOUNT',
 	MARKET_PRICE: '시장가',
 	ORDER_PRICE: '지정가',
 	TOTAL_ORDER: '총액',
diff --git a/web/src/config/lang/pt.js b/web/src/config/lang/pt.js
new file mode 100644
index 0000000000..d360c32501
--- /dev/null
+++ b/web/src/config/lang/pt.js
@@ -0,0 +1,1478 @@
+import AGREEMENT from '../agreement';
+import LANGUAGES from '../languages';
+import flatten from 'flat';
+
+const options = { safe: true };
+const nestedContent = {
+	APP_TITLE: 'HollaEx',
+	APP_SUB_TITLE: 'Plataforma Crypto',
+	LOGOUT_CONFIRM_TEXT: 'Você está certo disso? Gostaria de sair da aplicação?',
+	ADD_TRADING_PAIR: 'Selecionar mercado',
+	ACTIVE_TRADES: 'Você deve ter {0} para acessar seus trades ativos',
+	CANCEL_BASE_WITHDRAWAL: 'Cancelar {0} Saque',
+	CANCEL_WITHDRAWAL: 'Cancelar Saque',
+	CANCEL_WITHDRAWAL_POPUP_CONFIRM:
+		'Você gostaria de cancelar seu saque em andamento de:',
+	CANT_BE_CANCELLED: '-',
+	ALREADY_CANCELLED: '-',
+	TIMESTAMP_FORMAT: 'DD/MM/YYYY HH:mm:ss',
+	HOUR_FORMAT: 'HH:mm:ss',
+	LOGIN_TEXT: 'Login',
+	SIGN_IN: 'Acessar',
+	SIGNUP_TEXT: 'Cadastre-se',
+	REGISTER_TEXT: 'Cadastrar',
+	ACCOUNT_TEXT: 'Conta',
+	HOME_TEXT: 'Home',
+	CLOSE_TEXT: 'Fechar',
+	COPY_TEXT: 'Copiar',
+	COPY_SUCCESS_TEXT: 'Copiado com sucesso',
+	CANCEL_SUCCESS_TEXT: 'Cancelado com Sucesso!',
+	UPLOAD_TEXT: 'Anexar',
+	ADD_FILES: 'Adicionar Arquivos',
+	OR_TEXT: 'Ou',
+	CONTACT_US_TEXT: 'Contato',
+	HELPFUL_RESOURCES_TEXT: 'Ajuda',
+	HELP_RESOURCE_GUIDE_TEXT:
+		'Sinta-se a vontade para nos contatar por email se tiver qualquer problema',
+	HELP_TELEGRAM_TEXT: 'Verificar a documentação da API:',
+	HELP_TELEGRAM_LINK: 'https://apidocs.hollaex.com',
+	NEED_HELP_TEXT: 'Precisa de ajuda?',
+	HELP_TEXT: 'ajuda',
+	SUCCESS_TEXT: 'Sucesso',
+	ERROR_TEXT: 'Erro',
+	PROCEED: 'AVANÇAR',
+	EDIT_TEXT: 'Editar',
+	BACK_TEXT: 'Voltar',
+	NO_OPTIONS: 'Sem opções disponí­veis',
+	SECONDS: 'segundos',
+	VIEW_MARKET: 'ver mercado',
+	GO_TRADE: 'Trade',
+	VIEW_INFO: 'Ver página de informações',
+	APPLY_HERE: 'Enviar aqui',
+	HOME: {
+		SECTION_1_TITLE: 'Bem vindo ao HollaEx Exchange Kit!',
+		SECTION_1_TEXT_1:
+			' Construa sua própria corretora escalonável de ativos digitais com o HollaEx Kit e faça parte do futuro das finanças.',
+		SECTION_1_TEXT_2:
+			'Nós nos dedicamos a levar avanços para a tecnologia financeira por meio de um acesso simples e acessível à tecnologia de trading.',
+		SECTION_1_BUTTON_1: 'Saiba mais',
+		SECTION_3_TITLE: 'Recursos',
+		SECTION_3_CARD_1_TITLE: 'MATCHING ENGINE ESCALONÁVEL',
+		SECTION_3_CARD_1_TEXT:
+			'Solução de alto desempenho de Matching Engine para Ordens usando os mais eficientes algoritmos',
+		SECTION_3_CARD_2_TITLE: 'INTEGRAÇÃO BANCÁRIA',
+		SECTION_3_CARD_2_TEXT:
+			'Plugins com módulos costumizáveis disponíveis para integração bancária. Conhecemos as finanças tradicionais e podemos ajudá-lo a tornar seu câmbio local',
+		SECTION_3_CARD_3_TITLE: 'SUPER SEGURO',
+		SECTION_3_CARD_3_TEXT:
+			' HollaEx usa as melhores práticas de segurança e os algoritmos mais seguros e confiáveis para manter seu capital protegido. Esta é a nossa maior prioridade e por isso tomamos um cuidado super especial com a questão da segurança.',
+		SECTION_3_CARD_4_TITLE: 'RELATÓRIOS AVANÇADOS',
+		SECTION_3_CARD_4_TEXT:
+			' Painel do administrador com e-mail customizável e relatórios para notificar a equipe de suporte e o administrador sobre o status do sistema e das transações.',
+		SECTION_3_CARD_5_TITLE: 'ATENDIMENTO',
+		SECTION_3_CARD_5_TEXT:
+			'Podemos cuidar mais atentamente de suas necessidades e oferecer um profissional online para ajudá-lo com seus problemas e dúvidas.',
+		SECTION_3_CARD_6_TITLE: 'INTEGRAÇÃO AO KYC',
+		SECTION_3_CARD_6_TEXT:
+			' Módulos flexíveis e integráveis para aplicar métodos de verificação de usuários e KYC em diferentes jurisdições.',
+		SECTION_3_BUTTON_1: 'Ver Demo',
+	},
+	FOOTER: {
+		FOOTER_LEGAL: [
+			'Orgulho de ter origens em Seoul, Coréia dos Sul',
+			'bitHolla Inc.',
+		],
+		FOOTER_LANGUAGE_TEXT: 'LINGUAGEM',
+		TERMS_OF_SERVICE: 'Termos de Serviço',
+		PRIVACY_POLICY: 'Termo de Privacidade',
+		SECTIONS: {
+			SECTION_1_TITLE: 'SOBRE',
+			SECTION_1_LINK_1: 'Sobre nós',
+			SECTION_1_LINK_2: 'Termos de uso',
+			SECTION_1_LINK_3: 'Termos de privacidade',
+			SECTION_1_LINK_4: 'Contate-nos',
+			SECTION_2_TITLE: 'Informação',
+			SECTION_2_LINK_1: 'Blog',
+			SECTION_2_LINK_2: 'Contate-nos',
+			SECTION_2_LINK_3: 'Carreiras',
+			SECTION_3_TITLE: 'DESENVOLVEDORES',
+			SECTION_3_LINK_1: 'Documentação',
+			SECTION_3_LINK_2: 'Forum',
+			SECTION_3_LINK_3: 'GitHub',
+			SECTION_3_LINK_4: 'Biblioteca',
+			SECTION_3_LINK_5: 'API documentação',
+			SECTION_3_LINK_6: 'API de negociações',
+			SECTION_3_LINK_7: 'Ferramentas para o Desenvolvimento',
+			SECTION_3_LINK_8: 'Documentação',
+			SECTION_4_TITLE: 'EXCHANGE',
+			SECTION_4_LINK_1: 'Login',
+			SECTION_4_LINK_2: 'Registrar',
+			SECTION_4_LINK_3: 'Contate-nos',
+			SECTION_4_LINK_4: 'Termos de uso',
+			SECTION_5_TITLE: 'RECURSOS',
+			SECTION_5_LINK_1: 'Whitepaper',
+			SECTION_5_LINK_2: 'Token HollaEx(XHT) ',
+			SECTION_5_LINK_3: 'GitHub',
+			SECTION_5_LINK_4: 'FAQ',
+			SECTION_6_TITLE: 'MÍDIAS SOCIAIS',
+			SECTION_6_LINK_1: 'Twitter',
+			SECTION_6_LINK_2: 'Telegram',
+			SECTION_6_LINK_3: 'Facebook',
+			SECTION_6_LINK_4: 'Instagram',
+			SECTION_6_LINK_5: 'Linkedin',
+			SECTION_6_LINK_6: 'Website',
+			SECTION_6_LINK_7: 'Suporte',
+			SECTION_6_LINK_8: 'Informação',
+			SECTION_6_LINK_9: 'YouTube',
+		},
+		XHT_DESCRIPTION:
+			' HollaEx Kit é uma plataforma de trading de código aberto construída pela bitHolla Inc. Você pode criar e listar quaisquer ativos digitais e incluir novos usuários para negociar em sua bolsa usando este Kit para corretoras. O objetivo é ajudar você a administrar sua própria exchange. {1}.',
+		CLICK_HERE: 'clique aqui',
+		VISIT_HERE: 'visite aqui',
+	},
+	ACCOUNTS: {
+		TITLE: 'Conta',
+		TAB_VERIFICATION: 'Verificação',
+		TAB_SECURITY: 'Segurança',
+		TAB_NOTIFICATIONS: 'Notificações',
+		TAB_SETTINGS: 'Configurações',
+		TAB_PROFILE: 'Perfil',
+		TAB_WALLET: 'Carteira',
+		TAB_SUMMARY: 'Sumário',
+		TAB_HISTORY: 'História',
+		TAB_API: 'API',
+		TAB_SIGNOUT: 'Sair',
+	},
+	REQUEST_XHT_ACCESS: {
+		REQUEST_TITLE: 'Pedir Acesso',
+		REQUEST_INVITE: 'Pedir Convite',
+		CATEGORY_PLACEHOLDER:
+			'Selecionar a categoria que melhor se adequa ao seu problema',
+		INTRODUCTION_LABEL: 'Apresente-se',
+		INTRODUCTION_PLACEHOLDER:
+			'Onde você mora? Você está interessado em abrir uma exchange?',
+	},
+	CONTACT_FORM: {
+		CATEGORY_LABEL: 'Categoria',
+		CATEGORY_PLACEHOLDER:
+			'Selecione a categoria que melhor se adequa ao seu problema',
+		CATEGORY_OPTIONS: {
+			OPTION_VERIFY: 'Verificação do usuário',
+			OPTION_LEVEL: 'Aumentar o nível do usuário',
+			OPTION_DEPOSIT: 'Depositar & Retirar',
+			OPTION_BUG: 'Relatar bug',
+			OPTION_PERSONAL_INFO: 'Alterar informações pessoais',
+			OPTION_BANK_TRANSFER: 'Transferência Bancária',
+			OPTION_REQUEST: 'Solicitar convite para a HollaEx Exchange',
+		},
+		SUBJECT_LABEL: 'Assunto',
+		SUBJECT_PLACEHOLDER: 'De que se trata o seu problema?',
+		DESCRIPTION_LABEL: 'Descrição',
+		DESCRIPTION_PLACEHOLDER: 'Dê mais detalhes sobre seu problema',
+		ATTACHMENT_LABEL: 'Adicionar anexos(max 3)',
+		ATTACHMENT_PLACEHOLDER:
+			' Adicione um arquivo para nos ajudar a entender seu problema. São aceitos arquivos nos formatos PDF, JPG, PNG e GIF',
+		SUCCESS_MESSAGE: 'Seu e-mail foi enviado para o nosso suporte',
+		SUCCESS_TITLE: 'Mensagem Enviada',
+		SUCCESS_MESSAGE_1:
+			'Seu problema foi enviado para o atendimento ao cliente.',
+		SUCCESS_MESSAGE_2:
+			'Levamos em média de 1-3 dias para responder à sua solicitação.',
+	},
+	DEPOSIT: {
+		CRYPTO_LABELS: {
+			ADDRESS: 'Seu {0} endereço de recebimento',
+			DESTINATION_TAG: 'Sua {0} tag de destino',
+			MEMO: 'Your {0} memo',
+			BTC: 'Seu endereço para receber Bitcoins',
+			ETH: 'Seu endereço para receber Ethereum',
+			BCH: 'Seu endereço para receber Bitcoin cash',
+		},
+		INCREASE_LIMIT: 'Quer aumentar o seu limite diário?',
+		QR_CODE:
+			'Este código QR pode ser escaneado pela pessoa que deseja enviar moedas para você',
+		NO_DATA: 'Nenhuma informação disponível',
+		FULL_MESSAGE_LIMIT: '{0}: {1} {2} {3}',
+	},
+	LOGIN: {
+		LOGIN_TO: 'Login para {0}',
+		CANT_LOGIN: 'Não consegue fazer o login?',
+		NO_ACCOUNT: 'Não tem uma conta?',
+		CREATE_ACCOUNT: 'Crie uma aqui',
+		HELP: 'Ajuda',
+	},
+	FORM_FIELDS: {
+		EMAIL_LABEL: 'E-mail',
+		EMAIL_PLACEHOLDER: 'Digite seu e-mail',
+		PASSWORD_LABEL: 'Senha',
+		PASSWORD_PLACEHOLDER: 'Digite sua senha',
+		PASSWORD_REPEAT_LABEL: 'Digite sua senha novamente',
+		PASSWORD_REPEAT_PLACEHOLDER: 'Digite sua senha novamente',
+	},
+	VALIDATIONS: {
+		OTP_LOGIN: 'Forneça o código OTP para fazer login',
+		CAPTCHA: 'Sessão expirada. Por favor, atualize a página',
+		FROZEN_ACCOUNT: 'Esta conta está suspensa',
+		INVALID_EMAIL: 'Endereço de e-mail inválido',
+		TYPE_EMAIL: 'Digite seu e-mail',
+		REQUIRED: ' Campo obrigatório',
+		INVALID_DATE: ' Data inválida',
+		INVALID_PASSWORD:
+			'Senha inválida. Ela deve conter pelo menos 8 caracteres, um dígito e um caractere especial.',
+		INVALID_PASSWORD_2:
+			'Senha inválida. Ela deve conter pelo menos 8 caracteres, um dígito e um caractere especial.',
+		INVALID_CURRENCY: 'Endereço {0} Inválido({1})',
+		INVALID_BALANCE:
+			'Saldo disponível insuficiente ({0}) para realizar a operação ({1}).',
+		MIN_VALUE: 'O valor deve ser igual a {0} ou superior.',
+		MAX_VALUE: 'O valor deve ser igual a {0} ou inferior.',
+		MIN_VALUE_NE: 'O valor deve ser maior que {0}.',
+		MAX_VALUE_NE: 'O valor deve ser menor que {0}.',
+		INSUFFICIENT_BALANCE: 'Saldo insuficiente',
+		PASSWORDS_DONT_MATCH: 'A senha não confere',
+		USER_EXIST: 'Este e-mail já foi registrado',
+		ACCEPT_TERMS:
+			'Você não concordou com os Termos de uso e Política de Privacidade',
+		STEP: 'Valor inválido, o passo é {0}',
+		ONLY_NUMBERS: 'O valor deve conter apenas números',
+	},
+	LEGAL: {
+		PRIVACY_POLICY: {
+			TITLE: 'Política de Privacidade',
+			SUBTITLE:
+				'Última atualização em 1º de abril de 2019. Ela substitui a versão anterior em sua totalidade.',
+			TEXTS: [
+				'HollaEx Web é uma plataforma de trading online de propriedade total da bitHolla Inc. BitHolla Inc (doravante denominada bitHolla) foi constituída em Seul, Coréia do Sul.',
+				'O uso deste site HollaEx (“Website”) e do serviço oferecido no site (“Service”) são regidos pelos termos contidos nesta página de Termos e Condições (“Terms”). Este acordo constitui inteiramente o acordo entre as partes. Todas as outras informações fornecidas no site ou declarações orais / escritas feitas estão excluídas deste acordo; a política de câmbio é fornecida apenas para orientação e não constitui um acordo legal entre as partes.',
+				'Ao acessar, visualizar ou baixar informações do site e usar o serviço fornecido pela bitHolla, você reconhece que leu, compreendeu e concorda incondicionalmente com estes Termos. BitHolla pode, a qualquer momento, sem aviso prévio, alterar os Termos. Você concorda em continuar submetido a quaisquer termos e condições alterados e que a bitHolla não tem obrigação de notificá-lo de tais alterações. Você aceita que é sua responsabilidade verificar estes Termos periodicamente em busca de alterações e que o uso continuado do Site e dos Serviços oferecidos pela bitHolla após a publicação de quaisquer alterações aos Termos significa sua aceitação de tais alterações.',
+				'O Site e os direitos autorais de todos os textos, gráficos, imagens, software e quaisquer outros materiais no Site são de propriedade da bitHolla, incluindo todas as marcas registradas e outros direitos de propriedade intelectual em relação aos materiais e serviços no Site. Os materiais neste site só podem ser usados para uso pessoal e para fins não comerciais.',
+				'Você pode exibir trechos do site em uma tela de computador ou imprimi-los para os fins acima mencionados, desde que preserve quaisquer direitos autorais e outros avisos de propriedade ou quaisquer marcas registradas ou logotipos bitHolla, conforme mostrado na impressão inicial ou download que não sofra alteração, adição ou exclusão. Com exceção do que já foi mencionado de forma expressa neste documento, você não pode, sem a permissão prévia por escrito da bitHolla’s, alterar, modificar, reproduzir, distribuir ou usar em qualquer outro contexto comercial quaisquer materiais do Site.',
+				'Você reconhece que ‘bitHolla’ e o logotipo bitHolla são marcas comerciais da bitHolla Inc. Você pode reproduzir tais marcas comerciais sem alteração em materiais baixados deste site desde de que esteja dento das medidas autorizadas acima. Entretanto, você não pode usar, copiar, adaptar ou apagá-las.',
+				'Você não deve, em nenhuma circunstância, obter quaisquer direitos sobre ou em relação ao Site (exceto os direitos de usar o Site de acordo com estes Termos e quaisquer outros termos e condições que regem um serviço específico ou parte do Site) ou se passar como detentor de tais direitos sobre ou em relação ao Site.',
+			],
+		},
+		GENERAL_TERMS: {
+			TITLE: 'Termos Gerais de Serviço',
+			SUBTITLE:
+				'Última atualização em 1º de abril de 2019. Ela substitui a versão anterior em sua totalidade.',
+			TEXTS: [
+				'HollaEx Web é uma plataforma de trading online de propriedade total da bitHolla Inc. BitHolla Inc (doravante denominada bitHolla) foi constituída em Seul, Coréia do Sul.',
+				'O uso deste site HollaEx (“Website”) e do serviço oferecido no site (“Service”) são regidos pelos termos contidos nesta página de Termos e Condições (“Terms”). Este acordo constitui inteiramente o acordo entre as partes. Todas as outras informações fornecidas no site ou declarações orais / escritas feitas estão excluídas deste acordo; a política de câmbio é fornecida apenas para orientação e não constitui um acordo legal entre as partes.',
+				'Ao acessar, visualizar ou baixar informações do site e usar o serviço fornecido pela bitHolla, você reconhece que leu, compreendeu e concorda incondicionalmente com estes Termos. BitHolla pode, a qualquer momento, sem aviso prévio, alterar os Termos. Você concorda em continuar submetido a quaisquer termos e condições alterados e que a bitHolla não tem obrigação de notificá-lo de tais alterações. Você aceita que é sua responsabilidade verificar estes Termos periodicamente em busca de alterações e que o uso continuado do Site e dos Serviços oferecidos pela bitHolla após a publicação de quaisquer alterações aos Termos significa sua aceitação de tais alterações.',
+				'O Site e os direitos autorais de todos os textos, gráficos, imagens, software e quaisquer outros materiais no Site são de propriedade da bitHolla, incluindo todas as marcas registradas e outros direitos de propriedade intelectual em relação aos materiais e serviços no Site. Os materiais neste site só podem ser usados para uso pessoal e para fins não comerciais.',
+				'Você pode exibir trechos do site em uma tela de computador ou imprimi-los para os fins acima mencionados, desde que preserve quaisquer direitos autorais e outros avisos de propriedade ou quaisquer marcas registradas ou logotipos bitHolla, conforme mostrado na impressão inicial ou download que não sofra alteração, adição ou exclusão. Com exceção do que já foi mencionado de forma expressa neste documento, você não pode, sem a permissão prévia por escrito da bitHolla’s, alterar, modificar, reproduzir, distribuir ou usar em qualquer outro contexto comercial quaisquer materiais do Site.',
+				'Você reconhece que ‘bitHolla’ e o logotipo bitHolla são marcas comerciais da bitHolla Inc. Você pode reproduzir tais marcas comerciais sem alteração em materiais baixados deste site desde de que esteja dento das medidas autorizadas acima. Entretanto, você não pode usar, copiar, adaptar ou apagá-las.',
+				'Você não deve, em nenhuma circunstância, obter quaisquer direitos sobre ou em relação ao Site (exceto os direitos de usar o Site de acordo com estes Termos e quaisquer outros termos e condições que regem um serviço específico ou parte do Site) ou se passar como detentor de tais direitos sobre ou em relação ao Site.',
+			],
+		},
+	},
+	NOTIFICATIONS: {
+		BUTTONS: {
+			OKAY: 'Ok',
+			START_TRADING: 'faça trade agora',
+			SEE_HISTORY: 'ver histórico',
+		},
+		DEPOSITS: {
+			TITLE_RECEIVED: '{0} Depósito recebido',
+			TITLE_INCOMING: 'Entradas {0}',
+			SUBTITLE_RECEIVED: 'você está recebendo seu {0} depósito',
+			SUBTITLE_INCOMING: 'Você tem um total de receita de {0}',
+			INFORMATION_PENDING_1:
+				'Seu {0} requer 1 verificação antes de começar a fazer trade.',
+			INFORMATION_PENDING_2:
+				'Isso pode levar de 10 a 30 minutos. Enviaremos um e-mail assim que seu {0} for confirmado na blockchain.',
+		},
+	},
+	REFERRAL_SUCCESS: {
+		TITLE: ' Solicitação Enviada',
+		BUTTON_TEXT: 'Ok',
+	},
+	OTP_FORM: {
+		OTP_FORM_TITLE: 'Digite seu código de autenticação para continuar',
+		OTP_LABEL: 'Código OTP',
+		OTP_PLACEHOLDER: 'Digite o código de autenticação',
+		OTP_TITLE: 'Código do Autenticador',
+		OTP_HELP: 'ajuda',
+		OTP_BUTTON: 'enviar',
+		ERROR_INVALID: 'Código OTP inválido',
+	},
+	QUICK_TRADE_COMPONENT: {
+		TITLE: 'Trade Rápido',
+		TOTAL_COST: 'Custo Total',
+		BUTTON: 'Revisar Ordem',
+		INPUT: '{0} to {1}',
+		TRADE_TITLE: '{0} {1}',
+	},
+	PREVIOUS_PAGE: 'página anterior',
+	NEXT_PAGE: 'próxima página',
+	WALLET: {
+		LOADING_ASSETS: 'Carregando ativos...',
+		TOTAL_ASSETS: 'Total de ativos',
+		AVAILABLE_WITHDRAWAL: 'Disponível para trading',
+		AVAILABLE_TRADING: 'Disponível para retirada',
+		ORDERS_PLURAL: 'ordens',
+		ORDERS_SINGULAR: 'ordem',
+		HOLD_ORDERS:
+			'Você {0} em aberto {1}, resultando em uma reserva de {2} {3} depositada em seu {4} saldo',
+	},
+	REQUEST_RESET_PASSWORD: {
+		TITLE: 'Recuperação de conta',
+		SUBTITLE: ' Recupere sua conta abaixo',
+		SUPPORT: 'Contatar o Suporte',
+		BUTTON: 'Enviar link de recuperação',
+	},
+	REQUEST_RESET_PASSWORD_SUCCESS: {
+		TITLE: 'Redefinição de senha enviada',
+		TEXT:
+			'Se existir uma conta para o endereço de e-mail, um e-mail foi enviado para ela com instruções de redefinição de senha. Verifique seu e-mail e clique no link para concluir a redefinição de senha.',
+	},
+	RESET_PASSWORD: {
+		TITLE: 'Definir nova senha',
+		SUBTITLE: 'Definir nova senha',
+		BUTTON: 'Definir nova senha',
+	},
+	RESET_PASSWORD_SUCCESS: {
+		TEXT_1: 'Você configurou com sucesso uma nova senha.',
+		TEXT_2: 'Clique no login abaixo para prosseguir.',
+	},
+	SIGN_UP: {
+		SIGNUP_TO: 'Inscreva-se para {0}',
+		NO_EMAIL: 'Não recebeu o e-mail?',
+		REQUEST_EMAIL: 'Solicite outro aqui',
+		HAVE_ACCOUNT: 'Já tem uma conta?',
+		GOTO_LOGIN: 'Vá para a página de login',
+		AFFILIATION_CODE: 'Código de indicação (opcional)',
+		AFFILIATION_CODE_PLACEHOLDER: 'Digite seu código de indicação',
+		TERMS: {
+			terms: 'Termos gerais',
+			policy: 'Política de Privacidade',
+			text: 'Eu li e concordo com os {0} e {1}',
+		},
+	},
+	VERIFICATION_TEXTS: {
+		TITLE: 'E-mail enviado',
+		TEXT_1: 'Verifique seu e-mail e clique no link para confirmar seu e-mail.',
+		TEXT_2:
+			'Verifique seu e-mail e clique no link para confirmar seu e-mail. Se você não recebeu nenhuma confirmação de e-mail e já verificou seu lixo eletrônico, gentileza clicar em reenviar logo abaixo.',
+	},
+	VERIFICATION_EMAIL_REQUEST: {
+		TITLE: 'Reenviar Solicitação de E-mail',
+		BUTTON: 'Solicitar E-mail',
+	},
+	VERIFICATION_EMAIL_REQUEST_SUCCESS: {
+		TITLE: 'Reenviar e-mail',
+		TEXT_1:
+			'Se depois de alguns minutos você ainda não receber a verificação de e-mail, entre em contato conosco abaixo.',
+	},
+	VERIFICATION_EMAIL: {
+		INVALID_UUID: 'Código inválido',
+		TEXT_1: 'Você confirmou seu e-mail com sucesso.',
+		TEXT_2: 'Você pode agora fazer o seu login',
+	},
+	USER_VERIFICATION: {
+		INFO_TXT:
+			'Aqui você pode monitorar seu progresso com relação à verificação e upgrade de conta.',
+		INFO_TXT_1:
+			'Por favor, forneça as informações relevantes e necessárias para cada seção abaixo. Suas informações serão analisadas e aprovadas para um upgrade de conta somente após o envio das informações referentes a todas as seções',
+		INFO_TXT_2:
+			'* A verificação da parte de identidade exige que você {0} certos documentos.',
+		DOCUMENTATIONS: 'Fazer upload',
+		COMPLETED: ' Concluído',
+		PENDING_VERIFICATION: 'Verificação pendente',
+		TITLE_EMAIL: 'E-mail',
+		MY_EMAIL: 'Meu E-mail',
+		MAKE_FIRST_DEPOSIT: 'Faça seu primeiro depósito',
+		OBTAIN_XHT: 'Compre XHT',
+		TITLE_USER_DOCUMENTATION: 'Identificação',
+		TITLE_ID_DOCUMENTS: 'Fazer upload',
+		TITLE_BANK_ACCOUNT: 'Conta Bancária',
+		TITLE_MOBILE_PHONE: 'Telefone celular',
+		TITLE_PERSONAL_INFORMATION: 'Dados pessoais',
+		VERIFY_EMAIL: 'Verificar e-mail',
+		VERIFY_MOBILE_PHONE: 'Verificar número de telefone celular',
+		VERIFY_USER_DOCUMENTATION: 'Verificar documentação do usuário',
+		VERIFY_ID_DOCUMENTS: 'Verificar documentos de identificação',
+		VERIFY_BANK_ACCOUNT: 'Verificar conta bancária',
+		BUTTON: 'Enviar pedido de verificação',
+		TITLE_IDENTITY: 'Identidade',
+		TITLE_MOBILE: 'Celular',
+		TITLE_MOBILE_HEADER: 'Número de celular',
+		TITLE_BANK: 'Banco',
+		TITLE_BANK_HEADER: 'Dados bancários',
+		CHANGE_VALUE: 'Alterar valor',
+		PENDING_VERIFICATION_PERSONAL_INFORMATION:
+			'Estamos processando seus dados pessoais',
+		PENDING_VERIFICATION_BANK: 'Estamos processando seus dados bancários',
+		PENDING_VERIFICATION_DOCUMENTS: 'Estamos processando seus documentos',
+		GOTO_VERIFICATION: 'Vá para verificação',
+		GOTO_WALLET: 'Ir para a carteira',
+		CONNECT_BANK_ACCOUNT: 'Vincular uma conta bancária',
+		ACTIVATE_2FA: 'Ativar 2FA',
+		INCOMPLETED: 'Incompleto',
+		BANK_VERIFICATION: 'Verificação de banco',
+		IDENTITY_VERIFICATION: 'Verificação de Identidade',
+		PHONE_VERIFICATION: 'Verificação de telefone',
+		DOCUMENT_VERIFICATION: 'Verificação de Documento',
+		START_BANK_VERIFICATION: 'Iniciar verificação bancária',
+		START_IDENTITY_VERIFICATION: 'Iniciar verificação de identidade',
+		START_PHONE_VERIFICATION: 'Iniciar verificação de telefone',
+		START_DOCUMENTATION_SUBMISSION: 'Iniciar envio da documentação',
+		GO_BACK: 'Retornar',
+		BANK_VERIFICATION_TEXT_1:
+			'Você pode adicionar até 3 contas bancárias. É uma exigência que você entre em contato com o atendimento ao cliente para contas bancárias internacionais e elas terão limites aplicados ao saques',
+		BANK_VERIFICATION_TEXT_2:
+			'Ao verificar sua conta bancária, você terá acesso a:',
+		BASE_WITHDRAWAL: 'Saques Fiat',
+		BASE_DEPOSITS: 'Depósitos Fiat',
+		ADD_ANOTHER_BANK_ACCOUNT: 'Adicionar outra conta bancária',
+		BANK_NAME: 'Nome do banco',
+		ACCOUNT_NUMBER: 'Número da conta',
+		CARD_NUMBER: 'Número do cartão',
+		BANK_VERIFICATION_HELP_TEXT:
+			'Para que esta seção seja verificada, você deve completar a seção {0}.',
+		DOCUMENT_SUBMISSION: 'Envio de Documento',
+		REVIEW_IDENTITY_VERIFICATION: 'Revisar Verificação de Identidade',
+		PHONE_DETAILS: 'Dados telefônicos',
+		PHONE_COUNTRY_ORIGIN: 'Telefone do País de Origem',
+		MOBILE_NUMBER: 'Número de celular',
+		DOCUMENT_PROOF_SUBMISSION: 'Envio de Documentos de Comprovação',
+		START_DOCUMENTATION_RESUBMISSION: 'Iniciar Reenvio de Documentação',
+		SUBMISSION_PENDING_TXT:
+			'* Esta seção já foi concluída e a documentação enviada. Caso você faça alguma alteração e reenvie seus documentos, essas novas informações irão substituir as informações anteriores.',
+		CUSTOMER_SUPPORT_MESSAGE: 'Mensagem de Atendimento ao Cliente',
+		DOCUMENT_PENDING_NOTE:
+			'Seus documentos foram enviados e serão analisados em breve. Por favor, seja paciente.',
+		DOCUMENT_VERIFIED_NOTE: 'Sua documentação está completa.',
+		NOTE_FROM_VERIFICATION_DEPARTMENT:
+			'Mensagem da equipe de revisão de documentos',
+		CODE_EXPIRES_IN: 'O código expira em',
+		EMAIL_VERIFICATION: 'Enviar e-mail de verificação',
+		VERIFICATION_SENT: 'Verificação enviada',
+		VERIFICATION_SENT_INFO:
+			'Confira seu e-mail e clique no link para verificar o e-mail.',
+		OKAY: 'Ok',
+		USER_DOCUMENTATION_FORM: {
+			FORM_FIELDS: {
+				FIRST_NAME_LABEL: 'Nome',
+				FIRST_NAME_PLACEHOLDER:
+					'Digite seu nome exatamente como aparece em seu documento de identidade',
+				LAST_NAME_LABEL: 'Último sobrenome',
+				LAST_NAME_PLACEHOLDER:
+					'Digite seu último sobrenome exatamente como aparece em seu documento de identidade',
+				FULL_NAME_LABEL: 'Nome Completo',
+				FULL_NAME_PLACEHOLDER:
+					'Digite seu nome completo exatamente como aparece em seu documento de identidade',
+				GENDER_LABEL: 'Gênero',
+				GENDER_PLACEHOLDER: 'Digite seu gênero',
+				GENDER_OPTIONS: {
+					MAN: 'Masculino',
+					WOMAN: 'Feminino',
+				},
+				NATIONALITY_LABEL: 'Nacionalidade',
+				NATIONALITY_PLACEHOLDER:
+					'Digite a nacionalidade que está escrita no seu documento de identidade',
+				DOB_LABEL: 'Data de nascimento',
+				COUNTRY_LABEL: 'País em que você mora',
+				COUNTRY_PLACEHOLDER: 'Selecione o país em que você mora atualmente',
+				CITY_LABEL: 'Cidade',
+				CITY_PLACEHOLDER: 'Digite a cidade em que você mora',
+				ADDRESS_LABEL: 'Endereço',
+				ADDRESS_PLACEHOLDER: 'Digite o endereço em que você mora atualmente',
+				POSTAL_CODE_LABEL: 'CEP',
+				POSTAL_CODE_PLACEHOLDER: 'Digite seu CEP',
+				PHONE_CODE_LABEL: 'Country',
+				PHONE_CODE_PLACEHOLDER: 'Selecione o país de registro do seu telefone',
+				PHONE_CODE_DISPLAY: '({0}) {1}',
+				PHONE_NUMBER_LABEL: 'Número de Telefone',
+				PHONE_NUMBER_PLACEHOLDER: 'Digite seu número de telefone ',
+				CONNECTING_LOADING: 'Conectando',
+				SMS_SEND: 'Enviando SMS',
+				SMS_CODE_LABEL: 'Código SMS',
+				SMS_CODE_PLACEHOLDER: 'Insira o seu código SMS',
+			},
+			INFORMATION: {
+				TEXT:
+					'IMPORTANTE: Digite seu nome nos campos abaixo exatamente como aparece em seu documento de identidade (nome completo com iniciais e sobrenome (s) completo (s)). Você tem um negócio? Entre em contato com o atendimento ao cliente para abrir uma conta PJ.',
+				TITLE_PERSONAL_INFORMATION: 'Dados pessoais',
+				TITLE_PHONE: 'Phone',
+				PHONE_VERIFICATION_TXT:
+					'O fornecimento de dados de contato válidos nos ajudará muito na resolução de conflitos, evitando transações indesejadas em sua conta.',
+				PHONE_VERIFICATION_TXT_1:
+					'Forneça seu número de telefone celular para receber atualizações em tempo real sobre depósitos e saques.',
+				PHONE_VERIFICATION_TXT_2:
+					'Comprove ainda mais sua identidade e endereço compartilhando seu número de telefone fixo (opcional).',
+			},
+		},
+		ID_DOCUMENTS_FORM: {
+			VALIDATIONS: {
+				ID_TYPE: 'Selecione um tipo de documento de identidade',
+				ID_NUMBER: 'Por favor, digite o número de cada documento',
+				ISSUED_DATE: 'Selecione a data de emissão de seu documento',
+				EXPIRATION_DATE: 'Selecione a data de validade de seu documento',
+				FRONT:
+					'Por favor, faça um upload de uma foto ou escaneamento de seu passaporte',
+				PROOF_OF_RESIDENCY:
+					'Por favor, faça um upload de uma foto ou digitalização de um documento que comprove o endereço que você mora atualmente',
+				SELFIE_PHOTO_ID:
+					'Por favor, faça o upload de uma foto sua (selfie) segurando seu passaporte e o papel contendo as informações necessárias',
+			},
+			FORM_FIELDS: {
+				TYPE_LABEL: 'Tipo de documento de identidade',
+				TYPE_PLACEHOLDER: 'Selecione o tipo de documento de identidade',
+				TYPE_OPTIONS: {
+					ID: 'Identidade',
+					PASSPORT: 'Passporte',
+				},
+				ID_NUMBER_LABEL: 'Número do Passaporte',
+				ID_NUMBER_PLACEHOLDER: 'Digite o número do seu passaporte',
+				ID_PASSPORT_NUMBER_LABEL: 'Número do Passaporte',
+				ID_PASSPORT_NUMBER_PLACEHOLDER: 'Digite o número do seu passaporte',
+				ISSUED_DATE_LABEL: 'Data de emissão do passaporte',
+				EXPIRATION_DATE_LABEL: 'Data de validade do passaporte',
+				FRONT_LABEL: 'Passporte',
+				FRONT_PLACEHOLDER: 'Adicione uma cópia do seu passaporte ',
+				BACK_LABEL: 'Verso do passaporte',
+				BACK_PLACEHOLDER:
+					'Adicione uma cópia do verso do seu documento de identidade (se for o caso)',
+				PASSPORT_LABEL: 'Passaporte',
+				PASSPORT_PLACEHOLDER: 'Adicione uma cópia do seu passaporte',
+				POR_LABEL: 'Comprovante de endereço',
+				POR_PLACEHOLDER:
+					'Adicione uma cópia de um documento que comprove o seu endereço',
+				SELFIE_PHOTO_ID_LABEL:
+					'Sua selfie segurando seu passaporte e papel contendo as informações exigidas',
+				SELFIE_PHOTO_ID_PLACEHOLDER:
+					'Adicione uma cópia da sua selfie segurando seu passaporte e papel contendo as informações exigidas',
+			},
+			INFORMATION: {
+				IDENTITY_DOCUMENT: 'Documento de identidade',
+				PROOF_OF_RESIDENCY: 'Comprovante de residência',
+				ID_SECTION: {
+					TITLE:
+						'Por favor, certifique-se de que os documentos enviados sejam:',
+					LIST_ITEM_1:
+						'DE ALTA QUALIDADE (imagens coloridas, resolução de 300 dpi ou superior).',
+					LIST_ITEM_2: "TOTALMENTE VISÍVEIS (marcas d'água são permitidas).",
+					LIST_ITEM_3: 'VÁLIDOS, com a data de validade bem visível.',
+					WARNING_1:
+						'Apenas passaportes válidos serão aceitos; aceitamos fotos de alta qualidade ou imagens digitalizadas desses documentos.',
+					WARNING_2:
+						'Somente você poderá subir seus próprios documentos. Qualquer uso de documentos errados ou falsos terá consequências legais e resultará na suspensão de sua conta imediatamente.',
+					WARNING_3:
+						'Por favor, não utilize o seu passaporte como comprovante de residência.',
+				},
+				POR: {
+					SECTION_1_TEXT_1:
+						'Para evitar atrasos no processo de verificação da sua conta, tenha certeza de que:',
+					SECTION_1_TEXT_2:
+						'Seu NOME, ENDEREÇO, DATA DE EMISSÃO e EMISSOR estejam bem visíveis;',
+					SECTION_1_TEXT_3:
+						'O comprovante de residência enviado SEJA RECENTE (MÁXIMO 3 MESES); e',
+					SECTION_1_TEXT_4:
+						'As fotos coloridas ou imagens digitalizadas enviadas sejam de ALTA QUALIDADE (pelo menos 300 DPI)',
+					SECTION_2_TITLE:
+						'ACEITAMOS OS SEGUINTES DOCUMENTOS COMO COMPROVANTES DE RESIDÊNCIA:',
+					SECTION_2_LIST_ITEM_1: 'Extratos bancários',
+					SECTION_2_LIST_ITEM_2: 'Contas de luz, água, internet, etc.).',
+					SECTION_2_LIST_ITEM_3:
+						'Um documento emitido pelo seu governo (imposto de renda, certificado de residência, etc.).',
+					WARNING:
+						'Não aceitamos o endereço escrito no documento de identidade apresentado como sendo um comprovante de residência válido.',
+				},
+				SELFIE: {
+					TITLE: 'Selfie com passaporte e Anotação exigida',
+					INFO_TEXT:
+						' Gentileza providenciar uma foto sua segurando seu passaporte e um papel com as seguintes informações: endereço eletrônico da exchange url’, a data de hoje e sua assinatura. Certifique-se de que seu rosto esteja bem visível e que as informações de seu documento estejam legíveis e nítidas.',
+					REQUIRED: 'Exigências:',
+					INSTRUCTION_1: 'Rosto bem visível ',
+					INSTRUCTION_2: 'Passaporte bem legível',
+					INSTRUCTION_3: 'Escreva o nome da exchange',
+					INSTRUCTION_4: 'Escreva a data de hoje ',
+					INSTRUCTION_5: 'Assine o papel',
+					WARNING:
+						'Selfies com passaportes diferentes daqueles fornecidos não serão aceitos',
+				},
+			},
+		},
+		BANK_ACCOUNT_FORM: {
+			VALIDATIONS: {
+				ACCOUNT_OWNER:
+					'Por favor, digite seu nome e sobrenome conforme registrado em sua conta bancária',
+				ACCOUNT_NUMBER:
+					'O número da sua conta bancária deve ter menos de 50 dígitos',
+				ACCOUNT_NUMBER_MAX_LENGTH:
+					'O número da sua conta bancária deve ter no máximo 50 caracteres',
+				CARD_NUMBER: 'O número do seu cartão está com um formato errado',
+			},
+			FORM_FIELDS: {
+				BANK_NAME_LABEL: 'Nome do banco',
+				BANK_NAME_PLACEHOLDER: 'Digite o nome do seu banco',
+				ACCOUNT_NUMBER_LABEL: 'Número da conta bancária',
+				ACCOUNT_NUMBER_PLACEHOLDER: 'Digite o número da sua conta bancária',
+				ACCOUNT_OWNER_LABEL: 'Nome do Owner’s da conta bancária',
+				ACCOUNT_OWNER_PLACEHOLDER:
+					'Digite seu nome exatamente como aparece em sua conta bancária',
+				CARD_NUMBER_LABEL: 'Número do cartão do banco',
+				CARD_NUMBER_PLACEHOLDER:
+					'Digite o número de 16 dígitos que está na frente do seu cartão do banco',
+			},
+		},
+		WARNING: {
+			TEXT_1: 'Ao verificar a sua identidade, você terá acesso a:',
+			LIST_ITEM_1: 'Aumento no limite de saques',
+			LIST_ITEM_2: 'Aumento no limite de depósitos',
+			LIST_ITEM_3: 'Taxas mais baixas',
+		},
+	},
+	USER_SETTINGS: {
+		TITLE_TEXT_1:
+			'Altere as configurações da sua conta: interface, notificações, nome de usuário e outras personalizações.',
+		TITLE_TEXT_2:
+			'Ao salvar suas configurações, todas as alterações serão aplicadas e salvas.',
+		TITLE_NOTIFICATION: 'Notificações',
+		TITLE_INTERFACE: 'Interface',
+		TITLE_LANGUAGE: 'Idioma',
+		TITLE_CHAT: 'Chat',
+		TITLE_AUDIO_CUE: 'Tocar Aviso de Áudio',
+		TITLE_MANAGE_RISK: 'Gerenciar Risco',
+		ORDERBOOK_LEVEL: 'Níveis do livro de ordens (máx. 20)',
+		SET_TXT: 'SET',
+		CREATE_ORDER_WARING: 'Criar Aviso de Ordem',
+		RISKY_TRADE_DETECTED: 'Trade arriscado detectado',
+		RISKY_WARNING_TEXT_1:
+			'O valor desta ordem está acima do valor limite da ordem que você definiu {0}.',
+		RISKY_WARNING_TEXT_2: '({0} do portfolio)',
+		RISKY_WARNING_TEXT_3:
+			'Por favor, verifique se você realmente quer fazer este trade.',
+		GO_TO_RISK_MANAGMENT: 'IR PARA GESTÃO DE RISCO',
+		CREATE_ORDER_WARING_TEXT:
+			'Crie uma janela pop-up de aviso quando sua ordem de trading usar mais de {0} da sua carteira',
+		ORDER_PORTFOLIO_LABEL: 'Valor percentual da carteira:',
+		NOTIFICATION_FORM: {
+			TRADE_POPUPS: 'Pop-ups de Trade',
+			POPUP_ORDER_CONFIRMATION: 'Pedir confirmação antes de enviar ordens',
+			POPUP_ORDER_COMPLETED: 'Mostrar pop-up quando a ordem for concluída',
+			POPUP_ORDER_PARTIALLY_FILLED:
+				'Mostrar pop-up quando a ordem estiver parcialmente preenchida',
+		},
+		AUDIO_CUE_FORM: {
+			ALL_AUDIO: 'Todas os avisos de áudio',
+			PUBLIC_TRADE_AUDIO: 'Quando um trade público for feito',
+			ORDERS_PARTIAL_AUDIO:
+				'Quando uma de suas ordens for parcialmente realizada',
+			ORDERS_PLACED_AUDIO: 'Quando uma ordem for processada',
+			ORDERS_CANCELED_AUDIO: 'Quando uma ordem for cancelada',
+			ORDERS_COMPLETED_AUDIO:
+				'Quando uma de suas ordens for totalmente realizada',
+			CLICK_AMOUNTS_AUDIO: 'Ao clicar em valores e preços no livro de ordens',
+			GET_QUICK_TRADE_AUDIO: 'Ao fazer uma cotação para trade rápido',
+			SUCCESS_QUICK_TRADE_AUDIO: 'Quando ocorrer um trade rápido bem-sucedido',
+			QUICK_TRADE_TIMEOUT_AUDIO: 'Quando o tempo do trade rápido se esgota',
+		},
+		RISK_MANAGEMENT: {
+			INFO_TEXT:
+				'Criar um aviso de pop-up quando o valor de uma ordem de trading ultrapassar uma porcentagem de valor determinada de seu portfólio',
+			INFO_TEXT_1: 'Valor total dos ativos em {0}: {1}',
+			PORTFOLIO: 'Porcentagem da carteira',
+			TOMAN_ASSET: 'Valor aproximado',
+			ADJUST: '(AJUSTAR PORCENTAGEM)',
+			ACTIVATE_RISK_MANAGMENT: 'Ativar gerenciamento de risco',
+			WARNING_POP_UP: 'Pop-ups de aviso',
+		},
+	},
+	TRANSACTION_HISTORY: {
+		TITLE: 'Histórico',
+		TITLE_TRADES: 'Histórico de Compra/Venda',
+		TITLE_DEPOSITS: 'Histórico de Depósitos',
+		TITLE_WITHDRAWALS: 'Histórico de Saques',
+		TEXT_DOWNLOAD: 'BAIXAR HISTÓRICO',
+		TRADES: 'Trades',
+		DEPOSITS: 'Depósitos',
+		WITHDRAWALS: 'Saques',
+	},
+	ACCOUNT_SECURITY: {
+		TITLE_TEXT:
+			'Ajuste as configurações de segurança para sua conta: autenticação de dois fatores (2FA), senha, chaves API e outras funções relacionadas à segurança.',
+		OTP: {
+			TITLE: '2FA',
+			OTP_ENABLED: 'otp habilitado',
+			OTP_DISABLED: 'HABILITAR O 2FA',
+			ENABLED_TEXTS: {
+				TEXT_1: 'Exigir OTP ao fazer login',
+				TEXT_2: 'Exigir OTP ao fazer saques',
+			},
+			DIALOG: {
+				SUCCESS: 'Você ativou a 2FA com sucesso',
+				REVOKE: 'Você desativou a 2FA com sucesso ',
+			},
+			CONTENT: {
+				TITLE: 'Ativar autenticação de dois fatores (2FA)',
+				MESSAGE_1: 'Escanear',
+				MESSAGE_2:
+					'Escaneie o código QR abaixo com o Google Authenticator ou Authy para configurar automaticamente a autenticação de dois fatores em seu dispositivo.',
+				MESSAGE_3:
+					'Se você tiver alguma problema ao fazer o escaneamento, você pode inserir manualmente o código abaixo.',
+				MESSAGE_4:
+					'Você deve guardar este código com em um lugar seguro pois ele será necessário quando você for recuperar seu 2FA. Isso pode acontecer caso você troque ou perca seu telefone celular.',
+				MESSAGE_5: 'Manual',
+				WARNING:
+					'É altamente recomendável que você configure a autenticação de dois fatores (2FA). Isso aumentará muito a segurança de seus recursos.',
+				ENABLE: 'Ativar autenticação de dois fatores',
+				DISABLE: 'Desativar autenticação de dois fatores',
+			},
+			FORM: {
+				PLACEHOLDER: 'Digite seu OTP fornecido pelo Google Authenticator.',
+				BUTTON: 'Ativar 2FA',
+			},
+		},
+		CHANGE_PASSWORD: {
+			TITLE: 'Senha',
+			ACTIVE: 'Ativar',
+			DIALOG: {
+				SUCCESS: 'Você mudou sua senha com sucesso',
+			},
+			FORM: {
+				BUTTON: 'Alterar a senha',
+				CURRENT_PASSWORD: {
+					label: 'Senha atual',
+					placeholder: 'Digite sua senha atual',
+				},
+				NEW_PASSWORD: {
+					label: 'Nova Senha',
+					placeholder: 'Digite uma nova senha',
+				},
+				NEW_PASSWORD_REPEAT: {
+					label: 'Confirme a nova senha',
+					placeholder: 'Digite novamente sua nova senha',
+				},
+			},
+		},
+		LOGIN: {
+			TITLE: 'Histórico de Login',
+			IP_ADDRESS: 'Endereço de IP',
+			TIME: 'Date/Time',
+			CONTENT: {
+				TITLE: 'Histórico de logins',
+				MESSAGE:
+					'Abaixo está a lista de histórico de login com dados de IP, país e hora. Se você observar qualquer atividade suspeita, você deve alterar sua senha e entrar em contato com nosso suporte',
+			},
+		},
+		FREEZE: {
+			TITLE: 'Congelar conta',
+			CONTENT: {
+				MESSAGE_1:
+					'O congelamento de sua conta interromperá os saques e também todos os trading existentes.',
+				WARNING_1:
+					'Utilize este recurso apenas se você achar que sua conta tenha sido comprometida',
+				TITLE_1: 'Congele sua conta',
+				TITLE_2: 'Congelamento de conta',
+				MESSAGE_2:
+					'O congelamento de sua conta pode ajudar a protegê-la de ataques cibernéticos.',
+				MESSAGE_3:
+					'Caso você opte pelo congelamento de conta, acontecerá o seguinte:',
+				MESSAGE_4: '1. Os saques pendentes serão cancelados.',
+				MESSAGE_5:
+					'2. Todos os trades serão interrompidos e as ordens não processadas serão canceladas.',
+				MESSAGE_6:
+					'3. Será necessária a ajuda do suporte técnico para reativar sua conta.',
+				WARNING_2: 'Você realmente deseja congelar sua conta?',
+			},
+		},
+	},
+	CURRENCY: 'Moeda',
+	TYPE: 'Tipo',
+	TYPES_VALUES: {
+		market: 'mercado',
+		limit: 'limite',
+	},
+	TYPES: [
+		{
+			value: 'market',
+			label: 'mercado',
+		},
+		{
+			value: 'limit',
+			label: 'limite',
+		},
+	],
+	SIDE: 'Side',
+	SIDES_VALUES: {
+		buy: 'comprar',
+		sell: 'vender',
+	},
+	SIDES_VERBS: {
+		buy: 'comprado',
+		sell: 'vendido',
+	},
+	SIDES: [
+		{
+			value: 'buy',
+			label: 'comprar',
+		},
+		{
+			value: 'sell',
+			label: 'vender',
+		},
+	],
+	DEFAULT_TOGGLE_OPTIONS: [
+		{
+			value: true,
+			label: 'on',
+		},
+		{
+			value: false,
+			label: 'off',
+		},
+	],
+	SIZE: 'Tamanho',
+	PRICE: 'Preço',
+	FEE: 'Taxa',
+	FEES: 'Taxas',
+	LIMIT: 'Limite',
+	TIME: 'Tempo',
+	TIMESTAMP: 'Timestamp',
+	MORE: 'Mais',
+	VIEW: 'Visualizar',
+	STATUS: 'Status',
+	AMOUNT: 'Quantia',
+	COMPLETE: 'Finaliar',
+	PENDING: 'Pendente',
+	REJECTED: 'Rejeitado',
+	ORDERBOOK: 'Livro de ordens',
+	CANCEL: 'Cancelar',
+	CANCEL_ALL: 'Cancelar tudo',
+	GO_TRADE_HISTORY: 'Ir para o histórico de transações',
+	ORDER_ENTRY: 'entrada de ordem',
+	TRADE_HISTORY: 'histórico',
+	CHART: 'tabela de preços',
+	ORDERS: 'minhas ordens ativas',
+	TRADES: 'meu histórico de transações',
+	RECENT_TRADES: 'meus trades recentes',
+	ORDER_HISTORY: 'Histórico de ordens',
+	PUBLIC_SALES: 'vendas públicas',
+	REMAINING: 'Restante',
+	FULLFILLED: '{0} % Processada',
+	FILLED: 'Processada',
+	LOWEST_PRICE: 'Menor preço ({0})',
+	PHASE: 'Fase',
+	INCOMING: 'Entrada ',
+	PRICE_CURRENCY: 'PREÇO ({0})',
+	AMOUNT_SYMBOL: 'QUANTIA ({0})',
+	MARKET_PRICE: 'Preço de mercado',
+	ORDER_PRICE: 'Preço da ordem',
+	TOTAL_ORDER: 'Total de ordens',
+	NO_DATA: 'Sem dados',
+	LOADING: 'Carregando',
+	CHART_TEXTS: {
+		d: 'Dados',
+		o: 'Abrir',
+		h: 'alto',
+		l: 'baixo',
+		c: 'Fechar',
+		v: 'Volume',
+	},
+	QUICK_TRADE: 'Trade rápido',
+	PRO_TRADE: 'Trade Pro',
+	ADMIN_DASH: 'Página Admin',
+	WALLET_TITLE: 'Carteira',
+	TRADING_MODE_TITLE: 'Modo Trading',
+	TRADING_TITLE: 'Trading',
+	LOGOUT: 'Logout',
+	WITHDRAWALS_MIN_VALUE_ERROR:
+		'A transação é muito pequena para ser enviada. Experimente uma quantia maior.',
+	WITHDRAWALS_MAX_VALUE_ERROR:
+		'A transação é muito grande para ser enviada. Experimente uma quantidade menor.',
+	WITHDRAWALS_LOWER_BALANCE:
+		'Você não tem {0} suficiente em seu saldo para enviar essa transação',
+	WITHDRAWALS_FEE_TOO_LARGE: 'A taxa é mais do que {0}% de sua transação total',
+	WITHDRAWALS_BTC_INVALID_ADDRESS:
+		'O endereço Bitcoin é inválido. Por favor, verifique com atenção e insira novamente ',
+	WITHDRAWALS_ETH_INVALID_ADDRESS:
+		'O endereço Ethereum é inválido. Por favor, verifique com atenção e insira novamente',
+	WITHDRAWALS_BUTTON_TEXT: 'revisar saque',
+	WITHDRAWALS_FORM_ADDRESS_LABEL: 'Endereço de destino',
+	WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER: 'Digite o endereço',
+	WITHDRAWALS_FORM_DESTINATION_TAG_LABEL: 'Tag de destino (opcional)',
+	WITHDRAWALS_FORM_MEMO_LABEL: 'Memorando (opcional)',
+	WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER: 'Digite a tag de destino',
+	WITHDRAWALS_FORM_MEMO_PLACEHOLDER: 'Digite o memorando de transação',
+	WITHDRAWALS_FORM_AMOUNT_LABEL: '{0} quantia para sacar ',
+	WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER:
+		'Digite a quantia de {0} que deseja sacar',
+	WITHDRAWALS_FORM_FEE_COMMON_LABEL: 'Taxa de transação',
+	WITHDRAWALS_FORM_FEE_FIAT_LABEL: 'Taxa de saque em bancos',
+	WITHDRAWALS_FORM_FEE_PLACEHOLDER:
+		'Digite o valor de {0} que deseja usar na taxa da transação',
+	WITHDRAWALS_FORM_FEE_OPTIMAL_VALUE: 'Taxa ideal: {0} {1}',
+	DEPOSITS_FORM_AMOUNT_LABEL: '{0} quantia a depositar',
+	DEPOSITS_FORM_AMOUNT_PLACEHOLDER: 'Digite a quantia de {0} que deseja sacar',
+	DEPOSITS_BUTTON_TEXT: 'revisar depósito',
+	DEPOSIT_PROCEED_PAYMENT: 'Pagar',
+	DEPOSIT_BANK_REFERENCE:
+		'Adicione este código {0} à transação bancária para identificar o depósito',
+	DEPOSIT_METHOD: 'Método de Pagamento {0}',
+	DEPOSIT_METHOD_DIRECT_PAYMENT: 'Cartão de crédito',
+	DEPOSIT_METHOD_DIRECT_PAYMENT_MESSAGE_1:
+		'Prossiga para o meio de pagamento com cartão de crédito.',
+	DEPOSIT_METHOD_DIRECT_PAYMENT_MESSAGE_2:
+		'Você vai sair da plataforma para fazer o pagamento.',
+	DEPOSIT_VERIFICATION_WAITING_TITLE: 'Verificando o pagamento',
+	DEPOSIT_VERIFICATION_WAITING_MESSAGE:
+		'Por favor, não feche o aplicativo enquanto o pagamento estiver sendo verificado',
+	DEPOSIT_VERIFICATION_WARNING_MESSAGE:
+		'Se algo deu errado durante a verificação, entre em contato conosco.',
+	DEPOSIT_VERIFICATION_WARNING_INFORMATION:
+		'Este é o ID da operação: {0} , gentileza fornecer este ID para que possamos ajudá-lo(a).',
+	DEPOSIT_VERIFICATION_SUCCESS: 'Pagamento verificado',
+	DEPOSIT_VERIFICATION_ERROR: 'Ocorreu um erro ao verificar o depósito.',
+	DEPOSIT_VERIFICATION_ERROR_VERIFIED: 'O depósito já foi verificado',
+	DEPOSIT_VERIFICATION_ERROR_STATUS: 'Status inválido',
+	DEPOSIT_VERIFICATION_ERROR_USER_MATCH:
+		'O cartão que você fez o depósito não é o mesmo que o cartão registrado conosco. Por isso, seu depósito foi rejeitado e seus fundos serão reembolsados em até uma hora.',
+	QUOTE_MESSAGE: 'Você vai para {0} {1} {2} por {3} {4}',
+	QUOTE_BUTTON: 'Aceitar',
+	QUOTE_REVIEW: 'Revisar',
+	QUOTE_COUNTDOWN_MESSAGE: 'Você tem {0} segundos para fazer seu trading',
+	QUOTE_EXPIRED_TOKEN: 'O token de cotação expirou.',
+	QUOTE_SUCCESS_REVIEW_TITLE: 'Trade Rápido',
+	QUOTE_SUCCESS_REVIEW_MESSAGE: 'Você conseguiu {0} {1} {2} para {3} {4}',
+	COUNTDOWN_ERROR_MESSAGE: 'A contagem regressiva terminou',
+	WITHDRAW_PAGE: {
+		BANK_TO_WITHDRAW: 'Banco para sacar',
+		MESSAGE_ABOUT_SEND: 'Você está prestes a enviar',
+		MESSAGE_BTC_WARNING:
+			'Por favor, tenha certeza de que o endereço esteja correto, pois {0} as transferências são irreversíveis ',
+		MESSAGE_ABOUT_WITHDRAW:
+			'Você está prestes a transferir para sua conta bancária',
+		MESSAGE_FEE: 'Taxa de transações de {0} ({1}) incluída',
+		MESSAGE_FEE_BASE: 'Taxa de transação de {0} incluída',
+		BASE_MESSAGE_1:
+			'Você só pode sacar para uma conta bancária que tenha em seu registro um nome que corresponda ao nome registrado em sua conta.',
+		BASE_MESSAGE_2: 'Valor mínimo para saque',
+		BASE_MESSAGE_3: 'Quantidade máxima para saques diários',
+		BASE_INCREASE_LIMIT: 'Aumente o seu limite diário',
+		CONFIRM_VIA_EMAIL: 'Confirmar via e-mail',
+		CONFIRM_VIA_EMAIL_1: 'Enviamos a você um e-mail de confirmação de saque.',
+		CONFIRM_VIA_EMAIL_2:
+			'Para concluir o processo de saque, por favor confirme',
+		CONFIRM_VIA_EMAIL_3: 'o saque através de seu e-mail dentro de 5 minutos.',
+		WITHDRAW_CONFIRM_SUCCESS_1:
+			'Seu pedido de saque está confirmado e será processado em breve. ',
+		WITHDRAW_CONFIRM_SUCCESS_2:
+			'Para ver o seu status de seu saque, visite a sua página de histórico de saques.',
+		GO_WITHDRAWAL_HISTORY: 'Ir para o histórico de saques',
+	},
+	WALLET_BUTTON_BASE_DEPOSIT: 'depósito',
+	WALLET_BUTTON_BASE_WITHDRAW: 'saque',
+	WALLET_BUTTON_CRYPTOCURRENCY_DEPOSIT: 'receber',
+	WALLET_BUTTON_CRYPTOCURRENCY_WITHDRAW: 'enviar',
+	AVAILABLE_TEXT: 'Disponível',
+	AVAILABLE_BALANCE_TEXT: 'Saldo {0} disponível: {1} {2}',
+	BALANCE_TEXT: 'Saldo',
+	CURRENCY_BALANCE_TEXT: '{0} Saldo',
+	WALLET_TABLE_AMOUNT_IN: 'Quantidade em {0}',
+	WALLET_TABLE_TOTAL: 'Total geral',
+	WALLET_ALL_ASSETS: 'Todos os ativos',
+	WALLET_HIDE_ZERO_BALANCE: 'Ocultar saldo zero',
+	WALLET_ESTIMATED_TOTAL_BALANCE: 'Balanço total estimado',
+	WALLET_ASSETS_SEARCH_TXT: 'Pesquisar',
+	HIDE_TEXT: 'Ocultar',
+	PAGINATOR_FORMAT: '{0} / {1}',
+	ORDERBOOK_SELLERS: 'Vendedores ',
+	ORDERBOOK_BUYERS: 'Compradores',
+	ORDERBOOK_SPREAD: 'spread {0}',
+	ORDERBOOK_SPREAD_PRICE: '{0} {1}',
+	CALCULATE_MAX: 'Max',
+	DATEFIELD_TOOGLE_DATE_GR: 'Calendário gregoriano',
+	VERIFICATION_WARNING_TITLE: 'Verificação de seus dados bancários',
+	VERIFICATION_WARNING_MESSAGE:
+		'Você precisa verificar seus dados bancários antes de efetuar o saque.',
+	ORDER_SPENT: 'Gasto ',
+	ORDER_RECEIVED: 'Recebido ',
+	ORDER_SOLD: 'Vendido',
+	ORDER_BOUGHT: 'Comprado',
+	ORDER_AVERAGE_PRICE: 'Preço médio',
+	ORDER_TITLE_CREATED: 'Limite criado com sucesso {0}',
+	ORDER_TITLE_FULLY_FILLED: '{0} ordem processada com sucesso',
+	ORDER_TITLE_PARTIALLY_FILLED: '{0} ordem parcialmente processada',
+	ORDER_TITLE_TRADE_COMPLETE: '{0} {1} ordem foi bem-sucedida',
+	LOGOUT_TITLE: 'Você foi deslogado',
+	LOGOUT_ERROR_TOKEN_EXPIRED: 'O token expirou',
+	LOGOUT_ERROR_LOGIN_AGAIN: 'Faça o login novamente',
+	LOGOUT_ERROR_INVALID_TOKEN: 'Token inválido',
+	LOGOUT_ERROR_INACTIVE: 'Você foi deslogado por ter ficado inativo',
+	ORDER_ENTRY_BUTTON: '{0} {1}',
+	ORDER_ENTRY_ADVANCED: 'Avançado',
+	QUICK_TRADE_OUT_OF_LIMITS: 'O tamanho da ordem está fora dos limites',
+	QUICK_TRADE_TOKEN_USED: 'Este token já foi usado',
+	QUICK_TRADE_QUOTE_EXPIRED: 'A cotação expirou',
+	QUICK_TRADE_QUOTE_INVALID: 'Cotação inválida',
+	QUICK_TRADE_QUOTE_CALCULATING_ERROR: 'Erro ao calcular a cotação',
+	QUICK_TRADE_ORDER_CAN_NOT_BE_FILLED:
+		'A ordem com o tamanho atual não pode ser processada',
+	QUICK_TRADE_ORDER_NOT_FILLED: 'Ordem não processada',
+	QUICK_TRADE_NO_BALANCE: 'Saldo insuficiente para lançar a ordem',
+	QUICK_TRADE_SUCCESS: 'Sucesso!',
+	QUICK_TRADE_INSUFFICIENT_FUND: 'Fundos insuficientes',
+	QUICK_TRADE_INSUFFICIENT_FUND_MESSAGE:
+		'Você não tem fundos suficientes em sua carteira para concluir esta transação.',
+	YES: 'Sim',
+	NO: 'Não',
+	NEXT: 'Próximo ',
+	SKIP_FOR_NOW: 'Pular por agora',
+	SUBMIT: 'enviar',
+	RESUBMIT: 'Reenviar',
+	VERIFICATION_NOTIFICATION_SKIP_TITLE: 'Faltando documentos!',
+	VERIFICATION_NOTIFICATION_SKIP_TEXT:
+		'Para obter acesso total às funções de saque e depósito, você deve enviar seus documentos de identidade na página de sua conta.',
+	VERIFICATION_NOTIFICATION_SUCCESS_TITLE: 'Sucesso!',
+	VERIFICATION_NOTIFICATION_SUCCESS_TEXT:
+		'Você receberá uma notificação por e-mail quando suas informações forem processadas. O processamento normalmente leva de 1 a 3 dias.',
+	VERIFICATION_NOTIFICATION_BUTTON: 'PROSSEGUIR PARA A EXCHANGE',
+	ERROR_USER_ALREADY_VERIFIED: 'Usuário já verificado',
+	ERROR_INVALID_CARD_USER:
+		'As informações bancárias ou do cartão fornecidas estão incorretas',
+	ERROR_INVALID_CARD_NUMBER: 'Número de cartão inválido',
+	ERROR_LOGIN_USER_NOT_VERIFIED: 'Usuário não verificado',
+	ERROR_LOGIN_USER_NOT_ACTIVATED: 'O usuário não está ativo',
+	ERROR_LOGIN_INVALID_CREDENTIALS: 'Credenciais incorretas',
+	SMS_SENT_TO: 'SMS enviado para {0}',
+	SMS_ERROR_SENT_TO:
+		'Erro ao enviar SMS para {0}. Atualize a página e tente novamente.',
+	WITHDRAW_NOTIFICATION_TRANSACTION_ID: 'ID da transação:',
+	CHECK_ORDER: 'Verifique e confirme sua ordem',
+	CHECK_ORDER_TYPE: '{0} {1}',
+	CONFIRM_TEXT: 'Confirmar',
+	GOTO_XHT_MARKET: 'Vá para o mercado XHT',
+	INVALID_CAPTCHA: 'Captcha inválido',
+	NO_FEE: 'N/D',
+	SETTINGS_LANGUAGE_LABEL: 'Preferências de idioma (inclui e-mails)',
+	SETTINGS_LANGUAGE_OPTIONS: LANGUAGES,
+	SETTINGS_ORDERPOPUP_LABEL: 'Exibir pop-up de confirmação de ordem',
+	SETTINGS_ORDERPOPUP_OPTIONS: [
+		{
+			value: false,
+			label: 'NÃO',
+		},
+		{
+			value: true,
+			label: 'SIM',
+		},
+	],
+	SETTINGS_THEME_LABEL: 'Tema da interface do usuário',
+	SETTINGS_THEME_OPTIONS: [
+		{
+			value: 'white',
+			label: 'Branco',
+		},
+		{
+			value: 'dark',
+			label: 'Escuro',
+		},
+	],
+	SETTING_BUTTON: 'salvar',
+	STRING_WITH_PARENTHESIS: '{0} ({1})',
+	VERIFICATION_NO_WITHDRAW_TITLE: 'Saques desabilitadas',
+	VERIFICATION_NO_WITHDRAW_MESSAGE: 'Sua conta está desabilitada para saques',
+	UP_TO_MARKET: 'Ir até o mercado',
+	VIEW_MY_FEES: 'Ver minhas taxas',
+	DEVELOPER_SECTION: {
+		TITLE: 'Chave API',
+		INFORMATION_TEXT:
+			'A API fornece funcionalidades como obtenção de saldos de carteira, gerenciamento de ordens de compra / venda, solicitação de saques, bem como dados de mercado, negociações recentes, livro de ordens e ticker.',
+		ERROR_INACTIVE_OTP:
+			'Para gerar uma chave API, você precisa habilitar a autenticação de dois fatores.',
+		ENABLE_2FA: 'Ativar 2FA',
+		WARNING_TEXT: 'Não compartilhe sua chave de API com outras pessoas.',
+		GENERATE_KEY: 'Gerar chave API',
+		ACTIVE: 'Ativa ',
+		INACTIVE: 'Inativa',
+		INVALID_LEVEL:
+			'Você precisa atualizar seu nível de verificação para ter acesso a este recurso',
+	},
+	DEVELOPERS_TOKENS_POPUP: {
+		GENERATE_TITLE: 'Gerar chave API',
+		GENERATE_TEXT:
+			'Por favor, nomeie sua chave de API e guarde em um lugar seguro e privado após ser gerada. Você não poderá recuperá-la novamente depois.',
+		GENERATE: 'Gerar',
+		DELETE_TITLE: 'Excluir chave API',
+		DELETE_TEXT:
+			'A exclusão de sua chave de API é algo irreversível, embora você possa gerar uma nova chave de API a qualquer momento. Você quer deletar sua chave de API?',
+		DELETE: 'DELETAR',
+		FORM_NAME_LABEL: 'Nomear',
+		FORM_LABLE_PLACEHOLDER: 'Nome da chave API',
+		API_KEY_LABEL: 'Chave API',
+		SECRET_KEY_LABEL: 'Chave secreta',
+		CREATED_TITLE: 'Copie sua chave de API',
+		CREATED_TEXT_1:
+			'Por favor, copie sua chave de API em algum lugar agora, pois você não terá mais acesso à ela no futuro.',
+		CREATED_TEXT_2: 'Mantenha sua chave segura e em um lugar privado.',
+	},
+	DEVELOPERS_TOKENS_TABLE: {
+		NAME: 'Nome',
+		API_KEY: 'Chave API',
+		SECRET: 'Sigilo',
+		CREATED: 'Data Gerada',
+		REVOKE: 'Anular',
+		REVOKED: 'Anulado',
+		REVOKE_TOOLTIP: 'Você tem que habilitar 2FA para anular o token',
+	},
+	CHAT: {
+		CHAT_TEXT: 'chat',
+		MARKET_CHAT: 'Chat do Mercado',
+		CHAT_UNREAD: '{0} ({1})',
+		READ_MORE: 'Saiba mais',
+		SHOW_IMAGE: 'Mostrar imagem',
+		HIDE_IMAGE: 'Ocultar imagem',
+		CHAT_MESSAGE_BOX_PLACEHOLDER: ' Mensagem ',
+		SIGN_UP_CHAT: 'Inscreva-se para entrar no chat',
+		JOIN_CHAT: 'Definir nome de usuário para o chat',
+		TROLLBOX: 'Trollbox ({0})',
+	},
+	INVALID_USERNAME:
+		'O nome de usuário deve ter entre 3 e 15 caracteres, conter apenas letras minúsculas, números e traços',
+	USERNAME_TAKEN:
+		'Este nome de usuário já foi escolhido. Por favor, tente outro. ',
+	USERNAME_LABEL: 'Nome de usuário (usado para o chat)',
+	USERNAME_PLACEHOLDER: 'Nome de usuário',
+	TAB_USERNAME: 'Nome de usuário',
+	USERNAME_WARNING:
+		'Seu nome de usuário só pode ser alterado uma vez. Certifique-se de que seu nome de usuário é realmente aquele que você quer.',
+	USERNAME_CANNOT_BE_CHANGED: 'Nome de usuário não pode ser alterado',
+	UPGRADE_LEVEL: 'Faça o upgrade do nível de conta',
+	LEVELS: {
+		LABEL_LEVEL: 'Nível',
+		LABEL_LEVEL_1: 'Um',
+		LABEL_LEVEL_2: 'Dois',
+		LABEL_LEVEL_3: 'Três',
+		LABEL_MAKER_FEE: 'Taxa do prestador',
+		LABEL_TAKER_FEE: 'Taxa de tomador',
+		LABEL_BASE_DEPOSIT: 'Depósito diário em euros',
+		LABEL_BASE_WITHDRAWAL: 'Saque diário em euros',
+		LABEL_BTC_DEPOSIT: 'Depósito diário em Bitcoins',
+		LABEL_BTC_WITHDRAWAL: 'Saque diário em Bitcoins',
+		LABEL_ETH_DEPOSIT: 'Depósito diário em Ethereum',
+		LABEL_ETH_WITHDRAWAL: 'Saque diário em Ethereum',
+		LABEL_PAIR_MAKER_FEE: '{0} Taxa do prestador',
+		LABEL_PAIR_TAKER_FEE: '{0} Taxa de tomador',
+		UNLIMITED: 'Ilimitado',
+		BLOCKED: 'Desativado',
+	},
+	WALLET_ADDRESS_TITLE: 'Criar {0} carteira',
+	WALLET_ADDRESS_GENERATE: 'Criar',
+	WALLET_ADDRESS_MESSAGE:
+		'Quando você cria uma carteira, você cria um endereço de depósito e de saque.',
+	WALLET_ADDRESS_ERROR:
+		'Erro ao criar o endereço. Atualize a página e tente novamente.',
+	DEPOSIT_WITHDRAW: 'Depósito / Saque',
+	GENERATE_WALLET: 'Criar carteira',
+	TRADE_TAB_CHART: 'Gráfico',
+	TRADE_TAB_TRADE: 'Trade',
+	TRADE_TAB_ORDERS: 'Ordens',
+	TRADE_TAB_POSTS: 'Posts',
+	WALLET_TAB_WALLET: ' Carteira',
+	WALLET_TAB_TRANSACTIONS: 'Transações',
+	RECEIVE_CURRENCY: 'Receber {0}',
+	SEND_CURRENCY: 'Enviar {0}',
+	COPY_ADDRESS: 'Copiar Endereço',
+	SUCCESFUL_COPY: 'Copiado com sucesso!',
+	QUICK_TRADE_MODE: 'Modo de trade rápido',
+	JUST_NOW: 'Agora mesmo',
+	PAIR: 'Par',
+	ZERO_ASSET: 'Você não tem nenhum ativo.',
+	DEPOSIT_ASSETS: 'Depositar ativos',
+	SEARCH_TXT: 'Pesquisar',
+	SEARCH_ASSETS: 'Pesquisar Ativos',
+	TOTAL_ASSETS_VALUE: 'Valor total dos ativos em {0}: {1}',
+	SUMMARY: {
+		TITLE: 'Resumo',
+		TINY_PINK_SHRIMP_TRADER: 'Trader Básico',
+		TINY_PINK_SHRIMP_TRADER_ACCOUNT: 'Conta do trader Básico',
+		LITTLE_RED_SNAPPER_TRADER: 'Trader Gold',
+		LITTLE_RED_SNAPPER_TRADER_ACCOUNT: 'Conta do trader Gold',
+		CUNNING_BLUE_KRAKEN_TRADING: 'Trader Platinum',
+		CUNNING_BLUE_KRAKEN_TRADING_ACCOUNT: 'Conta do trader Platinum',
+		BLACK_LEVIATHAN_TRADING: 'Trader Diamond Black',
+		BLACK_LEVIATHAN_TRADING_ACCOUNT: 'Conta do trader Diamond Black',
+		URGENT_REQUIREMENTS: 'Requisitos Urgentes',
+		TRADING_VOLUME: 'Volume de trading',
+		ACCOUNT_ASSETS: 'Ativos da conta',
+		ACCOUNT_DETAILS: 'Detalhes da conta',
+		SHRIMP_ACCOUNT_TXT_1: 'Sua jornada começa aqui!',
+		SHRIMP_ACCOUNT_TXT_2:
+			'Continue fazendo cada vez mais trading e logo você vai se destacar dos demais traders',
+		SNAPPER_ACCOUNT_TXT_1:
+			'Parabéns por manter-se firme em meio às flutuações do mercado.',
+		SNAPPER_ACCOUNT_TXT_2:
+			'Continue nesta jornada do trading que em breve você encontrará novas recompensas criptográficos à frente.',
+		KRAKEN_ACCOUNT_TXT_1:
+			'Um trader persistente e motivado resiste bem à qualquer dificuldade.',
+		LEVIATHAN_ACCOUNT_TXT_1:
+			'Ser um trader Diamond Black com certeza é para poucos! Apenas os mais fortes tem a resiliência de passar por desafios incalculáveis.',
+		VIEW_FEE_STRUCTURE: 'Ver Estrutura e Limites de Taxas',
+		UPGRADE_ACCOUNT: 'Fazer o upgrade da conta',
+		ACTIVE_2FA_SECURITY: 'Segurança 2FA ativa',
+		ACCOUNT_ASSETS_TXT_1: 'Exibido é um resumo de todos os seus ativos.',
+		ACCOUNT_ASSETS_TXT_2:
+			'Ao manter uma grande quantidade de ativos em sua carteira, você terá direito a um upgrade de conta que inclui uma badge exclusiva e taxas de trading mais baixas.',
+		TRADING_VOLUME_TXT_1:
+			'Seu histórico de volume de trading é exibido em {0} e é nominalmente calculado no final de cada mês a partir de todos os pares de moedas.',
+		TRADING_VOLUME_TXT_2:
+			'Uma alta atividade de trading lhe dará direito a um upgrade de conta, recompensando-o com uma badge exclusiva além de outras vantagens.',
+		ACCOUNT_DETAILS_TXT_1:
+			'Seu tipo de conta determina sua badge de conta, taxa de negociação, limites para depósitos e saques.',
+		ACCOUNT_DETAILS_TXT_2:
+			'O tempo de abertura de uma conta trading, a intensidade de sua atividade na plataforma e o valor total dos ativos da sua conta irão determinar se a sua conta é elegível para um upgrade ou não.',
+		ACCOUNT_DETAILS_TXT_3:
+			'Para manter o nível da sua conta, é necessário fazer trades constantes e manter uma certa quantidade de ativos depositados.',
+		ACCOUNT_DETAILS_TXT_4:
+			'O downgrading periódico das contas ocorrerá se o usuário não for muito ativo na plataforma e nem manter seus ativos na conta.',
+		REQUIREMENTS: 'Exigências',
+		ONE_REQUIREMENT: 'Apenas uma exigência:',
+		REQUEST_ACCOUNT_UPGRADE: 'Solicitar um upgrade de conta',
+		FEES_AND_LIMIT: '{0} Estrutura de taxas e limites ',
+		FEES_AND_LIMIT_TXT_1:
+			'Tornar-se um crypto trader marca um novo começo. Você somente terá permissão para atualizar sua conta se estiver munido de inteligência, vontade, velocidade e capacidade de assumir riscos ao fazer trading.',
+		FEES_AND_LIMIT_TXT_2:
+			'Cada conta tem suas próprias taxas e limites de depósito e saque.',
+		DEPOSIT_WITHDRAWAL_ALLOWENCE: 'Provisão para depósito & saque',
+		TRADING_FEE_STRUCTURE: 'Estrutura da taxa de negociação',
+		WITHDRAWAL: 'Saque ',
+		DEPOSIT: 'Depósito',
+		TAKER: 'Tomador',
+		MAKER: 'Prestador',
+		WEBSITE: 'website',
+		VIP_TRADER_ACCOUNT_ELIGIBLITY:
+			'Elegibilidade para upgrade de conta VIP Trader ',
+		PRO_TRADER_ACCOUNT_ELIGIBLITY:
+			'Elegibilidade para upgrade de conta Pro Trader ',
+		TRADER_ACCOUNT_ELIGIBILITY: 'Nível {0} de elegibilidade da conta ',
+		NOMINAL_TRADING: ' Trading Nominal',
+		NOMINAL_TRADING_WITH_MONTH: 'Trading Nominal Último {0}',
+		ACCOUNT_AGE_OF_MONTHS: 'Tempo da conta de {0} meses',
+		TRADING_VOLUME_EQUIVALENT: '{0} {1} Volume de trading equivalente',
+		LEVEL_OF_ACCOUNT: 'Nível {0} da conta',
+		TITLE_OF_ACCOUNT: '{0} Conta',
+		LEVEL_TXT_DEFAULT: 'Adicione a descrição do seu nível aqui',
+		LEVEL_1_TXT:
+			'Sua jornada começa aqui, jovem crypto trader! Para ganhar bônus, basta verificar sua identidade e também conseguir limites maiores de depósito e saque com taxas de trading reduzidas.',
+		LEVEL_2_TXT:
+			'Basta fazer um volume de trading mensal acima de $ 3.000 USDT ou ter um saldo de mais de 5.000 XHT para desfrutar de taxas de trading mais baixas.',
+		LEVEL_3_TXT:
+			'É aqui que as coisas viram realidade! Desfrute de taxas de trading reduzidas e maiores limites de depósito e saque. Para chegar ao nível 3, é preciso completar sua verificação ',
+		LEVEL_4_TXT:
+			'Basta fazer um volume de trading mensal acima de $ 10.000 USDT ou ter um saldo de mais de 10.000 XHT para desfrutar de taxas de trading mais baixas.',
+		LEVEL_5_TXT:
+			'- Você conseguiu! A conta de nível 5 é uma conta rara, apenas para operadores de câmbio, usuários do Vault ou participantes do Programa de Afiliados da HollaEx (HAP). Desfrute de limites maiores e de taxa zero para prestadores.',
+		LEVEL_6_TXT:
+			'Basta fazer um volume de trading mensal acima de $ 300.000 USDT ou ter um saldo de mais de 100.000 XHT para desfrutar de taxas de trading mais baixas e maior quantidade de saques.',
+		LEVEL_7_TXT:
+			'Basta fazer um volume de trading mensal acima de $ 500.000 USDT ou ter um saldo de mais de 300.000 XHT para desfrutar de taxas de trading mais baixas e maior quantidade de saques.',
+		LEVEL_8_TXT:
+			'Basta fazer um volume de trading mensal acima de $ 600.000 USDT ou ter um saldo de mais de 400.000 XHT para desfrutar de taxas de trading mais baixa.',
+		LEVEL_9_TXT:
+			'Basta fazer um volume de trading mensal acima de $ 2.000.000 USDT ou ter um saldo de mais de 1.000.000 XHT para desfrutar de taxas de trading mais baixa.',
+		LEVEL_10_TXT:
+			'A conta de whale trader que faz você ganhar dinheiro de volta ao criar mercados. Para obter essa conta especial, entre em contato conosco.',
+		CURRENT_TXT: 'Atual',
+		TRADER_ACCOUNT_XHT_TEXT:
+			'Sua conta está no período de pré-venda de XHT. Isso significa que você pode comprar XHT no valor de $ 0,10 para cada XHT. Todos os depósitos serão convertidos em XHT assim que a transação for concluída.',
+		TRADER_ACCOUNT_TITLE: 'Conta - Período de pré-venda',
+		HAP_ACCOUNT: 'Conta HAP',
+		HAP_ACCOUNT_TXT:
+			'Sua conta é uma conta verificada do Programa de Afiliados HollaEx (HAP). Agora você pode ganhar um bônus de 10% para cada pessoa que você convidar, e que venha a comprar XHT.',
+		EMAIL_VERIFICATION: 'Verificação de e-mail',
+		DOCUMENTS: 'Documentos',
+		HAP_TEXT: 'Programa de Afiliados HollaEx(HAP) {0}',
+		LOCK_AN_EXCHANGE: 'Bloquear uma Exchange {0}',
+		WALLET_SUBSCRIPTION_USERS: 'Usuários Assinantes do Vault {0}',
+		TRADE_OVER_XHT: 'Faça trading acima de {0} com valor equivalente em USDT',
+		TRADE_OVER_BTC: 'Faça trading acima de {0} com valor equivalente em BTC',
+		XHT_IN_WALLET: '{0} XHT na carteira ',
+		REWARDS_BONUS: 'Recompensas e Bônus',
+		COMPLETE_TASK_DESC:
+			'Complete as tarefas e ganhe bônus no valor de mais de $ 10.000.',
+		TASKS: 'Tasks',
+		MAKE_FIRST_DEPOSIT: 'Faça seu primeiro depósito e receba 1 XHT',
+		BUY_FIRST_XHT: 'Compre seu primeiro XHT e receba um bônus de 5 XHT ',
+		COMPLETE_ACC_VERIFICATION:
+			'Conclua a verificação da sua conta e receba um bônus de 20 XHT',
+		INVITE_USER: 'Convide outros usuários e ganhe comissões dos trading deles',
+		JOIN_HAP:
+			'Faça parte do HAP e ganhe 10% para cada Kit HollaEx que você vender',
+		EARN_RUNNING_EXCHANGE:
+			'Ganhe uma renda passiva ao ter a sua própria exchange',
+		XHT_WAVE_AUCTION: 'Dados de leilão XHT Wave',
+		XHT_WAVE_DESC_1:
+			'A distribuição do token HollaEx (XHT) é feita por meio de um Leilão Wave.',
+		XHT_WAVE_DESC_2:
+			'O Leilão Wave vende uma quantidade aleatória de XHT, em momentos aleatórios, para os maiores lances feitos no livro de ordens',
+		XHT_WAVE_DESC_3: 'Abaixo temos os dados históricos do Leilão Wave',
+		WAVE_AUCTION_PHASE: 'Fase de Leilão Wave {0}',
+		LEARN_MORE_WAVE_AUCTION: 'Saiba mais sobre o Leilão Wave ',
+		WAVE_NUMBER: 'Número Wave',
+		DISCOUNT: '( {0}% de desconto )',
+		MY_FEES_LIMITS: 'Minhas taxas e limites',
+		MARKETS: 'Mercados',
+		CHANGE_24H: 'Variação em 24H',
+		VOLUME_24H: 'Volume em 24H ',
+		PRICE_GRAPH_24H: 'Gráfico de preço 24H',
+		VIEW_MORE_MARKETS: 'Ver mais mercados',
+	},
+	REFERRAL_LINK: {
+		TITLE: 'Convide seu amigo',
+		INFO_TEXT:
+			'Indique seus amigos por meio deste link e receba benefícios toda vez que alguém fizer trade.',
+		COPY_FIELD_LABEL: 'Compartilhe o link abaixo com amigos e ganhe comissões:',
+		REFERRED_USER_COUT: 'Você indicou {0} usuários',
+		COPY_LINK_BUTTON: 'COPIAR LINK DE INDICAÇÃO',
+		XHT_TITLE: 'MINHAS INDICAÇÕES',
+		XHT_INFO_TEXT: 'Ganhe comissões ao convidar seus amigos.',
+		XHT_INFO_TEXT_1: 'As comissões são pagas periodicamente em sua carteira',
+		APPLICATION_TXT:
+			'Para se tornar um distribuidor HollaEx Kit, preencha o formulário.',
+		TOTAL_REFERRAL: 'Total comprado vindo de indicações:',
+		PENDING_REFERRAL: 'Comissões pendentes:',
+		EARN_REFERRAL: 'Comissões ganham:',
+		XHT_COUNT: '{0} XHT',
+		APPLY_BUTTON: 'SOLICITAR',
+	},
+	STAKE_TOKEN: {
+		TITLE: 'Realizar o stake do Token HollaEx',
+		INFO_TXT1:
+			'Os tokens HollaEx (XHT) devem ter uma garantia (staked) para rodar o software do HollaEx Kit exchange.',
+		INFO_TXT2:
+			'Você pode fazer uma garantia igual a essa para seu token HollaEx e ganhar os XHT não vendidos durante o leilão Wave.',
+		INFO_TXT3:
+			'Basta ir para dash.bitholla.com e fazer a garantia da sua própria exchange hoje e ganhar XHTs grátis',
+		BUTTON_TXT: 'SAIBA MAIS',
+	},
+	TERMS_OF_SERVICES: {
+		TITLE: 'Contrato de Compra de Token HollaEx',
+		SERVICE_AGREEMENT: AGREEMENT,
+		PROCEED: ' CONTINUAR',
+		AGREE_TERMS_LABEL:
+			'Eu li e concordo com o Contrato de Compra de Token HollaEx',
+		RISK_INVOLVED_LABEL: 'Eu entendo os riscos envolvidos',
+		DOWNLOAD_PDF: 'Baixar o PDF',
+		DEPOSIT_FUNDS:
+			'Deposite fundos em sua carteira para obter HollaEx Token (XHT)',
+		READ_FAG: 'Leia o FAQ da HollaEx aqui: {0}',
+		READ_DOCUMENTATION: 'Leia o white paper da HollaEx aqui: {0}',
+		READ_WAVES: 'Regras para o próximo leilão público Wave de dezembro{0}',
+		DOWNLOAD_BUY_XHT:
+			'Baixe o PDF para ver o passo a passo de um processo visual na {0}',
+		HOW_TO_BUY: 'como comprar HollaEx Token (XHT)',
+		PUBLIC_SALES: 'Leilão público Wave',
+		CONTACT_US:
+			'Sinta-se à vontade para nos contatar para mais informações ou qualquer dúvida. Basta enviar um e-mail para {0}',
+		VISUAL_STEP: 'Vee o passo a passo de um processo visual na {0}',
+		WARNING_TXT:
+			'Analisaremos sua solicitação e enviaremos mais instruções para seu e-mail sobre como acessar a HollaEx exchange.',
+		WARNING_TXT1:
+			'Enquanto isso, você pode se familiarizar com a rede HollaEx através dos recursos abaixo',
+		XHT_ORDER_TXT_1:
+			'Você deve fazer o login primeiro para começar a fazer trade',
+		XHT_ORDER_TXT_2: '',
+		XHT_ORDER_TXT_3: '{0} or {1}',
+		XHT_TITLE: 'XHT',
+		XHT_TRADE_TXT_1: 'Faça o login para ver seus trades recentes',
+		XHT_TRADE_TXT_2: 'Você pode {0} ver o seu histórico de trading recente',
+		LOGIN_HERE: 'faça seu login aqui',
+	},
+	WAVES: {
+		TITLE: 'Informação sobre Wave',
+		NEXT_WAVE: 'Próxima Wave',
+		WAVE_AMOUNT: 'Quantia em Wave',
+		FLOOR: 'Fundo',
+		LAST_WAVE: 'Última wave',
+	},
+	TYPES_OF_POSTS: {
+		TITLE: 'POSTAGENS',
+		ANNOUNCEMEN: 'Aviso',
+		SYSTEM_UPDATE: 'Atualização do sistema',
+		LAST_WAVE: 'Última Wave',
+		ANNOUNCEMENT_TXT:
+			'Serão distribuídos XHTs gratuitos para todas as carteiras que fizerem a solicitação',
+		SYSTEM_UPDATE_TIME: 'Hora:12:31, 19 de dezembro de 2019',
+		SYSTEM_UPDATE_DURATION: '1 hora',
+		LAST_WAVE_AMOUNT: '100, 213 XHT',
+		LAST_WAVE_REDISTRIBUTED: ' 11, 211',
+		LAST_WAVE_TIME: ' 12h31, 19 de dezembro de 2019 ',
+	},
+	USER_LEVEL: 'Nível do usuário',
+	LIMIT_AMOUNT: 'Quantia limite',
+	FEE_AMOUNT: 'Valor da taxa',
+	COINS: ' Moedas ',
+	PAIRS: 'Pares',
+	NOTE_FOR_EDIT_COIN: 'Nota: Para adicionar e remover {0}, consulte o {1}.',
+	REFER_DOCS_LINK: 'docs',
+	RESTART_TO_APPLY:
+		'Você precisa reiniciar sua exchange para aplicar essas alterações.',
+	TRIAL_EXCHANGE_MSG:
+		'Você está usando uma versão de teste de {0} e ela expirará em {1} dias.',
+	EXPIRY_EXCHANGE_MSG:
+		'Sua exchange expirou. Vá para dash.bitholla.com para ativá-la novamente.',
+	EXPIRED_INFO_1: 'Seu período de teste terminou.',
+	EXPIRED_INFO_2:
+		'Colateralize ou faça uma garantia da sua exchange para ativá-la novamente.',
+	EXPIRED_BUTTON_TXT: 'ATIVAR EXCHANGE',
+	TRADE_POSTS: {
+		ANNOUNCEMENT: 'Avisos',
+		ANNOUNCEMNT_TXT_3:
+			'Lançamento público e Leilão Wave está remarcado para 1º de janeiro de 2020. Os depósitos e saques da carteira estão agora liberados.',
+		ANNOUNCEMNT_TXT_4:
+			'Feliz ano novo a todos e todas! Estamos iniciando um novo marco a partir de 2020 com o lançamento da plataforma de trading mais aberta do mercado. Isso só foi possível com a ajuda de todos vocês.',
+		ANNOUNCEMNT_TXT_1:
+			'Ganhe XHT com o programa HAP ao apresentar a exchange para seus amigos. {0}.',
+		DEFAULT_ANNOUNCEMENT:
+			'Esta seção exibe seus avisos públicos de sua exchange!',
+		ANNOUNCEMENT_TXT_2:
+			'Serão distribuídos XHTs gratuitos para todas as carteiras que {0}.',
+		LEARN_MORE: 'Saiba mais',
+		APPLY_TODAY: 'Solicite hoje',
+	},
+	OPEN_WALLET: 'Abrir carteira',
+	AGO: 'atrás',
+	CUMULATIVE_AMOUNT_SYMBOL: ' Cumulativo ',
+	POST_ONLY: 'Publicar apenas',
+	CLEAR: 'Limpar',
+	ORDER_TYPE: 'tipo',
+	TRIGGER_CONDITIONS: 'Condições de trigger',
+	TRANSACTION_STATUS: {
+		PENDING: 'Pendente ',
+		REJECTED: ' Rejeitado ',
+		COMPLETED: 'Concluído',
+	},
+	DEPOSIT_STATUS: {
+		NEW: 'Novo',
+		SEARCH_FIELD_LABEL: 'Cole seu ID de transação',
+		SEARCH: 'PESQUISAR',
+		SEARCHING: 'PESQUISANDO',
+		CHECK_DEPOSIT_STATUS: 'Verificar o status do depósito',
+		STATUS_DESCRIPTION:
+			'Você pode verificar o status do seu depósito passando o ID da transação (hash) abaixo.',
+		TRANSACTION_ID: 'ID de transação (hash)',
+		SEARCH_SUCCESS: 'Pesquisa finalizada',
+		ADDRESS_FIELD_LABEL: 'Cole o seu endereço',
+		CURRENCY_FIELD_LABEL: 'Selecione a moeda',
+	},
+	CANCEL_ORDERS: {
+		HEADING: 'Cancelar ordens',
+		SUB_HEADING: 'Cancelar todas as ordens',
+		INFO_1: 'Isso irá cancelar suas ordens abertas para este mercado.',
+		INFO_2:
+			'Tem certeza de que deseja cancelar todos as suas ordens em aberto?',
+	},
+	AMOUNT_IN: 'Montante em',
+	LIMITS_BLOCK: {
+		HEADER_ROW_DESCRIPTION:
+			'Provisão para depósito e saques para todos os ativos ({0})',
+		HEADER_ROW_TYPE: 'Tipo (todos os ativos)',
+		HEADER_ROW_AMOUNT: 'Valor ({0})',
+	},
+};
+
+const content = flatten(nestedContent, options);
+
+export default content;
diff --git a/web/src/config/lang/vi.js b/web/src/config/lang/vi.js
index ec0588d139..507ec29efe 100644
--- a/web/src/config/lang/vi.js
+++ b/web/src/config/lang/vi.js
@@ -827,8 +827,8 @@ export default {
 	LOWEST_PRICE: 'Lowest Price ({0})', // new
 	PHASE: 'Phase', // new
 	INCOMING: 'Incoming', // new
-	PRICE_CURRENCY: 'PRICE ({0})',
-	AMOUNT_SYMBOL: 'AMOUNT ({0})',
+	PRICE_CURRENCY: 'PRICE',
+	AMOUNT_SYMBOL: 'AMOUNT',
 	MARKET_PRICE: 'Giá thị trường',
 	ORDER_PRICE: 'Giá chỉ định',
 	TOTAL_ORDER: 'Tổng',
diff --git a/web/src/config/lang/zh.js b/web/src/config/lang/zh.js
index 0fe9774b28..f27634b0e0 100644
--- a/web/src/config/lang/zh.js
+++ b/web/src/config/lang/zh.js
@@ -751,8 +751,8 @@ export default {
 	PUBLIC_SALES: '实时成交', // ToDo
 	REMAINING: 'Remaining',
 	FULLFILLED: '{0} % Filled',
-	PRICE_CURRENCY: 'PRICE ({0})',
-	AMOUNT_SYMBOL: 'AMOUNT ({0})',
+	PRICE_CURRENCY: 'PRICE',
+	AMOUNT_SYMBOL: 'AMOUNT',
 	MARKET_PRICE: '市场价格',
 	ORDER_PRICE: '订购价格',
 	TOTAL_ORDER: '订单总数',
diff --git a/web/src/config/localizedStrings.js b/web/src/config/localizedStrings.js
index b7e90cae6e..0ff645bede 100644
--- a/web/src/config/localizedStrings.js
+++ b/web/src/config/localizedStrings.js
@@ -11,6 +11,7 @@ import ja from './lang/ja';
 import vi from './lang/vi';
 import id from './lang/id';
 import zh from './lang/zh';
+import pt from './lang/pt';
 
 export const content = {
 	en,
@@ -24,6 +25,7 @@ export const content = {
 	vi,
 	id,
 	zh,
+	pt,
 };
 
 const strings = new LocalizedStrings(content);
diff --git a/web/src/config/menu.js b/web/src/config/menu.js
new file mode 100644
index 0000000000..cc675d0496
--- /dev/null
+++ b/web/src/config/menu.js
@@ -0,0 +1,71 @@
+export const MENU_ITEMS = {
+	top: [
+		{
+			path: '/summary',
+			activePaths: ['/summary', '/account'],
+			icon_id: 'TAB_SUMMARY',
+			string_id: 'ACCOUNTS.TAB_SUMMARY',
+		},
+	],
+	features: [
+		{
+			id: 'pro_trade',
+			path: '/trade/add/tabs',
+			icon_id: 'SIDEBAR_TRADING_ACTIVE',
+			string_id: 'PRO_TRADE',
+			hide_from_sidebar: true,
+		},
+		{
+			id: 'quick_trade',
+			path: 'quick-trade',
+			icon_id: 'QUICK_TRADE_TAB_ACTIVE',
+			string_id: 'QUICK_TRADE',
+			hide_from_sidebar: true,
+		},
+	],
+	middle: [
+		{
+			path: '/wallet',
+			icon_id: 'TAB_WALLET',
+			string_id: 'ACCOUNTS.TAB_WALLET',
+		},
+		{
+			path: '/transactions',
+			icon_id: 'TAB_HISTORY',
+			string_id: 'ACCOUNTS.TAB_HISTORY',
+			hide_from_appbar: true,
+		},
+		{
+			path: '/security',
+			icon_id: 'TAB_SECURITY',
+			string_id: 'ACCOUNTS.TAB_SECURITY',
+			hide_from_appbar: true,
+		},
+		{
+			path: '/verification',
+			icon_id: 'TAB_VERIFY',
+			string_id: 'ACCOUNTS.TAB_VERIFICATION',
+			hide_from_appbar: true,
+		},
+		{
+			path: '/settings',
+			icon_id: 'TAB_SETTING',
+			string_id: 'ACCOUNTS.TAB_SETTINGS',
+			hide_from_appbar: true,
+		},
+	],
+	bottom: [
+		{
+			path: 'help',
+			icon_id: 'SIDEBAR_HELP',
+			string_id: 'LOGIN.HELP',
+			hide_from_appbar: true,
+		},
+		{
+			path: 'logout',
+			icon_id: 'TAB_SIGNOUT',
+			string_id: 'ACCOUNTS.TAB_SIGNOUT',
+			hide_from_appbar: true,
+		},
+	],
+};
diff --git a/web/src/config/project.config.js b/web/src/config/project.config.js
index 0f381cd345..a731d330c1 100644
--- a/web/src/config/project.config.js
+++ b/web/src/config/project.config.js
@@ -1,10 +1,15 @@
 import icons from 'config/icons';
 import color from 'config/colors';
-import { DEFAULT_LANGUAGE, THEME_DEFAULT } from 'config/constants';
+import {
+	DEFAULT_LANGUAGE,
+	THEME_DEFAULT,
+	DEFAULT_LANDING_SECTIONS as sections,
+} from 'config/constants';
 
 const config = {
 	icons,
 	color,
+	sections,
 	defaults: {
 		theme: THEME_DEFAULT,
 		language: DEFAULT_LANGUAGE,
diff --git a/web/src/containers/Admin/Chat/index.css b/web/src/containers/Admin/Chat/index.css
index 5650de34ad..b2de061a91 100644
--- a/web/src/containers/Admin/Chat/index.css
+++ b/web/src/containers/Admin/Chat/index.css
@@ -34,3 +34,7 @@
 .admin-chat-feature-wrapper .switch-wrapper .label-inactive {
 	color: #808080;
 }
+.admin-chat-feature-wrapper .disabled-area {
+	opacity: 0.6;
+	pointer-events: none;
+}
diff --git a/web/src/containers/Admin/Chat/index.js b/web/src/containers/Admin/Chat/index.js
index fe500d9015..3629f7678e 100644
--- a/web/src/containers/Admin/Chat/index.js
+++ b/web/src/containers/Admin/Chat/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { Spin, Switch, message } from 'antd';
+import { Spin, Switch, message, Button } from 'antd';
 import { WS_URL } from '../../../config/constants';
 import { getToken } from '../../../utils/token';
 import { Tabs } from 'antd';
@@ -9,6 +9,7 @@ import { Messages } from './messages';
 import { updateConstants } from '../General/action';
 
 import './index.css';
+import { handleUpgrade } from 'utils/utils';
 
 const TabPane = Tabs.TabPane;
 
@@ -265,6 +266,8 @@ class Chat extends Component {
 			bannedUsersUsernames,
 			isActive,
 		} = this.state;
+		const { constants } = this.props;
+		const isUpgrade = handleUpgrade(constants.info)
 		return (
 			<div className="app_container-content admin-chat-feature-wrapper">
 				{!ready ? (
@@ -277,7 +280,33 @@ class Chat extends Component {
 								(Usernames, text and emoji communication)
 							</div>
 						</div>
-						<div className="switch-wrapper">
+						{isUpgrade
+							?
+								<div className="d-flex">
+									<div className="d-flex align-items-center justify-content-between upgrade-section my-4">
+										<div>
+											<div className="font-weight-bold">Start your crypto culture</div>
+											<div>Allow your users to socialize through chat</div>
+										</div>
+											<div className="ml-5 button-wrapper">
+												<a
+													href="https://dash.bitholla.com/billing"
+													target="_blank"
+													rel="noopener noreferrer"
+												>
+													<Button
+														type="primary"
+														className="w-100"
+													>
+														Upgrade Now
+													</Button>
+												</a>
+										</div>
+									</div>
+								</div>
+							: null
+						}
+							<div className={isUpgrade ? "disabled-area" : "switch-wrapper"}>
 							<div className="d-flex">
 								<span
 									className={
diff --git a/web/src/containers/Admin/General/Description.js b/web/src/containers/Admin/General/Description.js
index f63e2fba30..0fe5a3c1ac 100644
--- a/web/src/containers/Admin/General/Description.js
+++ b/web/src/containers/Admin/General/Description.js
@@ -46,6 +46,7 @@ class Description extends Component {
 			ReferralBadgeFields,
 			ReferralBadgeInitialValues,
 			constants: { info: { type, plan } = {} } = {},
+			isUpgrade
 		} = this.props;
 		return (
 			<div className="description-wrapper">
@@ -110,7 +111,32 @@ class Description extends Component {
 					Edit the referral badge in the bottom left corner. This space can be
 					repurposed for copyright or other business related data.
 				</p>
-
+				{isUpgrade
+					?
+						<div className="d-flex">
+							<div className="d-flex align-items-center justify-content-between upgrade-section mt-2 mb-5">
+								<div>
+									<div className="font-weight-bold">Fully rebrand your platform</div>
+									<div>Replace the badge with your own branding</div>
+								</div>
+								<div className="ml-5 button-wrapper">
+									<a
+										href="https://dash.bitholla.com/billing"
+										target="_blank"
+										rel="noopener noreferrer"
+									>
+										<Button
+											type="primary"
+											className="w-100"
+										>
+											Upgrade Now
+										</Button>
+									</a>
+								</div>
+							</div>
+						</div>
+					: null
+				}
 				{type === 'DIY' ? (
 					<div
 						style={{ width: '465px' }}
@@ -146,15 +172,16 @@ class Description extends Component {
 						</div>
 					</div>
 				) : null}
-
-				<ReferralBadgeForm
-					initialValues={ReferralBadgeInitialValues}
-					fields={ReferralBadgeFields}
-					buttonText="Save"
-					buttonClass="green-btn minimal-btn"
-					onSubmit={this.props.handleSubmitReferralBadge}
-					disableAllFields={type === 'DIY' || plan === 'basic'}
-				/>
+				<div className={isUpgrade ? "disable-referral" : ""}>
+					<ReferralBadgeForm
+						initialValues={ReferralBadgeInitialValues}
+						fields={ReferralBadgeFields}
+						buttonText="Save"
+						buttonClass="green-btn minimal-btn"
+						onSubmit={this.props.handleSubmitReferralBadge}
+						disableAllFields={type === 'DIY' || plan === 'basic'}
+					/>
+				</div>
 			</div>
 		);
 	}
diff --git a/web/src/containers/Admin/General/InterfaceForm.js b/web/src/containers/Admin/General/InterfaceForm.js
index 3f8e4a8564..e0a1dd976d 100644
--- a/web/src/containers/Admin/General/InterfaceForm.js
+++ b/web/src/containers/Admin/General/InterfaceForm.js
@@ -1,32 +1,43 @@
 import React from 'react';
 import { ReactSVG } from 'react-svg';
 import { Button, Checkbox, Form } from 'antd';
+import classnames from 'classnames';
 
 import { STATIC_ICONS } from 'config/icons';
 
 const { Item } = Form;
 
-const InterfaceForm = ({ initialValues = {}, handleSaveInterface }) => {
+const InterfaceForm = ({
+	initialValues = {},
+	handleSaveInterface,
+	isUpgrade,
+}) => {
 	const handleSubmit = (values) => {
 		let formValues = {};
 		if (values) {
 			formValues = {
-				chat: !!values.chat,
+				chat: isUpgrade ? false : !!values.chat,
 				quick_trade: !!values.quick_trade,
 				pro_trade: !!values.pro_trade,
+				home_page: isUpgrade ? false : !!values.home_page,
 			};
 			handleSaveInterface(formValues);
 		}
 	};
+	let initialValue = initialValues;
+	if (isUpgrade) {
+		initialValue.home_page = false;
+		initialValue.chat = false;
+	}
 	return (
-		<div className="general-wrapper mb-4">
+		<div className="general-wrapper mb-4 pb-4">
 			<div className="sub-title">Features</div>
 			<div className="description">
 				Select the features that will be available on your exchange.
 			</div>
 			<Form
 				name="interface-form"
-				initialValues={initialValues}
+				initialValues={initialValue}
 				onFinish={handleSubmit}
 			>
 				<div className="interface-box">
@@ -70,27 +81,72 @@ const InterfaceForm = ({ initialValues = {}, handleSaveInterface }) => {
 							</div>
 						</Checkbox>
 					</Item>
-					<Item name="chat" valuePropName="checked">
-						<Checkbox className="mt-3">
-							<div className="d-flex align-items-center">
-								<div className="feature-trade-box mr-1">
-									<ReactSVG
-										src={STATIC_ICONS.CHAT_FEATURE_ICON}
-										className="feature-chat-icon"
-									/>
+					<div className={classnames({ 'disabled-area': isUpgrade })}>
+						<Item name="chat" valuePropName="checked">
+							<Checkbox className="mt-3">
+								<div className="d-flex align-items-center">
+									<div className="feature-trade-box mr-1">
+										<ReactSVG
+											src={STATIC_ICONS.CHAT_FEATURE_ICON}
+											className="feature-chat-icon"
+										/>
+									</div>
+									<div className="ml-2 checkbox-txt">
+										Chat system
+										<div className="d-flex justify-content-between">
+											<div className="small-text">
+												(Usernames, text and emoji communication)
+											</div>
+										</div>
+									</div>
 								</div>
-								<div className="ml-2 checkbox-txt">
-									Chat system
-									<div className="d-flex justify-content-between">
-										<div className="small-text">
-											(Usernames, text and emoji communication)
+							</Checkbox>
+						</Item>
+						<Item name="home_page" valuePropName="checked">
+							<Checkbox className="mt-3">
+								<div className="d-flex align-items-center">
+									<div className="feature-trade-box mr-1">
+										<ReactSVG
+											src={STATIC_ICONS.HOME_PAGE_FEATURE_ICON}
+											className="feature-chat-icon"
+										/>
+									</div>
+									<div className="ml-2 checkbox-txt">
+										Homepage
+										<div className="d-flex justify-content-between">
+											<div className="small-text">
+												(This will be the first page seen on your domain)
+											</div>
 										</div>
 									</div>
 								</div>
-							</div>
-						</Checkbox>
-					</Item>
+							</Checkbox>
+						</Item>
+					</div>
 				</div>
+				{isUpgrade ? (
+					<div className="d-flex">
+						<div className="d-flex align-items-center justify-content-between upgrade-section mt-2 mb-5">
+							<div>
+								<div className="font-weight-bold">
+									Make a good first impression
+								</div>
+								<div>Add a customizable landing page</div>
+							</div>
+							<div className="ml-5 button-wrapper">
+								<a
+									href="https://dash.bitholla.com/billing"
+									target="_blank"
+									rel="noopener noreferrer"
+								>
+									<Button type="primary" className="w-100">
+										Upgrade Now
+									</Button>
+								</a>
+							</div>
+						</div>
+					</div>
+				) : null}
 				<div>
 					<Button type="primary" htmlType="submit">
 						Save
diff --git a/web/src/containers/Admin/General/index.css b/web/src/containers/Admin/General/index.css
index a07263f589..f89a419ffe 100644
--- a/web/src/containers/Admin/General/index.css
+++ b/web/src/containers/Admin/General/index.css
@@ -331,3 +331,10 @@ h2,
 	border-top: 1px solid #707070;
 	margin: 1rem 0rem;
 }
+
+.description-wrapper .disable-referral,
+.referral-link-section .disabled-area,
+.general-wrapper .disabled-area {
+	opacity: 0.6;
+	pointer-events: none;
+}
\ No newline at end of file
diff --git a/web/src/containers/Admin/General/index.js b/web/src/containers/Admin/General/index.js
index 10f12f824b..479f4d3a44 100644
--- a/web/src/containers/Admin/General/index.js
+++ b/web/src/containers/Admin/General/index.js
@@ -18,14 +18,17 @@ import { upload, updateConstants } from './action';
 import { getGeneralFields } from './utils';
 import { publish } from 'actions/operatorActions';
 import merge from 'lodash.merge';
+import { clearFileInputById } from 'helpers/vanilla';
 
 import './index.css';
+import { handleUpgrade } from 'utils/utils';
 
 const NameForm = AdminHocForm('NameForm');
 const LanguageForm = AdminHocForm('LanguageForm');
 const ThemeForm = AdminHocForm('ThemeForm');
 const NativeCurrencyForm = AdminHocForm('NativeCurrencyForm');
 const HelpDeskForm = AdminHocForm('HelpDeskForm');
+const APIDocLinkForm = AdminHocForm('APIDocLinkForm');
 
 class General extends Component {
 	constructor() {
@@ -45,6 +48,7 @@ class General extends Component {
 			isSignUpActive: true,
 			loading: false,
 			loadingButton: false,
+			isReferralLink: false,
 		};
 	}
 
@@ -148,6 +152,7 @@ class General extends Component {
 								icons[themeKey][key] = path;
 								this.setState({ currentIcon: {} });
 							} catch (error) {
+								clearFileInputById(`admin-file-input__${themeKey},${key}`);
 								message.error('Something went wrong!');
 								return;
 							}
@@ -311,6 +316,16 @@ class General extends Component {
 		});
 	};
 
+	handleSubmitAPIDocLink = (formProps) => {
+		this.handleSubmitGeneral({
+			kit: {
+				links: {
+					...formProps,
+				},
+			},
+		});
+	};
+
 	handleSubmitEmailVerification = (formProps) => {
 		this.handleSubmitGeneral({
 			kit: {
@@ -342,6 +357,7 @@ class General extends Component {
 						accept="image/*"
 						onChange={this.handleChangeFile}
 						name={`${theme},${id}`}
+						id={`admin-file-input__${theme},${id}`}
 					/>
 				</label>
 			</div>
@@ -396,6 +412,10 @@ class General extends Component {
 		this.handleSubmitSignUps(false);
 	};
 
+	handleReferralLink = (value) => {
+		this.setState({ isReferralLink: value });
+	};
+
 	render() {
 		const {
 			initialEmailValues,
@@ -408,6 +428,7 @@ class General extends Component {
 			isSignUpActive,
 			showDisableSignUpsConfirmation,
 			loadingButton,
+			isReferralLink,
 		} = this.state;
 		const { kit = {} } = this.state.constants;
 		const { coins, themeOptions } = this.props;
@@ -419,6 +440,7 @@ class General extends Component {
 				</div>
 			);
 		}
+		const isUpgrade = handleUpgrade(kit.info);
 		return (
 			<div>
 				<div className="general-wrapper">
@@ -512,6 +534,60 @@ class General extends Component {
 						</div>
 					</div>
 					<div className="divider" />
+					<div>
+						<div className="sub-title">Landing page background</div>
+						<div className="description">
+							Landing home page for your exchange. This is the page your users
+							will likely see first.
+						</div>
+						<div className="file-wrapper">
+							<Collapse defaultActiveKey={['1']} bordered={false} ghost>
+								<Collapse.Panel showArrow={false} key="1" disabled={true}>
+									<div className="file-wrapper">
+										{themeOptions
+											.filter(({ value: theme }) => theme === 'dark')
+											.map(({ value: theme }, index) =>
+												this.renderImageUpload(
+													'EXCHANGE_LANDING_PAGE',
+													theme,
+													index
+												)
+											)}
+									</div>
+								</Collapse.Panel>
+								<Collapse.Panel
+									showArrow={false}
+									header={
+										<span className="underline-text">
+											Theme Specific Graphics
+										</span>
+									}
+									key="2"
+								>
+									<div className="file-wrapper">
+										{themeOptions
+											.filter(({ value: theme }) => theme !== 'dark')
+											.map(({ value: theme }, index) =>
+												this.renderImageUpload(
+													'EXCHANGE_LANDING_PAGE',
+													theme,
+													index
+												)
+											)}
+									</div>
+								</Collapse.Panel>
+							</Collapse>
+						</div>
+						<Button
+							type="primary"
+							className="green-btn minimal-btn"
+							loading={loadingButton}
+							onClick={() => this.handlePublish('EXCHANGE_LANDING_PAGE')}
+						>
+							Publish
+						</Button>
+					</div>
+					<div className="divider" />
 					<div>
 						<div className="sub-title">Exchange logo</div>
 						<div className="description">
@@ -753,6 +829,7 @@ class General extends Component {
 						handleSubmitDescription={this.handleSubmitName}
 						handleSubmitFooterText={this.handleSubmitTOSlinks}
 						handleSubmitReferralBadge={this.handleSubmitReferralBadge}
+						isUpgrade={isUpgrade}
 					/>
 					<div className="divider"></div>
 				</div>
@@ -765,8 +842,13 @@ class General extends Component {
 				</div>
 				<div className="divider"></div>
 				<div className="general-wrapper">
-					<div className="sub-title">Helpdesk link</div>
-					<div className="description">
+					<h3>Help pop up</h3>
+					<p>
+						The help pop up displays helpful links for your users and can be
+						accessed in various areas that say 'help'.
+					</p>
+					<div className="sub-title pt-3">Helpdesk link</div>
+					<div className="description mb-4">
 						This link will be used for your any help sections on your exchange.
 						You can put a direct link to your helpdesk service or your support
 						email address.
@@ -780,12 +862,96 @@ class General extends Component {
 						buttonClass="green-btn minimal-btn"
 						onSubmit={this.handleSubmitHelpDesk}
 					/>
+					<div className="sub-title mt-4 pt-3">API documentation link</div>
+					<div className="description mb-4">
+						Provide the link to your exchanges API documentation. This link will
+						appear on universal help pop up.
+					</div>
+					<APIDocLinkForm
+						initialValues={{
+							api_doc_link: initialLinkValues.api_doc_link,
+						}}
+						fields={generalFields.section_9}
+						buttonText="Save"
+						buttonClass="green-btn minimal-btn"
+						onSubmit={this.handleSubmitAPIDocLink}
+					/>
 				</div>
 				<div className="divider"></div>
 				<InterfaceForm
 					initialValues={kit.features}
 					handleSaveInterface={this.handleSaveInterface}
+					isUpgrade={isUpgrade}
 				/>
+				<div className="divider"></div>
+				<div className="referral-link-section">
+					<div className="sub-title">Referral affiliate link</div>
+					<div className="description">
+						Allow your user to share a referral affiliate link with their
+						friends. Users that share this link will be able to earn commissions
+						form trading fees made from their invited friends.
+					</div>
+					{isUpgrade ? (
+						<div className="d-flex">
+							<div className="d-flex align-items-center justify-content-between upgrade-section my-4">
+								<div>
+									<div className="font-weight-bold">Boost your userbase</div>
+									<div>Incentives your users to share your platform</div>
+								</div>
+								<div className="ml-5 button-wrapper">
+									<a
+										href="https://dash.bitholla.com/billing"
+										target="_blank"
+										rel="noopener noreferrer"
+									>
+										<Button type="primary" className="w-100">
+											Upgrade Now
+										</Button>
+									</a>
+								</div>
+							</div>
+						</div>
+					) : null}
+					<div className="description">
+						In the account summary page your users can access a 'INVITE YOUR
+						FRIEND' link which will give them a unique sharable referral link.
+					</div>
+					<div className={isUpgrade ? 'disabled-area' : ''}>
+						<div className="admin-chat-feature-wrapper pt-4">
+							<div className="switch-wrapper mb-5">
+								<div className="d-flex">
+									<span
+										className={
+											!isReferralLink
+												? 'switch-label'
+												: 'switch-label label-inactive'
+										}
+									>
+										Hide
+									</span>
+									<Switch
+										checked={isReferralLink}
+										onClick={this.handleReferralLink}
+									/>
+									<span
+										className={
+											isReferralLink
+												? 'switch-label'
+												: 'switch-label label-inactive'
+										}
+									>
+										Show
+									</span>
+								</div>
+							</div>
+						</div>
+						<div className="general-wrapper">
+							<Button type="primary" className="mb-5">
+								Save
+							</Button>
+						</div>
+					</div>
+				</div>
 			</div>
 		);
 	}
diff --git a/web/src/containers/Admin/General/utils.js b/web/src/containers/Admin/General/utils.js
index 3879595af7..3127bcb0a8 100644
--- a/web/src/containers/Admin/General/utils.js
+++ b/web/src/containers/Admin/General/utils.js
@@ -97,4 +97,11 @@ export const getGeneralFields = (coins) => ({
 			placeholder: 'https://bitholla.com/',
 		},
 	},
+	section_9: {
+		api_doc_link: {
+			type: 'input',
+			label: 'API doc link',
+			placeholder: 'http://',
+		},
+	},
 });
diff --git a/web/src/containers/Admin/Plugins/MyPlugins.js b/web/src/containers/Admin/Plugins/MyPlugins.js
index 332b957c74..e008951c9b 100644
--- a/web/src/containers/Admin/Plugins/MyPlugins.js
+++ b/web/src/containers/Admin/Plugins/MyPlugins.js
@@ -68,6 +68,7 @@ class MyPlugins extends Component {
 	};
 
 	handleAddPlugin = async () => {
+		const { restart } = this.props;
 		const body = {
 			...this.state.thirdParty,
 			enabled: true,
@@ -77,7 +78,9 @@ class MyPlugins extends Component {
 				if (res) {
 					this.setState({ isVisible: false });
 					this.props.handlePluginList(res);
-					message.success('Added third party plugin successfully');
+					restart(() =>
+						message.success('Added third party plugin successfully')
+					);
 				}
 			})
 			.catch((err) => {
diff --git a/web/src/containers/Admin/Plugins/PluginConfigure.js b/web/src/containers/Admin/Plugins/PluginConfigure.js
index db686a8507..9f3ac44753 100644
--- a/web/src/containers/Admin/Plugins/PluginConfigure.js
+++ b/web/src/containers/Admin/Plugins/PluginConfigure.js
@@ -11,6 +11,7 @@ const PluginConfigure = ({
 	handlePluginList,
 	updatePluginList,
 	removePlugin,
+	restart,
 }) => {
 	const [pluginData, setPlugin] = useState({});
 	const [isLoading, setLoading] = useState(true);
@@ -51,6 +52,7 @@ const PluginConfigure = ({
 			handlePluginList={handlePluginList}
 			updatePluginList={updatePluginList}
 			removePlugin={removePlugin}
+			restart={restart}
 		/>
 	);
 };
diff --git a/web/src/containers/Admin/Plugins/PluginDetails.js b/web/src/containers/Admin/Plugins/PluginDetails.js
index ef05c5eb69..24aedc1f63 100644
--- a/web/src/containers/Admin/Plugins/PluginDetails.js
+++ b/web/src/containers/Admin/Plugins/PluginDetails.js
@@ -14,6 +14,7 @@ const PluginDetails = ({
 	removePlugin,
 	pluginData,
 	isLoading,
+	restart,
 }) => {
 	const [isOpen, setOpen] = useState(false);
 	const [type, setType] = useState('');
@@ -31,8 +32,8 @@ const PluginDetails = ({
 		addPlugin(body)
 			.then((res) => {
 				setAddLoading(false);
-				message.success('Plugin installed successfully');
 				handlePluginList(res);
+				restart(() => message.success('Plugin installed successfully'));
 			})
 			.catch((err) => {
 				setAddLoading(false);
@@ -55,8 +56,8 @@ const PluginDetails = ({
 		updatePlugins({ name: pluginData.name }, body)
 			.then((res) => {
 				setUpdateLoading(false);
-				message.success('Plugin updated successfully');
 				updatePluginList(pluginData);
+				restart(() => message.success('Plugin updated successfully'));
 			})
 			.catch((err) => {
 				setUpdateLoading(false);
@@ -86,6 +87,7 @@ const PluginDetails = ({
 		setType(type);
 		removePlugin({ name: pluginData.name });
 		handleClose();
+		restart(() => message.success('Removed plugin successfully'));
 	};
 
 	const handleChange = (e) => {
@@ -281,8 +283,8 @@ const PluginDetails = ({
 			);
 		} else if (selectedPlugin.enabled) {
 			return (
-				<div className="btn-wrapper d-flex mt-3">
-					<div>
+				<div className="btn-wrapper mt-3">
+					<div className="d-flex justify-content-between">
 						<Button
 							type="primary"
 							className="remove-btn mr-2"
@@ -290,8 +292,6 @@ const PluginDetails = ({
 						>
 							Remove
 						</Button>
-					</div>
-					<div className="d-flex align-items-center flex-column">
 						<Button
 							type="primary"
 							className="config-btn"
@@ -299,7 +299,22 @@ const PluginDetails = ({
 						>
 							Configure
 						</Button>
-						{pluginData.version > selectedPlugin.version ? (
+					</div>
+					{selectedPlugin.url && (
+						<div className="text-align-center">
+							<a
+								href={selectedPlugin.url}
+								target="_blank"
+								rel="noopener noreferrer"
+								className="underline-text"
+							>
+								Learn more
+							</a>{' '}
+							about this plugin
+						</div>
+					)}
+					<div className="d-flex align-items-center justify-content-end">
+						{pluginData.version > selectedPlugin.version && (
 							<div className="d-flex align-items-center flex-column">
 								<Button
 									type="primary"
@@ -313,7 +328,7 @@ const PluginDetails = ({
 									<div className="update-txt">{`v${pluginData.version} available`}</div>
 								</div>
 							</div>
-						) : null}
+						)}
 					</div>
 				</div>
 			);
diff --git a/web/src/containers/Admin/Plugins/Spinner.js b/web/src/containers/Admin/Plugins/Spinner.js
new file mode 100644
index 0000000000..71b36d5ee4
--- /dev/null
+++ b/web/src/containers/Admin/Plugins/Spinner.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import { STATIC_ICONS } from 'config/icons';
+
+const Spinner = () => {
+	return (
+		<div className="spinner-container">
+			<img src={STATIC_ICONS.SPINNER} alt="spinner" />
+			<div className="ml-2">Processing. Please wait...</div>
+		</div>
+	);
+};
+
+export default Spinner;
diff --git a/web/src/containers/Admin/Plugins/index.css b/web/src/containers/Admin/Plugins/index.css
index fd2d68f823..e75806e7fb 100644
--- a/web/src/containers/Admin/Plugins/index.css
+++ b/web/src/containers/Admin/Plugins/index.css
@@ -446,3 +446,14 @@
 .admin-plugins-wrapper .ant-breadcrumb > span:last-child {
 	color: #ffffff;
 }
+
+.spinner-container {
+	color: #ffffff;
+	display: flex;
+	align-items: center;
+}
+
+.spinner-container img {
+	width: 35px;
+	height: 35px;
+}
diff --git a/web/src/containers/Admin/Plugins/index.js b/web/src/containers/Admin/Plugins/index.js
index 38f9338478..7cd21bd982 100644
--- a/web/src/containers/Admin/Plugins/index.js
+++ b/web/src/containers/Admin/Plugins/index.js
@@ -8,6 +8,7 @@ import PluginConfigure from './PluginConfigure';
 import MyPlugins from './MyPlugins';
 import { removePlugin, requestPlugins, requestMyPlugins } from './action';
 import { STATIC_ICONS } from 'config/icons';
+import Spinner from './Spinner';
 
 import './index.css';
 
@@ -33,6 +34,7 @@ class Plugins extends Component {
 			removePluginName: '',
 			tabKey: 'explore',
 			pluginCards: [],
+			processing: false,
 		};
 		this.removeTimeout = null;
 	}
@@ -61,8 +63,12 @@ class Plugins extends Component {
 	}
 
 	getPluginsData = async () => {
-		await this.getPlugins();
-		await this.getMyPlugins();
+		try {
+			await this.getPlugins();
+			await this.getMyPlugins();
+		} catch (err) {
+			throw err;
+		}
 	};
 
 	getMyPlugins = (page = 1, limit = 50, params = {}) => {
@@ -72,7 +78,9 @@ class Plugins extends Component {
 					this.setState({ myPlugins: res.data });
 				}
 			})
-			.catch((err) => {});
+			.catch((err) => {
+				throw err;
+			});
 	};
 
 	getPlugins = (page = 1, limit = 50, params = {}) => {
@@ -89,6 +97,7 @@ class Plugins extends Component {
 			})
 			.catch((err) => {
 				this.setState({ loading: false });
+				throw err;
 			});
 	};
 
@@ -135,7 +144,6 @@ class Plugins extends Component {
 						(plugin) => plugin.name !== this.state.removePluginName
 					);
 					this.setState({ removePluginName: '', myPlugins });
-					message.success('Removed plugin successfully');
 				}, 2000);
 			})
 			.catch((err) => {
@@ -218,6 +226,27 @@ class Plugins extends Component {
 		});
 	};
 
+	handleRestart = (callback) => {
+		this.setProcessing();
+		setTimeout(() => {
+			this.getPluginsData()
+				.then(() => {
+					this.setProcessing(false, callback);
+				})
+				.catch(() => {
+					this.handleRestart(callback);
+				});
+		}, 30000);
+	};
+
+	setProcessing = (processing = true, callback) => {
+		this.setState({ processing }, () => {
+			if (callback) {
+				callback();
+			}
+		});
+	};
+
 	render() {
 		const {
 			loading,
@@ -232,6 +261,7 @@ class Plugins extends Component {
 			tabKey,
 			removePluginName,
 			pluginCards,
+			processing,
 		} = this.state;
 		if (loading || this.props.pluginsLoading) {
 			return (
@@ -267,6 +297,7 @@ class Plugins extends Component {
 							handlePluginList={this.handlePluginList}
 							updatePluginList={this.handleUpdatePluginList}
 							removePlugin={this.removePlugin}
+							restart={this.handleRestart}
 						/>
 					</div>
 				) : (
@@ -292,6 +323,7 @@ class Plugins extends Component {
 									getMyPlugins={this.getMyPlugins}
 									myPlugins={myPlugins}
 									pluginData={pluginData}
+									restart={this.handleRestart}
 								/>
 							</TabPane>
 						</Tabs>
@@ -322,6 +354,22 @@ class Plugins extends Component {
 						</div>
 					</div>
 				</Modal>
+				<Modal
+					visible={processing}
+					closable={false}
+					centered={true}
+					footer={null}
+					maskClosable={false}
+				>
+					<div>
+						<div>
+							<h3 style={{ color: '#ffffff' }}>Plugins</h3>
+						</div>
+						<div className="d-flex align-items-center justify-content-center my-5 pt-3 pb-4">
+							<Spinner />
+						</div>
+					</div>
+				</Modal>
 			</div>
 		);
 	}
diff --git a/web/src/containers/Admin/Roles/ModalForm.js b/web/src/containers/Admin/Roles/ModalForm.js
index 23ebf504b6..31b3058753 100644
--- a/web/src/containers/Admin/Roles/ModalForm.js
+++ b/web/src/containers/Admin/Roles/ModalForm.js
@@ -1,14 +1,17 @@
-import React from 'react';
-import { Button } from 'antd';
+import React, { useState } from 'react';
+import { Button, Form, Select, Input } from 'antd';
+import classnames from 'classnames';
 
 import { OPERATORS, getOperatorFields } from './Utils';
 import { STATIC_ICONS } from 'config/icons';
 import { AdminHocForm } from '../../../components';
 import { checkRole } from '../../../utils/token';
 
-const OperatorRoleFrom = AdminHocForm('OperatorRoleFrom');
+// const OperatorRoleFrom = AdminHocForm('OperatorRoleFrom');
 const EditOperatorFrom = AdminHocForm('EditOperatorFrom');
 
+const { Item } = Form;
+
 const operatorFields = getOperatorFields();
 
 export const getRoleType = (data) => {
@@ -73,7 +76,37 @@ export const renderRoleImage = (
 	}
 };
 
-export const OperatorRole = ({ handleInvite }) => {
+export const renderUpgrade = () => {
+	return (
+		<div className="d-flex align-items-center justify-content-center">
+			<div className="d-flex align-items-center justify-content-between upgrade-section mt-5 mb-4">
+				<div>
+					<div className="font-weight-bold">Team management</div>
+					<div>Invite more people to specific team roles</div>
+				</div>
+				<div className="ml-5 button-wrapper">
+					<a
+						href="https://dash.bitholla.com/billing"
+						target="_blank"
+						rel="noopener noreferrer"
+					>
+						<Button type="primary" className="w-100">
+							Upgrade Now
+						</Button>
+					</a>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export const OperatorRole = ({ handleInvite, isUpgrade }) => {
+	const [selectedRole, setRole] = useState(OPERATORS[0].value);
+
+	const handleSelect = (values) => {
+		setRole(values);
+	};
+
 	const handleSubmitOperator = (values) => {
 		handleInvite(values);
 	};
@@ -81,18 +114,56 @@ export const OperatorRole = ({ handleInvite }) => {
 	return (
 		<div className="admin-roles-wrapper">
 			<h3>Add operator</h3>
-			<OperatorRoleFrom
+			<Form name="OperatorRoleFrom" onFinish={handleSubmitOperator}>
+				<div className="interface-box mb-5">
+					<div className="sub-title">Role</div>
+					<Item name="role">
+						<Select
+							defaultValue={OPERATORS[0].value}
+							onChange={handleSelect}
+							size="small"
+							value={selectedRole}
+						>
+							{OPERATORS.map((option, index) => (
+								<Select.Option key={index} value={option.value}>
+									{option.label}
+								</Select.Option>
+							))}
+						</Select>
+					</Item>
+					{isUpgrade ? renderUpgrade() : null}
+					<div className={isUpgrade ? 'disable-area' : ''}>
+						<div className="sub-title mt-5">email</div>
+						<Item
+							name="email"
+							rules={[
+								{
+									required: true,
+								},
+							]}
+						>
+							<Input />
+						</Item>
+					</div>
+				</div>
+				<div className="disable-area">
+					<Button type="primary" htmlType="submit" className="green-btn w-100">
+						Save
+					</Button>
+				</div>
+			</Form>
+			{/* <OperatorRoleFrom
 				onSubmit={handleSubmitOperator}
 				initialValues={{ role: OPERATORS[0].value }}
 				buttonText={'Save'}
 				buttonClass="green-btn mt-2"
 				fields={operatorFields.section_1}
-			/>
+			/> */}
 		</div>
 	);
 };
 
-export const RoleAccess = ({ handleClose }) => {
+export const RoleAccess = ({ handleClose, isUpgrade }) => {
 	return (
 		<div className="admin-roles-wrapper">
 			<h3>Operator role access</h3>
@@ -126,10 +197,18 @@ export const RoleAccess = ({ handleClose }) => {
 					</div>
 				</div>
 				<div className="d-flex role-description-box">
-					<div className="f-1 d-flex align-items-center pl-3 role-kyc">
+					<div
+						className={classnames(
+							'f-1 d-flex align-items-center pl-3 role-kyc',
+							{ 'disable-area': isUpgrade }
+						)}
+					>
 						{renderRoleImage('role-icon', 'kyc')}
 						<span className="role-label ml-2">KYC</span>
 					</div>
+					{isUpgrade ? (
+						<div className="upgrade-text">Requires upgrade</div>
+					) : null}
 					<div className="line-separator"></div>
 					<div className="f-1 p-3">
 						<div className="sub-title">Access Level 3</div>
@@ -140,10 +219,18 @@ export const RoleAccess = ({ handleClose }) => {
 					</div>
 				</div>
 				<div className="d-flex role-description-box">
-					<div className="f-1 d-flex align-items-center pl-3 role-communication">
+					<div
+						className={classnames(
+							'f-1 d-flex align-items-center pl-3 role-communication',
+							{ 'disable-area': isUpgrade }
+						)}
+					>
 						{renderRoleImage('role-icon', 'communicator')}
 						<span className="role-label ml-2">Support</span>
 					</div>
+					{isUpgrade ? (
+						<div className="upgrade-text">Requires upgrade</div>
+					) : null}
 					<div className="line-separator"></div>
 					<div className="f-1 p-3">
 						<div className="sub-title">Access Level 4</div>
@@ -155,10 +242,18 @@ export const RoleAccess = ({ handleClose }) => {
 					</div>
 				</div>
 				<div className="d-flex role-description-box">
-					<div className="f-1 d-flex align-items-center pl-3 role-support">
+					<div
+						className={classnames(
+							'f-1 d-flex align-items-center pl-3 role-support',
+							{ 'disable-area': isUpgrade }
+						)}
+					>
 						{renderRoleImage('role-icon', 'support')}
 						<span className="role-label ml-2">Support</span>
 					</div>
+					{isUpgrade ? (
+						<div className="upgrade-text">Requires upgrade</div>
+					) : null}
 					<div className="line-separator"></div>
 					<div className="f-1 p-3">
 						<div className="sub-title">Access Level 5</div>
@@ -168,6 +263,7 @@ export const RoleAccess = ({ handleClose }) => {
 					</div>
 				</div>
 			</div>
+			{isUpgrade ? renderUpgrade() : null}
 			<div className="mt-4">
 				<Button
 					type="primary"
diff --git a/web/src/containers/Admin/Roles/index.css b/web/src/containers/Admin/Roles/index.css
index 05c20ea4ca..1f09623bea 100644
--- a/web/src/containers/Admin/Roles/index.css
+++ b/web/src/containers/Admin/Roles/index.css
@@ -19,6 +19,7 @@
 .admin-roles-wrapper .role-description-box {
 	border-bottom: 1px solid #c4c4c4;
 	height: 135px;
+	position: relative;
 }
 .admin-roles-wrapper .role-label {
 	font-size: 20px;
@@ -107,3 +108,50 @@
 .admin-roles-wrapper .ant-pagination-item-active:hover {
 	border-color: #288500 !important;
 }
+
+.admin-roles-wrapper .sub-title {
+	color: #ffffff;
+}
+.admin-roles-wrapper .ant-form .ant-select .ant-select-selector {
+	height: 30px;
+	padding: 3px 8px;
+}
+.admin-roles-wrapper .ant-input:focus,
+.ant-input:active {
+	border: 1px solid #c4c4c4;
+}
+.admin-roles-wrapper .ant-form-item {
+	margin: 0;
+}
+.admin-roles-wrapper .disable-area {
+	opacity: 0.4;
+	pointer-events: none;
+}
+.admin-roles-wrapper .disable-area::before {
+	content: ' ';
+	display: block;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	z-index: 1;
+}
+
+.upgrade-section {
+	background-color: #3333ff;
+	color: #ffffff;
+	padding: 20px;
+}
+.upgrade-section .button-wrapper .ant-btn {
+	background-color: #e97c00;
+	color: #ffffff;
+	font-size: 14px !important;
+}
+.admin-roles-wrapper .role-description-box .upgrade-text {
+	position: absolute;
+	z-index: 100;
+	color: #ffffff;
+	top: 55px;
+	left: 12px;
+}
diff --git a/web/src/containers/Admin/Roles/index.js b/web/src/containers/Admin/Roles/index.js
index 99b97ac159..58706f85a6 100644
--- a/web/src/containers/Admin/Roles/index.js
+++ b/web/src/containers/Admin/Roles/index.js
@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Table, Modal, message } from 'antd';
+import { connect } from 'react-redux';
 
 import { checkRole } from '../../../utils/token';
 import {
@@ -11,6 +12,7 @@ import {
 } from './ModalForm';
 import { requestRole, inviteOperator, updateRole } from './action';
 import './index.css';
+import { handleUpgrade } from 'utils/utils';
 
 const getColumns = (handleEdit = () => {}) => [
 	{
@@ -101,7 +103,7 @@ const renderItems = () => {
 	}
 };
 
-const Roles = () => {
+const Roles = ({ constants }) => {
 	const limit = 50;
 	const [operatorList, setOperatorList] = useState([]);
 	const [page, setPage] = useState(1);
@@ -111,6 +113,7 @@ const Roles = () => {
 	const [modalType, setType] = useState('');
 	const [isOpen, setOpen] = useState(false);
 
+	const isUpgrade = handleUpgrade(constants.info);
 	const requestInitRole = (pageNo = 1) => {
 		requestRole({ pageNo, limit })
 			.then((res) => {
@@ -156,12 +159,18 @@ const Roles = () => {
 			});
 	};
 
-	const renderContent = (type, onTypeChange) => {
+	const renderContent = (type, onTypeChange, isUpgrade) => {
 		switch (type) {
 			case 'operator-role':
-				return <OperatorRole handleInvite={handleInvite} />;
+				return <OperatorRole
+							handleInvite={handleInvite}
+							isUpgrade={isUpgrade}
+						/>;
 			case 'role-access':
-				return <RoleAccess handleClose={handleClose} />;
+				return <RoleAccess
+							handleClose={handleClose}
+							isUpgrade={isUpgrade}
+						/>;
 			case 'edit':
 				return (
 					<EditModal
@@ -287,12 +296,18 @@ const Roles = () => {
 				visible={isOpen}
 				footer={null}
 				onCancel={handleClose}
-				width={modalType === 'role-access' ? 600 : 350}
+				width={modalType === 'role-access' ? 600 : (modalType === 'operator-role' ? 500 : 350)}
 			>
-				{renderContent(modalType, onTypeChange)}
+				{renderContent(modalType, onTypeChange, isUpgrade)}
 			</Modal>
 		</div>
 	);
 };
 
-export default Roles;
+const mapStateToProps = (state) => ({
+	constants: state.app.constants,
+});
+
+export default connect(
+	mapStateToProps
+)(Roles);
diff --git a/web/src/containers/Admin/SetupWizard/TradingInterface.js b/web/src/containers/Admin/SetupWizard/TradingInterface.js
index 4535c23979..dac316b85c 100644
--- a/web/src/containers/Admin/SetupWizard/TradingInterface.js
+++ b/web/src/containers/Admin/SetupWizard/TradingInterface.js
@@ -3,16 +3,19 @@ import { Checkbox, Form, Button } from 'antd';
 import { ReactSVG } from 'react-svg';
 
 import { STATIC_ICONS } from 'config/icons';
+import { handleUpgrade } from 'utils/utils';
 
 const { Item } = Form;
 
-const Features = ({ initialValues = {}, handleNext, updateConstants }) => {
+const Features = ({ initialValues = {}, handleNext, updateConstants, kit }) => {
+	const isUpgrade = handleUpgrade(kit.info);
+
 	const handleSubmit = (values) => {
 		const formValues = {};
 		if (values) {
 			formValues.kit = {
 				features: {
-					chat: !!values.chat,
+					chat: isUpgrade ? false : !!values.chat,
 					quick_trade: !!values.quick_trade,
 					pro_trade: !!values.pro_trade,
 				},
@@ -20,16 +23,21 @@ const Features = ({ initialValues = {}, handleNext, updateConstants }) => {
 			updateConstants(formValues, () => handleNext(4));
 		}
 	};
+	let initialValue = initialValues;
+	if (isUpgrade) {
+		initialValue.home_page = false;
+		initialValue.chat = false;
+	}
 	return (
 		<div className="asset-content show-scroll">
 			<div>Select the features that will be available on your exchange.</div>
 			<Form
 				name="interface-form"
-				initialValues={initialValues}
+				initialValues={initialValue}
 				onFinish={handleSubmit}
 			>
 				<div className="interface-box">
-    					<Item name="pro_trade" valuePropName="checked">
+					<Item name="pro_trade" valuePropName="checked">
 						<Checkbox className="mt-3">
 							<div className="d-flex align-items-center">
 								<ReactSVG
@@ -65,38 +73,65 @@ const Features = ({ initialValues = {}, handleNext, updateConstants }) => {
 											(Simple buy/sell interface with wallet)
 										</div>
 									</div>
-  </div>
+								</div>
 							</div>
 						</Checkbox>
 					</Item>
-					<Item name="chat" valuePropName="checked">
-						<Checkbox className="mt-3">
-							<div className="d-flex align-items-center">
-								<div className="feature-trade-box mr-1">
-									<ReactSVG
-										src={STATIC_ICONS.CHAT_FEATURE_ICON}
-										className="feature-chat-icon"
-									/>
-								</div>
-								<div className="ml-2 checkbox-txt">
-									Chat system
-									<div className="d-flex justify-content-between">
-										<div className="small-text">
-											(Usernames, text and emoji communication)
+					<div className={isUpgrade ? 'disabled-area' : ''}>
+						<Item name="chat" valuePropName="checked">
+							<Checkbox className="mt-3" disabled={isUpgrade}>
+								<div className="d-flex align-items-center">
+									<div className="feature-trade-box mr-1">
+										<ReactSVG
+											src={STATIC_ICONS.CHAT_FEATURE_ICON}
+											className="feature-chat-icon"
+										/>
+									</div>
+									<div className="ml-2 checkbox-txt">
+										Chat system
+										<div className="d-flex justify-content-between">
+											<div className="small-text">
+												(Usernames, text and emoji communication)
+											</div>
 										</div>
 									</div>
 								</div>
-							</div>
-						</Checkbox>
-					</Item>
+							</Checkbox>
+						</Item>
+					</div>
 				</div>
+				{isUpgrade ? (
+					<div className="d-flex">
+						<div className="d-flex align-items-center justify-content-between upgrade-section mt-2">
+							<div>
+								<div className="font-weight-bold">
+									Start your crypto culture
+								</div>
+								<div className="font-weight-normal">
+									Allow your users to socialize through chat
+								</div>
+							</div>
+							<div className="ml-5 button-wrapper">
+								<a
+									href="https://dash.bitholla.com/billing"
+									target="_blank"
+									rel="noopener noreferrer"
+								>
+									<Button type="primary" className="w-100">
+										Upgrade Now
+									</Button>
+								</a>
+							</div>
+						</div>
+					</div>
+				) : null}
 				<div className="asset-btn-wrapper">
 					<div className="btn-container">
 						<Button htmlType="submit">Proceed</Button>
 					</div>
-					<span className="step-link" onClick={() => handleNext(4)}>
+					{/* <span className="step-link" onClick={() => handleNext(4)}>
 						Skip this step
-					</span>
+					</span> */}
 				</div>
 			</Form>
 		</div>
diff --git a/web/src/containers/Admin/SetupWizard/index.css b/web/src/containers/Admin/SetupWizard/index.css
index 4fa6ed864c..19935988f1 100644
--- a/web/src/containers/Admin/SetupWizard/index.css
+++ b/web/src/containers/Admin/SetupWizard/index.css
@@ -365,3 +365,7 @@
 .previewButton {
 	margin: 1rem 0rem;
 }
+.asset-content .disabled-area {
+	opacity: 0.6;
+	pointer-events: none;
+}
diff --git a/web/src/containers/Admin/SetupWizard/index.js b/web/src/containers/Admin/SetupWizard/index.js
index 0f546ec577..e910152820 100644
--- a/web/src/containers/Admin/SetupWizard/index.js
+++ b/web/src/containers/Admin/SetupWizard/index.js
@@ -28,6 +28,12 @@ export default class SetupWizard extends Component {
 				timezone: 'UTC',
 				language: 'en',
 			},
+			tradeInitialvalues: {
+				pro_trade: true,
+				quick_trade: true,
+				chat: false,
+				home_page: true,
+			},
 		};
 	}
 
@@ -61,6 +67,7 @@ export default class SetupWizard extends Component {
 					? secrets.captcha.secret_key
 					: '',
 		};
+		let tradeInitialvalues = { ...this.state.tradeInitialvalues };
 		if (secrets.emails) {
 			emailInitialvalues = {
 				...emailInitialvalues,
@@ -85,10 +92,17 @@ export default class SetupWizard extends Component {
 				password: secrets.smtp.password !== 'null' ? secrets.smtp.password : '',
 			};
 		}
+		if (kit.features) {
+			tradeInitialvalues = {
+				...tradeInitialvalues,
+				...kit.features,
+			};
+		}
 		this.setState({
 			constants: data,
 			emailInitialvalues,
 			timeZoneInitialValues,
+			tradeInitialvalues,
 		});
 	};
 
@@ -112,12 +126,18 @@ export default class SetupWizard extends Component {
 	};
 
 	renderStep = () => {
-		const { currentTab, constants } = this.state;
+		const {
+			currentTab,
+			constants,
+			tradeInitialvalues,
+			timeZoneInitialValues,
+			emailInitialvalues,
+		} = this.state;
 		switch (currentTab) {
 			case 0:
 				return (
 					<TimeZone
-						initialValues={this.state.timeZoneInitialValues}
+						initialValues={timeZoneInitialValues}
 						handleNext={this.onTabChange}
 						updateConstants={this.updateConstants}
 					/>
@@ -135,9 +155,10 @@ export default class SetupWizard extends Component {
 			case 3:
 				return (
 					<TradingInterface
-						initialValues={constants.kit.features}
+						initialValues={tradeInitialvalues}
 						handleNext={this.onTabChange}
 						updateConstants={this.updateConstants}
+						kit={constants.kit}
 					/>
 				);
 			case 4:
@@ -146,7 +167,7 @@ export default class SetupWizard extends Component {
 						handleNext={this.onTabChange}
 						updateConstants={this.updateConstants}
 						setPreview={this.setPreview}
-						initialValues={this.state.emailInitialvalues}
+						initialValues={emailInitialvalues}
 					/>
 				);
 			default:
diff --git a/web/src/containers/Admin/Transfers/index.js b/web/src/containers/Admin/Transfers/index.js
index a504fa2e2b..0be211ae10 100644
--- a/web/src/containers/Admin/Transfers/index.js
+++ b/web/src/containers/Admin/Transfers/index.js
@@ -68,7 +68,7 @@ const getFields = (
 		type: 'text',
 		label: 'Description',
 	},
-	send_email: {
+	email: {
 		type: 'checkbox',
 		label: 'Send an email notification to receiver user about this transfer.',
 	},
@@ -147,7 +147,6 @@ const Transfer = ({ coins = {} }) => {
 			sender_id: parseInt(formProps.sender_id, 10),
 			receiver_id: parseInt(formProps.receiver_id, 10),
 			amount: parseFloat(formProps.amount),
-			email: formProps.send_email,
 		};
 		return postTransfer(postValues)
 			.then((res) => {
@@ -181,6 +180,7 @@ const Transfer = ({ coins = {} }) => {
 			<TransferForm
 				initialValues={{
 					currency: coinData[0] ? coinData[0] : '',
+					email: true,
 					...confirmData,
 				}}
 				fields={fields}
@@ -213,7 +213,7 @@ const Transfer = ({ coins = {} }) => {
 						</div>
 						<div>
 							<span className="bold">Send email:</span>{' '}
-							{confirmData.send_email ? 'Yes' : 'No'}
+							{confirmData.email ? 'Yes' : 'No'}
 						</div>
 					</div>
 					<div className="d-flex align-items-center mt-4">
diff --git a/web/src/containers/App/App.js b/web/src/containers/App/App.js
index 11526c61ec..30fe6cf76e 100644
--- a/web/src/containers/App/App.js
+++ b/web/src/containers/App/App.js
@@ -7,9 +7,11 @@ import { FIT_SCREEN_HEIGHT } from 'config/constants';
 import { isBrowser, isMobile } from 'react-device-detect';
 import isEqual from 'lodash.isequal';
 import debounce from 'lodash.debounce';
-import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
-import { Button } from 'antd';
+// import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
+// import { Button } from 'antd';
 import { setSideBarState, getSideBarState } from 'utils/sideBar';
+import AppMenuSidebar from '../../components/AppMenuSidebar';
+import { addElements, injectHTML } from 'utils/script';
 
 import {
 	NOTIFICATIONS,
@@ -20,6 +22,7 @@ import {
 	RISKY_ORDER,
 	LOGOUT_CONFORMATION,
 } from '../../actions/appActions';
+import STRINGS from 'config/localizedStrings';
 
 import {
 	getThemeClass,
@@ -31,7 +34,7 @@ import { getTokenTimestamp, isLoggedIn, isAdmin } from '../../utils/token';
 import {
 	AppBar,
 	AppMenuBar,
-	Sidebar,
+	// Sidebar,
 	SidebarBottom,
 	Dialog,
 	Notification,
@@ -79,6 +82,7 @@ class App extends Component {
 		limitFilledOnOrder: '',
 		sidebarFitHeight: false,
 		isSidebarOpen: getSideBarState(),
+		activeMenu: '',
 	};
 	ordersQueued = [];
 	limitTimeOut = null;
@@ -95,6 +99,7 @@ class App extends Component {
 
 	componentDidMount() {
 		const initialized = getExchangeInitialized();
+		const { injected_values, injected_html } = this.props;
 
 		if (
 			initialized === 'false' ||
@@ -108,10 +113,15 @@ class App extends Component {
 			this.handleFitHeight(this.props.location.pathname);
 		}
 
+		this.setActiveMenu();
+
 		setTimeout(
 			() => this.props.setPricesAndAsset(this.props.balance, this.props.coins),
 			5000
 		);
+
+		addElements(injected_values, 'body');
+		injectHTML(injected_html, 'body');
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps) {
@@ -160,6 +170,14 @@ class App extends Component {
 		}
 	}
 
+	componentDidUpdate(prevProps) {
+		if (
+			JSON.stringify(prevProps.location) !== JSON.stringify(this.props.location)
+		) {
+			this.setActiveMenu();
+		}
+	}
+
 	componentWillUnmount() {
 		if (this.state.publicSocket) {
 			this.state.publicSocket.close();
@@ -207,17 +225,55 @@ class App extends Component {
 		this.setState({ sidebarFitHeight: FIT_SCREEN_HEIGHT.includes(pathname) });
 	};
 
+	setActiveMenu = () => {
+		const { location: { pathname = '' } = {} } = this.props;
+
+		let activeMenu;
+		if (pathname.includes('quick-trade')) {
+			activeMenu = 'quick-trade';
+		} else {
+			activeMenu = pathname;
+		}
+		this.setState({ activeMenu });
+	};
+
+	handleMenuChange = (path = '', cb) => {
+		const { router, pairs } = this.props;
+
+		let pair = '';
+		if (Object.keys(pairs).length) {
+			pair = Object.keys(pairs)[0];
+		} else {
+			pair = this.props.pair;
+		}
+
+		switch (path) {
+			case 'logout':
+				this.logout();
+				break;
+			case 'help':
+				this.props.openHelpfulResourcesForm();
+				break;
+			case 'quick-trade':
+				router.push(`/quick-trade/${pair}`);
+				break;
+			default:
+				router.push(path);
+		}
+
+		this.setState({ activePath: path }, () => {
+			if (cb) {
+				cb();
+			}
+		});
+	};
+
 	goToPage = (path) => {
 		if (this.props.location.pathname !== path) {
 			this.props.router.push(path);
 		}
 	};
 
-	goToAccountPage = () => this.goToPage('/account');
-	goToVerificationPage = () => this.goToPage('/verification');
-	goToDashboard = () => this.goToPage('/');
-	goToXHTTrade = () => this.goToPage('/trade/xht-usdt');
-
 	logout = (message = '') => {
 		this.setState({ appLoaded: false }, () => {
 			this.props.logout(typeof message === 'string' ? message : '');
@@ -320,6 +376,19 @@ class App extends Component {
 						text={data}
 					/>
 				);
+			case NOTIFICATIONS.UNDEFINED_ERROR:
+				return (
+					<MessageDisplay
+						iconId="UNDEFINED_ERROR"
+						iconPath={ICONS['UNDEFINED_ERROR']}
+						onClick={() => window.location.reload(false)}
+						buttonLabel={STRINGS['REFRESH']}
+						text={STRINGS['UNDEFINED_ERROR']}
+						title={STRINGS['UNDEFINED_ERROR_TITLE']}
+						titleId="UNDEFINED_ERROR_TITLE"
+						style={{ maxWidth: '40rem' }}
+					/>
+				);
 			case CONTACT_FORM:
 				return (
 					<ContactForm
@@ -452,37 +521,53 @@ class App extends Component {
 			// verification_level,
 			activeLanguage,
 			// openContactForm,
-			openHelpfulResourcesForm,
 			activeTheme,
-			unreadMessages,
+			// unreadMessages,
 			router,
 			location,
 			enabledPlugins,
 			constants = { captcha: {} },
 			isEditMode,
-			handleEditMode,
 			// user,
 			features,
 			isReady: isSocketDataReady,
 			pairsTradesFetched,
+			icons: ICONS,
+			menuItems,
 		} = this.props;
 
 		const {
 			dialogIsOpen,
 			appLoaded,
 			chatIsClosed,
-			sidebarFitHeight,
-			isSidebarOpen,
+			// sidebarFitHeight,
+			// isSidebarOpen,
 		} = this.state;
 
 		const languageClasses = getClasesForLanguage(activeLanguage, 'array');
 		const fontClass = getFontClassForLanguage(activeLanguage);
 
-		const shouldCloseOnOverlayClick = activeNotification.type !== CONTACT_FORM;
+		const shouldCloseOnOverlayClick =
+			activeNotification.type !== CONTACT_FORM &&
+			activeNotification.type !== NOTIFICATIONS.UNDEFINED_ERROR;
 		const activePath = !appLoaded
 			? ''
 			: this.getClassForActivePath(this.props.location.pathname);
-		const isMenubar = true;
+
+		const isHome = this.props.location.pathname === '/';
+		const isMenubar = !isHome;
+		const isMenuSider =
+			activePath !== 'trade' && activePath !== 'quick-trade' && !isHome;
+		const showFooter = !isMobile || isHome;
+
+		const homeBackgroundProps = isHome
+			? {
+					backgroundImage: `url(${ICONS['EXCHANGE_LANDING_PAGE']})`,
+					backgroundSize: '100%',
+					backgroundRepeat: 'repeat-y',
+			  }
+			: {};
+
 		return (
 			<ThemeProvider>
 				<div>
@@ -525,11 +610,12 @@ class App extends Component {
 								fontClass,
 								languageClasses[0],
 								{
-									'layout-mobile': isMobile,
-									'layout-desktop': isBrowser,
+									'layout-mobile': isMobile && !isHome,
+									'layout-desktop': isBrowser || isHome,
 									'layout-edit': isEditMode && isBrowser,
 								}
 							)}
+							style={homeBackgroundProps}
 						>
 							<EventListener
 								target="window"
@@ -540,19 +626,23 @@ class App extends Component {
 								onKeyPress={this.resetTimer}
 							/>
 							<div className="d-flex flex-column f-1">
-								<AppBar
-									router={router}
-									location={location}
-									goToDashboard={this.goToDashboard}
-									logout={this.logout}
-									activePath={activePath}
-									onHelp={openHelpfulResourcesForm}
-								>
-									{isBrowser && isMenubar && isLoggedIn() && (
-										<AppMenuBar router={router} location={location} />
-									)}
-								</AppBar>
-								{isBrowser && (
+								{!isHome && (
+									<AppBar
+										router={router}
+										menuItems={menuItems}
+										activePath={this.state.activeMenu}
+										onMenuChange={this.handleMenuChange}
+									>
+										{isBrowser && isMenubar && isLoggedIn() && (
+											<AppMenuBar
+												menuItems={menuItems}
+												activePath={this.state.activeMenu}
+												onMenuChange={this.handleMenuChange}
+											/>
+										)}
+									</AppBar>
+								)}
+								{isBrowser && !isHome && (
 									<PairTabs
 										activePath={activePath}
 										location={location}
@@ -566,9 +656,17 @@ class App extends Component {
 										'justify-content-between',
 										{
 											'app_container-secondary-content': isMenubar,
+											no_bottom_navigation: isHome,
 										}
 									)}
 								>
+									{isMenuSider && (
+										<AppMenuSidebar
+											menuItems={menuItems}
+											activePath={this.state.activeMenu}
+											onMenuChange={this.handleMenuChange}
+										/>
+									)}
 									<div
 										className={classnames(
 											'app_container-main',
@@ -577,6 +675,7 @@ class App extends Component {
 											'justify-content-between',
 											{
 												'overflow-y': !isMobile,
+												no_bottom_navigation: isHome,
 											}
 										)}
 									>
@@ -587,7 +686,7 @@ class App extends Component {
 											isReady={pairsTradesFetched}
 										/>
 									</div>
-									{isBrowser && (
+									{/* {isBrowser && !isHome && (
 										<div
 											className={classnames('app_container-sidebar', {
 												'close-sidebar': !isSidebarOpen,
@@ -623,14 +722,23 @@ class App extends Component {
 												sidebarFitHeight={sidebarFitHeight}
 											/>
 										</div>
-									)}
+									)} */}
 									<Dialog
-										isOpen={dialogIsOpen}
+										isOpen={dialogIsOpen && !isHome}
 										label="hollaex-modal"
-										className={classnames('app-dialog', {
-											'app-dialog-flex':
-												activeNotification.type === NOTIFICATIONS.DEPOSIT_INFO,
-										})}
+										className={classnames(
+											'app-dialog',
+											{
+												'app-dialog-flex':
+													activeNotification.type ===
+													NOTIFICATIONS.DEPOSIT_INFO,
+											},
+											{
+												full:
+													activeNotification.type ===
+													NOTIFICATIONS.UNDEFINED_ERROR,
+											}
+										)}
 										onCloseDialog={this.onCloseDialog}
 										shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
 										theme={activeTheme}
@@ -643,7 +751,9 @@ class App extends Component {
 													!isMobile) ||
 												(activeNotification.type === NOTIFICATIONS.ORDERS &&
 													!isMobile) ||
-												activeNotification.type === NOTIFICATIONS.ERROR
+												activeNotification.type === NOTIFICATIONS.ERROR ||
+												activeNotification.type ===
+													NOTIFICATIONS.UNDEFINED_ERROR
 											)
 										}
 										compressed={
@@ -659,7 +769,7 @@ class App extends Component {
 												// activeTheme
 											)}
 									</Dialog>
-									{!isMobile && features && features.chat && (
+									{!isMobile && !isHome && features && features.chat && (
 										<ChatComponent
 											activeLanguage={activeLanguage}
 											minimized={chatIsClosed}
@@ -668,7 +778,7 @@ class App extends Component {
 										/>
 									)}
 								</div>
-								{isMobile && (
+								{isMobile && !isHome && (
 									<div className="app_container-bottom_bar">
 										<SidebarBottom
 											isLogged={isLoggedIn()}
@@ -697,17 +807,13 @@ class App extends Component {
 							}
 						)}
 					>
-						{!isMobile && (
+						{showFooter && (
 							<AppFooter theme={activeTheme} constants={constants} />
 						)}
 					</div>
 				</div>
 				{isAdmin() && isBrowser && (
-					<OperatorControls
-						onChangeEditMode={handleEditMode}
-						editMode={isEditMode}
-						initialData={this.props.location}
-					/>
+					<OperatorControls initialData={this.props.location} />
 				)}
 			</ThemeProvider>
 		);
diff --git a/web/src/containers/App/Socket.js b/web/src/containers/App/Socket.js
index 229f8cd55b..a83129caab 100644
--- a/web/src/containers/App/Socket.js
+++ b/web/src/containers/App/Socket.js
@@ -44,8 +44,6 @@ import {
 	setSnackDialog,
 	setConfig,
 	setInfo,
-	setPlugins,
-	requestPlugins,
 	requestInitial,
 	requestConstant,
 	requestTiers,
@@ -54,6 +52,7 @@ import { hasTheme } from 'utils/theme';
 import { playBackgroundAudioNotification } from '../../utils/utils';
 import { getToken, isLoggedIn } from '../../utils/token';
 import { NORMAL_CLOSURE_CODE, isIntentionalClosure } from 'utils/webSocket';
+import { ERROR_TOKEN_EXPIRED } from 'components/Notification/Logout';
 
 class Container extends Component {
 	constructor(props) {
@@ -64,6 +63,7 @@ class Container extends Component {
 			idleTimer: undefined,
 			ordersQueued: [],
 			limitFilledOnOrder: '',
+			isUserFetched: false,
 		};
 		this.orderCache = {};
 		this.wsInterval = null;
@@ -75,9 +75,6 @@ class Container extends Component {
 		if (!this.props.fetchingAuth) {
 			this.initSocketConnections();
 		}
-		requestPlugins().then(({ data = {} }) => {
-			if (data.data && data.data.length !== 0) this.props.setPlugins(data.data);
-		});
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps) {
@@ -124,8 +121,8 @@ class Container extends Component {
 
 	resetTimer = debounce(this._resetTimer, 250);
 
-	initSocketConnections = () => {
-		this.setPublicWS();
+	initSocketConnections = async () => {
+		await this.setPublicWS();
 		this.setUserSocket();
 		this.setState({ appLoaded: true }, () => {
 			this.props.connectionCallBack(true);
@@ -250,12 +247,20 @@ class Container extends Component {
 				}
 			})
 			.catch((err) => {
-				const message = err.message || JSON.stringify(err);
-				this.props.setNotification(NOTIFICATIONS.ERROR, message);
-			});
+				if (!err.response) {
+					this.props.logout(ERROR_TOKEN_EXPIRED);
+				} else if (err.response && err.response.status === 400) {
+					this.props.setNotification(NOTIFICATIONS.UNDEFINED_ERROR);
+				} else {
+					const message = err.message || JSON.stringify(err);
+					this.props.setNotification(NOTIFICATIONS.ERROR, message);
+				}
+			})
+			.finally(() => this.setState({ isUserFetched: true }));
 	};
 
 	setUserSocket = () => {
+		const { isUserFetched } = this.state;
 		let url = `${WS_URL}/stream`;
 		const token = isLoggedIn() && getToken();
 
@@ -266,7 +271,7 @@ class Container extends Component {
 
 		this.setState({ privateSocket });
 
-		if (isLoggedIn()) {
+		if (isLoggedIn() && !isUserFetched) {
 			this.getUserDetails();
 		}
 
@@ -703,6 +708,8 @@ const mapStateToProps = (store) => ({
 	settings: store.user.settings,
 	constants: store.app.constants,
 	info: store.app.info,
+	token: store.auth.token,
+	verifyToken: store.auth.verifyToken,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -738,7 +745,6 @@ const mapDispatchToProps = (dispatch) => ({
 	setConfig: bindActionCreators(setConfig, dispatch),
 	setInfo: bindActionCreators(setInfo, dispatch),
 	getMe: bindActionCreators(getMe, dispatch),
-	setPlugins: bindActionCreators(setPlugins, dispatch),
 	requestTiers: bindActionCreators(requestTiers, dispatch),
 	setPairsTradesFetched: bindActionCreators(setPairsTradesFetched, dispatch),
 });
diff --git a/web/src/containers/App/_App.scss b/web/src/containers/App/_App.scss
index 6e8a34d500..f66aec25e4 100644
--- a/web/src/containers/App/_App.scss
+++ b/web/src/containers/App/_App.scss
@@ -45,6 +45,21 @@ $inner_container-border: 1px solid $colors-super-pale-black;
 			max-height: $max-content-height-mobile;
 			max-width: $max-content-width-mobile;
 			overflow-y: scroll;
+
+			&.no_bottom_navigation {
+				height: auto;
+				flex: 1;
+				min-height: calc(100vh);
+				max-height: calc(100vh);
+				max-width: 100vw;
+				overflow-y: scroll;
+			}
+
+			.app_container-main {
+				&.no_bottom_navigation {
+					height: 100%;
+				}
+			}
 		}
 		.content-with-bar {
 			min-height: $max-content-height-double-bar-mobile;
diff --git a/web/src/containers/App/index.js b/web/src/containers/App/index.js
index 74935a33cc..dfbc1f25c1 100644
--- a/web/src/containers/App/index.js
+++ b/web/src/containers/App/index.js
@@ -3,6 +3,7 @@ import { bindActionCreators } from 'redux';
 import { logout } from '../../actions/authAction';
 import { setMe, setBalance, updateUser } from '../../actions/userAction';
 import { addUserTrades } from '../../actions/walletActions';
+import { menuItemsSelector } from './selector';
 
 import {
 	setUserOrders,
@@ -43,6 +44,7 @@ import {
 import { setPricesAndAsset } from 'actions/assetActions';
 
 const mapStateToProps = (store) => ({
+	menuItems: menuItemsSelector(store),
 	isReady: store.app.isReady,
 	coins: store.app.coins,
 	symbol: store.orderbook.symbol,
@@ -57,6 +59,7 @@ const mapStateToProps = (store) => ({
 	activeTheme: store.app.theme,
 	// user: store.user,
 	pair: store.app.pair,
+	pairs: store.app.pairs,
 	unreadMessages: store.app.chatUnreadMessages,
 	constants: store.app.constants,
 	info: store.app.info,
@@ -64,6 +67,8 @@ const mapStateToProps = (store) => ({
 	features: store.app.features,
 	config_level: store.app.config_level,
 	pairsTradesFetched: store.orderbook.pairsTradesFetched,
+	injected_values: store.app.injected_values,
+	injected_html: store.app.injected_html,
 });
 
 const mapDispatchToProps = (dispatch) => ({
diff --git a/web/src/containers/App/selector.js b/web/src/containers/App/selector.js
new file mode 100644
index 0000000000..8dadfcf425
--- /dev/null
+++ b/web/src/containers/App/selector.js
@@ -0,0 +1,39 @@
+import { createSelector } from 'reselect';
+import { MENU_ITEMS } from 'config/menu';
+
+const getConstants = (state) => state.app.constants;
+const getRemoteRoutes = (state) => state.app.remoteRoutes;
+
+export const menuItemsSelector = createSelector(
+	[getConstants, getRemoteRoutes],
+	(constants = {}, remoteRoutes = []) => {
+		const { features = {} } = constants;
+		const featureItems = MENU_ITEMS.features.map(
+			({
+				id,
+				hide_from_appbar,
+				hide_from_sidebar,
+				hide_from_menulist,
+				...rest
+			}) => {
+				const item = {
+					...rest,
+					hide_from_appbar: hide_from_appbar || !features[id],
+					hide_from_sidebar: hide_from_sidebar || !features[id],
+					hide_from_menulist: hide_from_menulist || !features[id],
+				};
+				return item;
+			}
+		);
+
+		const menuItems = [
+			...MENU_ITEMS.top,
+			...featureItems,
+			...MENU_ITEMS.middle,
+			...remoteRoutes,
+			...MENU_ITEMS.bottom,
+		];
+
+		return menuItems;
+	}
+);
diff --git a/web/src/containers/Deposit/Fiat.js b/web/src/containers/Deposit/Fiat.js
new file mode 100644
index 0000000000..851a170772
--- /dev/null
+++ b/web/src/containers/Deposit/Fiat.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import STRINGS from 'config/localizedStrings';
+import { EditWrapper } from 'components';
+
+const Fiat = () => {
+	return (
+		<div className="withdraw-form-wrapper">
+			<div className="withdraw-form">
+				<div
+					style={{
+						height: '28rem',
+						display: 'flex',
+						flexDirection: 'column',
+						alignItems: 'center',
+						justifyContent: 'center',
+					}}
+				>
+					<EditWrapper stringId="PAGE_UNDER_CONSTRUCTION">
+						{STRINGS['PAGE_UNDER_CONSTRUCTION']}
+					</EditWrapper>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export default Fiat;
diff --git a/web/src/containers/Deposit/_Deposit.scss b/web/src/containers/Deposit/_Deposit.scss
index eb171075fa..a3148b0acc 100644
--- a/web/src/containers/Deposit/_Deposit.scss
+++ b/web/src/containers/Deposit/_Deposit.scss
@@ -84,3 +84,8 @@ $qr-code--size: 12rem;
 		margin: 1rem;
 	}
 }
+
+.form_currency-ball {
+	width: 30px;
+	height: 30px;
+}
diff --git a/web/src/containers/Deposit/index.js b/web/src/containers/Deposit/index.js
index 35db6ca7a6..f76395f6b9 100644
--- a/web/src/containers/Deposit/index.js
+++ b/web/src/containers/Deposit/index.js
@@ -1,24 +1,32 @@
 import React, { Component } from 'react';
 import classnames from 'classnames';
-
-import { CopyToClipboard } from 'react-copy-to-clipboard';
-
 import { bindActionCreators } from 'redux';
+import { formValueSelector } from 'redux-form';
 import { connect } from 'react-redux';
 import { isMobile } from 'react-device-detect';
 import { BALANCE_ERROR } from '../../config/constants';
 import STRINGS from '../../config/localizedStrings';
 import { getCurrencyFromName } from '../../utils/currency';
+import { createAddress, cleanCreateAddress } from 'actions/userAction';
+import { NOTIFICATIONS } from 'actions/appActions';
+import { DEFAULT_COIN_DATA } from 'config/constants';
 
 import {
 	openContactForm,
 	setSnackNotification,
 } from '../../actions/appActions';
 
-import { Button, MobileBarBack } from '../../components';
-import { renderInformation, renderTitleSection } from '../Wallet/components';
-
-import { generateBaseInformation, renderContent } from './utils';
+import { MobileBarBack, Dialog, Notification } from 'components';
+import {
+	renderInformation,
+	renderTitleSection,
+	renderNeedHelpAction,
+} from '../Wallet/components';
+import RenderContent, {
+	generateBaseInformation,
+	generateFormFields,
+} from './utils';
+import { getWallet } from 'utils/wallet';
 
 import withConfig from 'components/ConfigProvider/withConfig';
 
@@ -28,6 +36,9 @@ class Deposit extends Component {
 		currency: '',
 		checked: false,
 		copied: false,
+		dialogIsOpen: false,
+		formFields: {},
+		initialValues: {},
 	};
 
 	componentWillMount() {
@@ -35,46 +46,83 @@ class Deposit extends Component {
 			this.setState({ depositPrice: this.props.quoteData.data.price });
 		}
 		if (this.props.verification_level) {
-			this.validateRoute(
-				this.props.routeParams.currency,
-				this.props.crypto_wallet,
-				this.props.coins
-			);
+			this.validateRoute(this.props.routeParams.currency, this.props.coins);
 		}
 		this.setCurrency(this.props.routeParams.currency);
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps) {
-		if (nextProps.routeParams.currency !== this.props.routeParams.currency) {
-			this.setCurrency(nextProps.routeParams.currency);
-		} else if (!this.state.checked) {
+		const { selectedNetwork, wallet, coins } = this.props;
+		const { currency, networks } = this.state;
+
+		if (!this.state.checked) {
 			if (nextProps.verification_level) {
-				this.validateRoute(
-					nextProps.routeParams.currency,
-					nextProps.crypto_wallet,
-					this.props.coins
-				);
+				this.validateRoute(nextProps.routeParams.currency, this.props.coins);
 			}
+		} else if (
+			nextProps.selectedNetwork !== selectedNetwork ||
+			JSON.stringify(nextProps.wallet) !== JSON.stringify(wallet) ||
+			JSON.stringify(nextProps.coins) !== JSON.stringify(coins)
+		) {
+			this.generateFormFields(
+				currency,
+				nextProps.selectedNetwork,
+				nextProps.wallet,
+				networks,
+				nextProps.coins
+			);
+		}
+
+		if (nextProps.routeParams.currency !== this.props.routeParams.currency) {
+			this.setCurrency(nextProps.routeParams.currency);
+		}
+
+		if (
+			nextProps.addressRequest.success === true &&
+			nextProps.addressRequest.success !== this.props.addressRequest.success
+		) {
+			this.onCloseDialog();
 		}
 	}
 
 	setCurrency = (currencyName) => {
 		const currency = getCurrencyFromName(currencyName, this.props.coins);
 		if (currency) {
-			this.setState({ currency, checked: false }, () => {
-				this.validateRoute(
-					this.props.routeParams.currency,
-					this.props.crypto_wallet,
-					this.props.coins
-				);
-			});
+			const { coins } = this.props;
+			const coin = coins[currency];
+			const networks = coin.network && coin.network.split(',');
+			let initialNetwork;
+			if (networks && networks.length === 1) {
+				initialNetwork = networks[0];
+			}
+
+			this.setState(
+				{
+					currency,
+					networks,
+					initialNetwork,
+					checked: false,
+				},
+				() => {
+					const { currency, initialNetwork, networks } = this.state;
+					const { wallet, coins } = this.props;
+					this.validateRoute(this.props.routeParams.currency, coins);
+					this.generateFormFields(
+						currency,
+						initialNetwork,
+						wallet,
+						networks,
+						coins
+					);
+				}
+			);
 		} else {
 			this.props.router.push('/wallet');
 		}
 	};
 
-	validateRoute = (currency, crypto_wallet, coins) => {
-		if (coins[currency] && !crypto_wallet[currency]) {
+	validateRoute = (currency, coins) => {
+		if (!coins[currency]) {
 			this.props.router.push('/wallet');
 		} else if (currency) {
 			this.setState({ checked: true });
@@ -93,24 +141,98 @@ class Deposit extends Component {
 		this.props.router.push('/wallet');
 	};
 
+	onOpenDialog = () => {
+		this.setState({ dialogIsOpen: true });
+		this.props.cleanCreateAddress();
+	};
+
+	onCloseDialog = () => {
+		this.setState({ dialogIsOpen: false });
+	};
+
+	onCreateAddress = () => {
+		const { addressRequest, createAddress, selectedNetwork } = this.props;
+		const { currency } = this.state;
+		if (currency && !addressRequest.error) {
+			createAddress(currency, selectedNetwork);
+		}
+	};
+
+	generateFormFields = (currency, network, wallet, networks, coins) => {
+		let address = getWallet(currency, network, wallet, networks);
+		let destinationAddress = '';
+
+		if (currency === 'xrp' || currency === 'xlm' || network === 'stellar') {
+			const temp = address.split(':');
+			address = temp[0] ? temp[0] : address;
+			destinationAddress = temp[1] ? temp[1] : '';
+		}
+
+		const additionalText =
+			currency === 'xlm' || network === 'stellar'
+				? STRINGS['DEPOSIT.CRYPTO_LABELS.MEMO']
+				: STRINGS['DEPOSIT.CRYPTO_LABELS.DESTINATION_TAG'];
+
+		const { fullname } = coins[currency] || DEFAULT_COIN_DATA;
+		const destinationLabel = STRINGS.formatString(additionalText, fullname);
+		const label = STRINGS.formatString(
+			STRINGS['DEPOSIT.CRYPTO_LABELS.ADDRESS'],
+			fullname
+		);
+
+		const showGenerateButton =
+			(!address && networks && network) || (!address && !networks);
+
+		const formFields = generateFormFields({
+			networks,
+			address,
+			label,
+			onCopy: this.onCopy,
+			copyOnClick: true,
+			destinationAddress,
+			destinationLabel,
+		});
+
+		const initialValues = {
+			...(address ? { address } : {}),
+			...(destinationAddress ? { destinationAddress } : {}),
+			network,
+		};
+
+		this.setState({ address, formFields, initialValues, showGenerateButton });
+	};
+
 	render() {
 		const {
 			id,
-			crypto_wallet,
 			openContactForm,
 			balance,
 			coins,
 			constants = { links: {} },
 			icons: ICONS,
+			addressRequest,
+			selectedNetwork,
 		} = this.props;
-		const { currency, checked, copied } = this.state;
+
+		const {
+			dialogIsOpen,
+			currency,
+			checked,
+			copied,
+			formFields,
+			address,
+			initialValues,
+			showGenerateButton,
+		} = this.state;
+
 		if (!id || !currency || !checked) {
 			return <div />;
 		}
+
 		return (
 			<div>
 				{isMobile && <MobileBarBack onBackClick={this.onGoBack} />}
-				<div className="presentation_container  apply_rtl">
+				<div className="presentation_container apply_rtl withdrawal-container">
 					{!isMobile &&
 						renderTitleSection(
 							currency,
@@ -119,40 +241,67 @@ class Deposit extends Component {
 							coins,
 							'DEPOSIT_BITCOIN'
 						)}
-					<div
-						className={classnames(
-							'inner_container',
-							'with_border_top',
-							'with_border_bottom'
-						)}
-					>
-						{renderInformation(
-							currency,
-							balance,
-							openContactForm,
-							generateBaseInformation,
-							coins,
-							'deposit',
-							constants.links,
-							ICONS['BLUE_QUESTION'],
-							'BLUE_QUESTION'
-						)}
-						{renderContent(currency, crypto_wallet, coins, this.onCopy)}
-						{isMobile && (
-							<CopyToClipboard
-								text={crypto_wallet[`${currency.toLowerCase()}`]}
-								onCopy={() => this.setState({ copied: true })}
-							>
-								<Button
-									onClick={this.onCopy}
-									label={
-										copied ? STRINGS['SUCCESFUL_COPY'] : STRINGS['COPY_ADDRESS']
-									}
-								/>
-							</CopyToClipboard>
-						)}
+					<div className={classnames('inner_container')}>
+						<div className="information_block">
+							<div
+								className="information_block-text_wrapper"
+								style={{ height: '1.5rem' }}
+							/>
+							{openContactForm &&
+								renderNeedHelpAction(
+									openContactForm,
+									constants.links,
+									ICONS['BLUE_QUESTION'],
+									'BLUE_QUESTION'
+								)}
+						</div>
+						<RenderContent
+							titleSection={renderInformation(
+								currency,
+								balance,
+								false,
+								generateBaseInformation,
+								coins,
+								'deposit',
+								constants.links,
+								ICONS['BLUE_QUESTION'],
+								'BLUE_QUESTION'
+							)}
+							icons={ICONS}
+							initialValues={initialValues}
+							address={address}
+							currency={currency}
+							coins={coins}
+							onCopy={this.onCopy}
+							onOpen={() => this.onOpenDialog(currency)}
+							copied={copied}
+							setCopied={() => this.setState({ copied: true })}
+							showGenerateButton={showGenerateButton}
+							formFields={formFields}
+							selectedNetwork={selectedNetwork}
+						/>
 					</div>
 				</div>
+				<Dialog
+					isOpen={dialogIsOpen}
+					label="hollaex-modal"
+					className="app-dialog"
+					onCloseDialog={this.onCloseDialog}
+					shouldCloseOnOverlayClick={false}
+					showCloseText={true}
+					style={{ 'z-index': 100 }}
+				>
+					{dialogIsOpen && currency && (
+						<Notification
+							type={NOTIFICATIONS.GENERATE_ADDRESS}
+							onBack={this.onCloseDialog}
+							onGenerate={this.onCreateAddress}
+							currency={currency}
+							data={addressRequest}
+							coins={coins}
+						/>
+					)}
+				</Dialog>
 			</div>
 		);
 	}
@@ -160,15 +309,19 @@ class Deposit extends Component {
 
 const mapStateToProps = (store) => ({
 	id: store.user.id,
-	crypto_wallet: store.user.crypto_wallet,
+	wallet: store.user.wallet,
 	balance: store.user.balance,
 	activeLanguage: store.app.language,
 	quoteData: store.orderbook.quoteData,
 	coins: store.app.coins,
 	constants: store.app.constants,
+	addressRequest: store.user.addressRequest,
+	selectedNetwork: formValueSelector('GenerateWalletForm')(store, 'network'),
 });
 
 const mapDispatchToProps = (dispatch) => ({
+	createAddress: bindActionCreators(createAddress, dispatch),
+	cleanCreateAddress: bindActionCreators(cleanCreateAddress, dispatch),
 	openContactForm: bindActionCreators(openContactForm, dispatch),
 	setSnackNotification: bindActionCreators(setSnackNotification, dispatch),
 });
diff --git a/web/src/containers/Deposit/utils.js b/web/src/containers/Deposit/utils.js
index 860153a5c5..b670aca560 100644
--- a/web/src/containers/Deposit/utils.js
+++ b/web/src/containers/Deposit/utils.js
@@ -1,12 +1,17 @@
-import React from 'react';
+import React, { Fragment } from 'react';
+import { reduxForm } from 'redux-form';
 import QRCode from 'qrcode.react';
-import classnames from 'classnames';
-import { DEFAULT_COIN_DATA } from '../../config/constants';
+import { ExclamationCircleFilled } from '@ant-design/icons';
 import STRINGS from '../../config/localizedStrings';
-import { EditWrapper } from 'components';
+import { EditWrapper, Button } from 'components';
+import { CopyToClipboard } from 'react-copy-to-clipboard';
+import { required } from 'components/Form/validations';
+import { getNetworkLabelByKey } from 'utils/wallet';
 
+import Image from 'components/Image';
+import renderFields from 'components/Form/factoryFields';
 import { isMobile } from 'react-device-detect';
-import { renderDumbField } from '../Wallet/components'; // eslint-disable-line
+import Fiat from './Fiat';
 
 export const generateBaseInformation = (id = '') => (
 	<div className="text">
@@ -18,91 +23,155 @@ export const generateBaseInformation = (id = '') => (
 	</div>
 );
 
-const renderBTCContent = (
-	label = '',
-	address = '',
+export const generateFormFields = ({
+	networks,
+	address,
+	label,
 	onCopy,
 	copyOnClick,
-	destinationAddress = '',
-	destinationLabel = ''
-) =>
-	address ? (
-		<div
-			className={classnames(
-				'deposit_info-wrapper d-flex align-items-center',
-				isMobile && 'flex-column-reverse'
-			)}
-		>
-			<div>
-				<div className="deposit_info-crypto-wrapper">
-					{renderDumbField({
-						label,
-						value: address,
-						fullWidth: true,
-						allowCopy: true,
-						onCopy,
-						copyOnClick,
-					})}
-				</div>
-				{destinationAddress ? (
-					<div className="deposit_info-crypto-wrapper">
-						{renderDumbField({
-							label: destinationLabel,
-							value: destinationAddress,
-							fullWidth: true,
-							allowCopy: true,
-							onCopy,
-							copyOnClick,
-						})}
-					</div>
-				) : null}
-			</div>
-			<div className="deposit_info-qr-wrapper d-flex align-items-center justify-content-center">
-				<div className="qr_code-wrapper d-flex flex-column">
-					<div className="qr-code-bg d-flex justify-content-center align-items-center">
-						<QRCode value={address} />
-					</div>
-					<div className="qr-text">
-						<EditWrapper stringId="DEPOSIT.QR_CODE">
-							{STRINGS['DEPOSIT.QR_CODE']}
-						</EditWrapper>
-					</div>
-				</div>
-			</div>
-		</div>
-	) : (
-		<div>{STRINGS['DEPOSIT.NO_DATA']}</div>
-	);
+	destinationAddress,
+	destinationLabel,
+}) => {
+	const fields = {};
 
-export const renderContent = (
-	symbol,
-	crypto_wallet = {},
-	coins = {},
-	onCopy
-) => {
-	if (coins[symbol]) {
-		const { fullname } = coins[symbol] || DEFAULT_COIN_DATA;
-		let address = crypto_wallet[symbol];
-		let destinationAddress = '';
-		if (symbol === 'xrp' || symbol === 'xlm' || coins[symbol].network === 'stellar') {
-			const temp = address.split(':');
-			address = temp[0] ? temp[0] : address;
-			destinationAddress = temp[1] ? temp[1] : '';
-		}
-		const additionalText =
-			symbol === 'xlm' || coins[symbol].network === 'stellar'
-				? STRINGS['DEPOSIT.CRYPTO_LABELS.MEMO']
-				: STRINGS['DEPOSIT.CRYPTO_LABELS.DESTINATION_TAG'];
+	if (networks) {
+		const networkOptions = networks.map((network) => ({
+			value: network,
+			label: getNetworkLabelByKey(network),
+		}));
+
+		fields.network = {
+			type: 'select',
+			stringId:
+				'WITHDRAWALS_FORM_NETWORK_LABEL,WITHDRAWALS_FORM_NETWORK_PLACEHOLDER,DEPOSIT_FORM_NETWORK_WARNING',
+			label: STRINGS['WITHDRAWALS_FORM_NETWORK_LABEL'],
+			placeholder: STRINGS['WITHDRAWALS_FORM_NETWORK_PLACEHOLDER'],
+			warning: STRINGS['DEPOSIT_FORM_NETWORK_WARNING'],
+			validate: [required],
+			fullWidth: true,
+			options: networkOptions,
+			hideCheck: true,
+			ishorizontalfield: true,
+			disabled: networks.length === 1,
+		};
+	}
+
+	if (address) {
+		fields.address = {
+			type: 'dumb',
+			label,
+			fullWidth: true,
+			allowCopy: true,
+			onCopy,
+			copyOnClick,
+			hideCheck: true,
+			ishorizontalfield: true,
+		};
+	}
 
-		return renderBTCContent(
-			STRINGS.formatString(STRINGS['DEPOSIT.CRYPTO_LABELS.ADDRESS'], fullname),
-			address,
+	if (destinationAddress) {
+		fields.destinationAddress = {
+			type: 'dumb',
+			label: destinationLabel,
+			fullWidth: true,
+			allowCopy: true,
 			onCopy,
-			true,
-			destinationAddress,
-			STRINGS.formatString(additionalText, fullname)
+			copyOnClick,
+			hideCheck: true,
+			ishorizontalfield: true,
+		};
+	}
+
+	return fields;
+};
+
+const RenderContentForm = ({
+	titleSection,
+	currency,
+	coins = {},
+	onCopy,
+	onOpen,
+	setCopied,
+	copied,
+	address,
+	showGenerateButton,
+	formFields,
+	icons: ICONS,
+	selectedNetwork,
+}) => {
+	const coinObject = coins[currency];
+	if (coinObject && !coinObject.meta.is_fiat) {
+		return (
+			<Fragment>
+				<div className="withdraw-form-wrapper">
+					<div className="withdraw-form">
+						<Image
+							iconId={`${currency.toUpperCase()}_ICON`}
+							icon={ICONS[`${currency.toUpperCase()}_ICON`]}
+							wrapperClassName="form_currency-ball"
+						/>
+						{titleSection}
+						{(currency === 'xrp' ||
+							currency === 'xlm' ||
+							selectedNetwork === 'stellar') && (
+							<div className="d-flex">
+								<div className="d-flex align-items-baseline field_warning_wrapper">
+									<ExclamationCircleFilled className="field_warning_icon" />
+									<div className="field_warning_text">
+										{STRINGS['DEPOSIT_FORM_TITLE_WARNING_DESTINATION_TAG']}
+									</div>
+								</div>
+								<EditWrapper stringId="DEPOSIT_FORM_TITLE_WARNING_DESTINATION_TAG" />
+							</div>
+						)}
+						{renderFields(formFields)}
+						{address && (
+							<div className="deposit_info-qr-wrapper d-flex align-items-center justify-content-center">
+								<div className="qr_code-wrapper d-flex flex-column">
+									<div className="qr-code-bg d-flex justify-content-center align-items-center">
+										<QRCode value={address} />
+									</div>
+									<div className="qr-text">
+										<EditWrapper stringId="DEPOSIT.QR_CODE">
+											{STRINGS['DEPOSIT.QR_CODE']}
+										</EditWrapper>
+									</div>
+								</div>
+							</div>
+						)}
+					</div>
+					{showGenerateButton && (
+						<div className="btn-wrapper">
+							<Button
+								stringId="GENERATE_WALLET"
+								label={STRINGS['GENERATE_WALLET']}
+								onClick={onOpen}
+							/>
+						</div>
+					)}
+					{isMobile && address && (
+						<div className="btn-wrapper">
+							<CopyToClipboard text={address} onCopy={setCopied}>
+								<Button
+									onClick={onCopy}
+									label={
+										copied ? STRINGS['SUCCESFUL_COPY'] : STRINGS['COPY_ADDRESS']
+									}
+								/>
+							</CopyToClipboard>
+						</div>
+					)}
+				</div>
+			</Fragment>
 		);
+	} else if (coinObject && coinObject.meta.is_fiat) {
+		return <Fiat icons={ICONS} />;
 	} else {
 		return <div>{STRINGS['DEPOSIT.NO_DATA']}</div>;
 	}
 };
+
+export default reduxForm({
+	form: 'GenerateWalletForm',
+	enableReinitialize: true,
+})(RenderContentForm);
diff --git a/web/src/containers/HelpfulResourcesForm/_HelpfulResourcesForm.scss b/web/src/containers/HelpfulResourcesForm/_HelpfulResourcesForm.scss
index 35238403f3..9e21b091e0 100644
--- a/web/src/containers/HelpfulResourcesForm/_HelpfulResourcesForm.scss
+++ b/web/src/containers/HelpfulResourcesForm/_HelpfulResourcesForm.scss
@@ -22,7 +22,7 @@ $contact-form--icon-size: 6rem;
 		margin-top: 1.5rem;
 	}
 	.text {
-		font-size: 0.8rem;
+		font-size: 12px;
 		flex: 6;
 		margin-left: 1rem;
 	}
diff --git a/web/src/containers/HelpfulResourcesForm/index.js b/web/src/containers/HelpfulResourcesForm/index.js
index 38809501c8..430be41ef5 100644
--- a/web/src/containers/HelpfulResourcesForm/index.js
+++ b/web/src/containers/HelpfulResourcesForm/index.js
@@ -56,8 +56,13 @@ class HelpfulResourcesForm extends Component {
 	};
 
 	render() {
-		const { onClose, icons: ICONS } = this.props;
+		const {
+			onClose,
+			icons: ICONS,
+			constants: { links: { helpdesk = '', api_doc_link = '' } = {} },
+		} = this.props;
 		const { submited } = this.state;
+
 		if (submited) {
 			return (
 				<Notification type={NOTIFICATIONS.CONTACT_FORM} onClose={onClose} />
@@ -83,12 +88,14 @@ class HelpfulResourcesForm extends Component {
 							wrapperClassName="help_icons ml-1 mr-1"
 						/>
 						<div className="text">
-							{STRINGS['HELP_RESOURCE_GUIDE_TEXT']}
-							<BlueLink
-								href={STRINGS['HELP_EXIR_TUTORIAL_LINK']}
-								text={STRINGS['HELP_EXIR_TUTORIAL_LINK']}
-							/>
-							<EditWrapper stringId="HELP_RESOURCE_GUIDE_TEXT" />
+							{STRINGS.formatString(
+								STRINGS['HELP_RESOURCE_GUIDE.TEXT'],
+								<BlueLink
+									href={helpdesk}
+									text={STRINGS['HELP_RESOURCE_GUIDE.CONTACT_US']}
+								/>
+							)}
+							<EditWrapper stringId="HELP_RESOURCE_GUIDE.TEXT,HELP_RESOURCE_GUIDE.CONTACT_US" />
 						</div>
 						<div className="w-25" />
 					</div>
@@ -100,10 +107,7 @@ class HelpfulResourcesForm extends Component {
 						/>
 						<div className="text">
 							{STRINGS['HELP_TELEGRAM_TEXT']}
-							<BlueLink
-								href={STRINGS['HELP_TELEGRAM_LINK']}
-								text={STRINGS['HELP_TELEGRAM_LINK']}
-							/>
+							<BlueLink href={api_doc_link} text={api_doc_link} />
 							<EditWrapper stringId="HELP_TELEGRAM_TEXT,HELP_TELEGRAM_LINK" />
 						</div>
 						<div className="w-25" />
diff --git a/web/src/containers/Home/MainSection.js b/web/src/containers/Home/MainSection.js
new file mode 100644
index 0000000000..3a222c4847
--- /dev/null
+++ b/web/src/containers/Home/MainSection.js
@@ -0,0 +1,75 @@
+import React from 'react';
+import classnames from 'classnames';
+import STRINGS from '../../config/localizedStrings';
+import { FLEX_CENTER_CLASSES } from '../../config/constants';
+
+import withConfig from 'components/ConfigProvider/withConfig';
+import { EditWrapper } from 'components';
+
+const BUTTONS_CLASSES = [
+	'buttons-section--button',
+	...FLEX_CENTER_CLASSES,
+	'exir-button',
+];
+
+const MainSection = ({ style = {}, onClickTrade, onClickDemo }) => {
+	return (
+		<div
+			className={classnames(
+				...FLEX_CENTER_CLASSES,
+				'flex-column',
+				'section_1-content'
+			)}
+			style={style}
+		>
+			<div className={classnames('f-1', ...FLEX_CENTER_CLASSES, 'flex-column')}>
+				<div className="home-title text-capitalize">
+					<EditWrapper stringId="HOME.MAIN_TITLE">
+						{STRINGS['HOME.MAIN_TITLE']}
+					</EditWrapper>
+				</div>
+				<div className="text-section text-center">
+					<EditWrapper stringId="HOME.MAIN_TEXT">
+						{STRINGS['HOME.MAIN_TEXT']}
+					</EditWrapper>
+				</div>
+				<div className={classnames('buttons-section', ...FLEX_CENTER_CLASSES)}>
+					<div style={{ display: 'flex', alignSelf: 'center' }}>
+						<EditWrapper stringId="HOME.VIEW_EXCHANGE" />
+						<div
+							className={classnames(
+								...BUTTONS_CLASSES,
+								'main-section_button_invert',
+								'no-border',
+								{
+									pointer: onClickDemo,
+								}
+							)}
+							onClick={onClickDemo}
+						>
+							{STRINGS['HOME.VIEW_EXCHANGE']}
+						</div>
+					</div>
+					<div style={{ display: 'flex', alignSelf: 'center' }}>
+						<EditWrapper stringId="HOME.TRADE_CRYPTO" />
+						<div
+							className={classnames(
+								...BUTTONS_CLASSES,
+								'main-section_button',
+								'no-border',
+								{
+									pointer: onClickTrade,
+								}
+							)}
+							onClick={onClickTrade}
+						>
+							{STRINGS['HOME.TRADE_CRYPTO']}
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	);
+};
+
+export default withConfig(MainSection);
diff --git a/web/src/containers/Home/Section1.js b/web/src/containers/Home/Section1.js
index 54a4554e34..d257ec244f 100644
--- a/web/src/containers/Home/Section1.js
+++ b/web/src/containers/Home/Section1.js
@@ -14,8 +14,8 @@ const Section1 = ({
 	onClickScrollTo = () => {},
 	onClickLearnMore,
 	token,
+	icons: ICONS,
 }) => {
-	const { icons: ICONS } = this.props;
 	return (
 		<div
 			className={classnames(
diff --git a/web/src/containers/Home/_Home.scss b/web/src/containers/Home/_Home.scss
index d8d1b69c69..bafc3c058a 100644
--- a/web/src/containers/Home/_Home.scss
+++ b/web/src/containers/Home/_Home.scss
@@ -5,12 +5,148 @@ $features-container--width: 75rem;
 $features-container--sm--width: 45rem;
 $card-text--margin: 0.75rem;
 $no-background--color: white;
+$app-bar--arrow-size: 0.4rem;
+$trade-tab--arrow-size: 0.4rem;
+
+.home-page__market-wrapper {
+	background-color: $landing_markets_table;
+
+	.table-row {
+		color: $colors-main-black !important;
+	}
+
+	thead {
+		color: $colors-main-black !important;
+		background-color: $auth-container-background;
+		tr {
+			height: 5rem !important;
+		}
+	}
+
+	th:nth-child(1) {
+		padding-left: 2rem !important;
+	}
+
+	td:nth-child(1) {
+		padding-left: 1rem !important;
+	}
+
+	th:last-child {
+		padding-right: 2rem !important;
+	}
+
+	td:last-child {
+		padding-right: 1rem !important;
+	}
+
+	.market-list__footer {
+		height: 4.5rem !important;
+	}
+
+	.market-list__block-table {
+		margin-bottom: 0 !important;
+	}
+
+	.price-diff-down {
+		color: $sell;
+		padding: 0 5px;
+		border-radius: 2px;
+		transition: all 0.2s ease-out 0s;
+
+		&.entering,
+		&.exiting {
+			color: $sell-bids-text;
+			background-color: $sell;
+		}
+	}
+
+	.price-diff-up {
+		color: $buy;
+		padding: 0 5px;
+		border-radius: 2px;
+		transition: all 0.2s ease-out 0s;
+
+		&.entering,
+		&.exiting {
+			color: $buy-bids-text;
+			background-color: $buy;
+		}
+	}
+
+	.trade-tab-price_diff_up {
+		margin: auto 0;
+	}
+
+	.entering,
+	.exiting {
+		&.trade-tab-price_diff_up:before {
+			@include css-triangle($buy-bids-text, 'up', $trade-tab--arrow-size);
+			display: inline-block;
+			margin-bottom: 0.2rem;
+			margin-right: 0.5rem;
+			position: relative;
+			top: calc(50% - 0.6rem);
+		}
+	}
+
+	.trade-tab-price_diff_up:before {
+		@include css-triangle($buy, 'up', $trade-tab--arrow-size);
+		display: inline-block;
+		margin-bottom: 0.2rem;
+		margin-right: 0.5rem;
+		position: relative;
+		top: calc(50% - 0.6rem);
+	}
+
+	.trade-tab-price_diff_down {
+		margin: auto 0;
+	}
+
+	.entering,
+	.exiting {
+		&.trade-tab-price_diff_down:before {
+			@include css-triangle($sell-bids-text, 'down', $trade-tab--arrow-size);
+			display: inline-block;
+			margin-right: 0.5rem;
+			position: relative;
+			top: calc(50% - 0.6rem);
+		}
+	}
+
+	.trade-tab-price_diff_down:before {
+		@include css-triangle($sell, 'down', $trade-tab--arrow-size);
+		display: inline-block;
+		margin-right: 0.5rem;
+		position: relative;
+		top: calc(50% - 0.6rem);
+	}
+}
+
+.home_header_button {
+	height: 28px;
+	font-weight: bold;
+}
 
 .layout-mobile {
-	&.home_container {
-		.app_container-content {
-			min-height: $max-content-height-home-mobile;
-			max-height: $max-content-height-home-mobile;
+	.home_header_button {
+		height: 24px;
+	}
+
+	.home-page__market-wrapper {
+		th:nth-child(1) {
+			padding-left: 1rem !important;
+		}
+
+		td:nth-child(1) {
+			padding-left: 0.5rem !important;
+		}
+
+		th:last-child {
+			padding-right: 0.1rem !important;
+		}
+
+		td:last-child {
+			padding-right: 0.5rem !important;
 		}
 	}
 }
@@ -19,6 +155,21 @@ $no-background--color: white;
 	background-repeat: no-repeat;
 	background-size: cover;
 
+	.main-section_button_invert {
+		color: $link !important;
+		background-color: $colors-main-black !important;
+	}
+
+	.main-section_button {
+		color: $colors-main-black !important;
+		background-color: $link !important;
+	}
+
+	.quick_trade-wrapper {
+		min-width: 30rem;
+		max-width: 40rem;
+	}
+
 	.exchange-expired {
 		background-color: #ed1c24 !important;
 		color: #ffffff !important;
@@ -42,11 +193,19 @@ $no-background--color: white;
 		padding: 2rem;
 	}
 
-	.section_1-content {
-		background: linear-gradient(to bottom, transparent, $no-background--color);
+	.home-page_overlay {
+		width: 100% !important;
+		height: 100% !important;
 
+		background: linear-gradient(
+			to bottom,
+			$app-landing_background,
+			$app-landing_background
+		);
+	}
+
+	.section_1-content {
 		position: relative;
-		min-height: 500px;
 
 		.scroll-button {
 			$arrow-size: 2rem;
@@ -107,18 +266,20 @@ $no-background--color: white;
 
 	.home-title,
 	.features-title {
-		font-size: $font-size-headline;
-		margin-bottom: 1rem;
+		font-size: $font-size-headline2;
+		line-height: normal;
+		font-weight: bold;
 		text-align: center;
 	}
 
-	.home-title {
-		margin-bottom: 0.5rem;
-	}
-
 	.text-section,
 	.buttons-section {
-		margin: 1rem;
+		margin: 0.5rem;
+	}
+
+	.text-section {
+		font-size: $font-size-subhead3;
+		font-weight: bold;
 	}
 
 	.buttons-section--button {
@@ -137,6 +298,37 @@ $no-background--color: white;
 	}
 }
 
+.home-page_content {
+	margin-left: auto;
+	margin-right: auto;
+	margin-top: 5rem;
+	max-width: $content-display-width;
+}
+
+.live-markets_header {
+	font-size: $font-size-subhead3;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	padding-bottom: 0.5rem;
+	color: $colors-main-black;
+	font-weight: bold;
+}
+
+.buttons-section-header {
+	margin: 0 0.5rem;
+}
+
+.home-page_section-wrapper {
+	&:not(.main-section-wrapper) {
+		padding-top: 5rem;
+		padding-bottom: 5rem;
+	}
+	&.main-section-wrapper {
+		padding-bottom: 5rem;
+	}
+}
+
 .direction_ltr {
 	.home-card-text-container {
 		margin-left: $card-text--margin;
@@ -149,12 +341,47 @@ $no-background--color: white;
 	}
 }
 
+.home_app_bar {
+	height: $navigation_bar-height-lg;
+	min-height: $navigation_bar-height-lg;
+
+	.app_bar-icon-logo {
+		height: 4rem;
+		width: 5rem;
+		background-size: contain;
+		background-position: left center;
+		background-repeat: no-repeat;
+	}
+
+	.app_bar-icon {
+		flex: 0;
+		margin: 0 0.5rem;
+		padding-right: 8px;
+		width: 100%;
+	}
+}
+
 @media (max-width: $bp-sm) {
 	.home_container {
 		.home-card-container {
 			margin: 0 2rem 3rem;
 		}
 
+		.buttons-section,
+		.buttons-section-header {
+			.exir-button {
+				font-size: 1.2rem !important;
+			}
+		}
+
+		.text-section {
+			font-size: 1.5rem !important;
+		}
+
+		.live-markets_header {
+			font-size: 1.5rem !important;
+		}
+
 		.features-container {
 			.features-card_container {
 				max-width: $features-container--sm--width;
@@ -162,3 +389,20 @@ $no-background--color: white;
 		}
 	}
 }
+
+@media (min-width: 1920px) {
+	.home_app_bar {
+		.app_bar-icon-logo {
+			height: 3rem;
+			width: 5rem;
+		}
+
+		.app_bar-icon {
+			margin: 1rem 0 1rem;
+		}
+	}
+}
+
+.wide-logo {
+	width: 10rem !important;
+}
diff --git a/web/src/containers/Home/index.js b/web/src/containers/Home/index.js
index 03f6cb310c..2f96513377 100644
--- a/web/src/containers/Home/index.js
+++ b/web/src/containers/Home/index.js
@@ -1,187 +1,465 @@
 import React, { Component } from 'react';
 import classnames from 'classnames';
 import { connect } from 'react-redux';
-import EventListener from 'react-event-listener';
 import { bindActionCreators } from 'redux';
-import { isBrowser, isMobile } from 'react-device-detect';
+import { QuickTradeLimitsSelector } from 'containers/QuickTrade/utils';
+import { isMobile } from 'react-device-detect';
 
-import { AppBar, AppFooter } from '../../components';
-// import { requestQuickTrade } from '../../actions/orderbookAction';
-import { setLanguage, getExchangeInfo } from '../../actions/appActions';
+import STRINGS from 'config/localizedStrings';
+import {
+	changePair,
+	setLanguage,
+	getExchangeInfo,
+	getTickers,
+} from 'actions/appActions';
 import { logout } from '../../actions/authAction';
-import { getClasesForLanguage } from '../../utils/string';
-import { getThemeClass } from '../../utils/theme';
+import { isLoggedIn } from 'utils/token';
+import Markets from 'containers/Summary/components/Markets';
+import { QuickTrade, EditWrapper, ButtonLink } from 'components';
+import { unique } from 'utils/data';
+import math from 'mathjs';
+import Image from 'components/Image';
 
-import Section1 from './Section1';
-// import Section2 from './Section2';
-import Section3 from './Section3';
+import MainSection from './MainSection';
 import withConfig from 'components/ConfigProvider/withConfig';
 
-const INFORMATION_INDEX = 1;
+const DECIMALS = 4;
 const MIN_HEIGHT = 450;
 
 class Home extends Component {
-	state = {
-		height: 0,
-		style: {
-			minHeight: MIN_HEIGHT,
-		},
-	};
+	constructor(props) {
+		super(props);
+		const { pairs, sourceOptions, tickers } = this.props;
+		const pair = Object.keys(pairs)[0];
+		const pairArray = pair ? pair.split('-') : [];
+		const [, selectedSource = sourceOptions[0]] = pairArray;
+		const targetOptions = this.getTargetOptions(selectedSource);
+		const [selectedTarget = targetOptions[0]] = pairArray;
+		const { close: tickerClose } = tickers[pair] || {};
+
+		this.state = {
+			side: 'buy',
+			tickerClose,
+			showQuickTradeModal: false,
+			targetOptions,
+			selectedSource,
+			selectedTarget,
+			targetAmount: undefined,
+			sourceAmount: undefined,
+			order: {
+				fetching: false,
+				error: false,
+				data: {},
+			},
+			sourceError: '',
+			targetError: '',
+			height: 0,
+			style: {
+				minHeight: MIN_HEIGHT,
+			},
+		};
+		this.goToPair(pair);
+	}
 
 	componentDidMount() {
+		const { sections } = this.props;
 		this.props.getExchangeInfo();
+		this.props.getTickers();
+		this.generateSections(sections);
 	}
 
-	setContainerRef = (el) => {
-		if (el) {
-			this.container = el;
-			this.onResize();
+	goTo = (path) => () => {
+		this.props.router.push(path);
+	};
+
+	onReviewQuickTrade = () => {
+		const { pair } = this.props;
+		if (isLoggedIn()) {
+			this.goTo(`/quick-trade/${pair}`)();
+		} else {
+			this.goTo('/login')();
 		}
 	};
 
-	onResize = () => {
-		if (this.container) {
-			const height = window.innerHeight - 45;
-			this.setState({
-				style: {
-					minHeight: height,
-					// maxHeight: height,
-				},
-				height,
-			});
-			// this.onClickScrollTo(0)();
+	generateSections = (sections) => {
+		const sectionComponents = Object.entries(sections)
+			.filter(([_, { is_active }]) => is_active)
+			.sort(
+				([_, { order: order_a }], [__, { order: order_b }]) => order_a - order_b
+			)
+			.map(([key], index) => (
+				<div key={`section-${key}`}>{this.getSectionByKey(key)}</div>
+			));
+
+		return sectionComponents;
+	};
+
+	calculateMinHeight = (sectionsNumber) => {
+		if (sectionsNumber === 1) {
+			if (isMobile) {
+				return '30rem';
+			} else {
+				return 'calc(100vh - 15rem)';
+			}
+		} else {
+			return '14rem';
 		}
 	};
 
-	onClickScrollTo = (children = 0) => () => {
-		if (this.container && typeof children === 'number') {
-			const sections = this.container.children;
-			if (children < sections.length) {
-				sections[children].scrollIntoView({
-					behavior: 'smooth',
-				});
+	getSectionByKey = (key) => {
+		switch (key) {
+			case 'heading': {
+				const {
+					constants: { features: { quick_trade = false } = {} } = {},
+					isReady,
+					pair,
+					sections,
+				} = this.props;
+
+				const sectionsNumber = Object.entries(sections)
+					.filter(([_, { is_active }]) => is_active)
+					.filter(([key]) => key !== 'quick_trade' || (quick_trade && isReady))
+					.length;
+
+				return (
+					<div className="home-page_section-wrapper main-section-wrapper">
+						<MainSection
+							style={{
+								minHeight: this.calculateMinHeight(sectionsNumber),
+							}}
+							onClickDemo={
+								pair ? this.goTo(`trade/${pair}`) : this.goTo('trade/add/tabs')
+							}
+							onClickTrade={this.goTo('signup')}
+						/>
+					</div>
+				);
+			}
+			case 'market_list': {
+				const { router, coins, pairs } = this.props;
+				return (
+					<div className="home-page_section-wrapper">
+						<div className="d-flex justify-content-center">
+							<EditWrapper stringId="MARKETS_TABLE.TITLE">
+								<div className="live-markets_header">
+									{STRINGS['MARKETS_TABLE.TITLE']}
+								</div>
+							</EditWrapper>
+						</div>
+						<div className="home-page__market-wrapper">
+							<Markets
+								coins={coins}
+								pairs={pairs}
+								router={router}
+								showSearch={false}
+								showMarkets={true}
+							/>
+						</div>
+					</div>
+				);
+			}
+			case 'quick_trade': {
+				const {
+					constants: { features: { quick_trade = false } = {} } = {},
+					isReady,
+					pair,
+					coins,
+					pairs,
+					orderLimits,
+					sourceOptions,
+				} = this.props;
+
+				const {
+					targetAmount,
+					sourceAmount,
+					selectedTarget,
+					selectedSource,
+					targetOptions,
+					side,
+				} = this.state;
+
+				return (
+					pairs &&
+					Object.keys(pairs).length &&
+					selectedTarget &&
+					selectedTarget &&
+					quick_trade &&
+					isReady && (
+						<div className="home-page_section-wrapper">
+							<QuickTrade
+								onReviewQuickTrade={this.onReviewQuickTrade}
+								onSelectTarget={this.onSelectTarget}
+								onSelectSource={this.onSelectSource}
+								side={side}
+								symbol={pair}
+								disabled={false}
+								orderLimits={orderLimits[pair]}
+								pairs={pairs}
+								coins={coins}
+								sourceOptions={sourceOptions}
+								targetOptions={targetOptions}
+								selectedSource={selectedSource}
+								selectedTarget={selectedTarget}
+								targetAmount={targetAmount}
+								sourceAmount={sourceAmount}
+								onChangeTargetAmount={this.onChangeTargetAmount}
+								onChangeSourceAmount={this.onChangeSourceAmount}
+								forwardSourceError={this.forwardSourceError}
+								forwardTargetError={this.forwardTargetError}
+								autoFocus={false}
+							/>
+						</div>
+					)
+				);
 			}
+			default:
+				return null;
 		}
 	};
 
-	goTo = (path) => () => {
-		this.props.router.push(path);
+	onSelectTarget = (selectedTarget) => {
+		const { tickers } = this.props;
+		const { selectedSource } = this.state;
+
+		const pairName = `${selectedTarget}-${selectedSource}`;
+		const reversePairName = `${selectedSource}-${selectedTarget}`;
+
+		let tickerClose;
+		let side;
+		let pair;
+		if (tickers[pairName]) {
+			const { close } = tickers[pairName];
+			tickerClose = close;
+			side = 'buy';
+			pair = pairName;
+		} else if (tickers[reversePairName]) {
+			const { close } = tickers[reversePairName];
+			tickerClose = 1 / close;
+			side = 'sell';
+			pair = reversePairName;
+		}
+
+		this.setState({
+			tickerClose,
+			side,
+			selectedTarget,
+			targetAmount: undefined,
+			sourceAmount: undefined,
+		});
+		this.goToPair(pair);
 	};
 
-	// onReviewQuickTrade = () => {
-	// 	if (this.props.token) {
-	// 		this.goTo('quick-trade')();
-	// 	} else {
-	// 		this.goTo('login')();
-	// 	}
-	// };
+	onSelectSource = (selectedSource) => {
+		const { tickers } = this.props;
+
+		const targetOptions = this.getTargetOptions(selectedSource);
+		const selectedTarget = targetOptions[0];
+		const pairName = `${selectedTarget}-${selectedSource}`;
+		const reversePairName = `${selectedSource}-${selectedTarget}`;
+
+		let tickerClose;
+		let side;
+		let pair;
+		if (tickers[pairName]) {
+			const { close } = tickers[pairName];
+			tickerClose = close;
+			side = 'buy';
+			pair = pairName;
+		} else if (tickers[reversePairName]) {
+			const { close } = tickers[reversePairName];
+			tickerClose = 1 / close;
+			side = 'sell';
+			pair = reversePairName;
+		}
 
-	onChangeLanguage = (language) => () => {
-		return this.props.changeLanguage(language);
+		this.setState({
+			tickerClose,
+			side,
+			selectedSource,
+			selectedTarget,
+			targetOptions: targetOptions,
+			targetAmount: undefined,
+			sourceAmount: undefined,
+		});
+		this.goToPair(pair);
 	};
 
-	onLogout = () => this.props.logout('');
+	getTargetOptions = (sourceKey) => {
+		const { sourceOptions, pairs } = this.props;
+
+		return sourceOptions.filter(
+			(key) => pairs[`${key}-${sourceKey}`] || pairs[`${sourceKey}-${key}`]
+		);
+	};
+
+	onChangeTargetAmount = (targetAmount) => {
+		const { tickerClose } = this.state;
+		const sourceAmount = math.round(targetAmount * tickerClose, DECIMALS);
+
+		this.setState({
+			targetAmount,
+			sourceAmount,
+		});
+	};
+
+	onChangeSourceAmount = (sourceAmount) => {
+		const { tickerClose } = this.state;
+		const targetAmount = math.round(sourceAmount / tickerClose, DECIMALS);
+
+		this.setState({
+			sourceAmount,
+			targetAmount,
+		});
+	};
+
+	forwardSourceError = (sourceError) => {
+		this.setState({ sourceError });
+	};
+
+	forwardTargetError = (targetError) => {
+		this.setState({ targetError });
+	};
+
+	goToPair = (pair) => {
+		const { changePair } = this.props;
+		changePair(pair);
+	};
+
+	renderIcon = () => {
+		const { icons: ICONS } = this.props;
+		return (
+			<div className={classnames('app_bar-icon', 'text-uppercase', 'h-100')}>
+				<div className="d-flex h-100">
+					<div className="'h-100'">
+						<Image
+							iconId="EXCHANGE_LOGO"
+							icon={ICONS['EXCHANGE_LOGO']}
+							wrapperClassName="app_bar-icon-logo wide-logo h-100"
+						/>
+					</div>
+					<EditWrapper iconId="EXCHANGE_LOGO" position={[-5, 5]} />
+				</div>
+			</div>
+		);
+	};
+
+	renderButtonSection = () => {
+		return (
+			<div className="d-flex align-items-center buttons-section-header">
+				<ButtonLink
+					link={'/login'}
+					type="button"
+					label={STRINGS['LOGIN_TEXT']}
+					className="main-section_button_invert home_header_button"
+				/>
+				<div style={{ width: '0.75rem' }} />
+				<ButtonLink
+					link={'/signup'}
+					type="button"
+					label={STRINGS['SIGNUP_TEXT']}
+					className="main-section_button home_header_button"
+				/>
+			</div>
+		);
+	};
+
+	renderAccountButton = () => {
+		const { user } = this.props;
+		return (
+			<div className="pointer" onClick={this.goTo('/account')}>
+				{user.email}
+			</div>
+		);
+	};
 
 	render() {
 		const {
-			token,
-			verifyToken,
-			pair,
 			// symbol,
 			// quickTradeData,
 			// requestQuickTrade,
-			activeLanguage,
-			router,
-			activeTheme,
-			constants = {},
-			icons: ICONS = {},
+			sections,
 		} = this.props;
-		const { style } = this.state;
+
 		return (
-			<div
-				className={classnames(
-					'app_container',
-					'home_container',
-					'app_background',
-					getClasesForLanguage(activeLanguage),
-					getThemeClass(activeTheme),
-					{
-						'layout-mobile': isMobile,
-						'layout-desktop': isBrowser,
-					}
-				)}
-				style={{ background: `url(${ICONS['EXCHANGE_BOARDING_IMAGE']})` }}
-			>
-				<EventListener target="window" onResize={this.onResize} />
-				<AppBar
-					noBorders={true}
-					isHome={true}
-					token={token}
-					verifyToken={verifyToken}
-					router={router}
-					logout={this.onLogout}
-				/>
-				<div
-					className={classnames(
-						'app_container-content',
-						'home_container-content',
-						'flex-column',
-						'overflow-y'
-					)}
-					ref={this.setContainerRef}
-				>
-					<Section1
+			<div className="home_container">
+				{/*<div className="home-page_overlay" />*/}
+				<div>
+					<EditWrapper
+						sectionId="LANDING_PAGE_SECTIONS"
+						position={[0, 0]}
 						style={{
-							minHeight:
-								style.minHeight > MIN_HEIGHT ? style.minHeight : MIN_HEIGHT,
+							position: 'fixed',
+							right: '5px',
+							top: 'calc((100vh - 160px)/2)',
+							display: 'flex !important',
+							zIndex: 1,
 						}}
-						onClickScrollTo={this.onClickScrollTo(INFORMATION_INDEX)}
-						onClickLearnMore={this.onClickScrollTo(INFORMATION_INDEX)}
-						token={token}
 					/>
-					{/*<Section2
-						style={style}
-						onReviewQuickTrade={this.onReviewQuickTrade}
-						onRequestMarketValue={requestQuickTrade}
-						symbol={symbol}
-						quickTradeData={quickTradeData}
-					/>*/}
-					<Section3
-						style={style}
-						token={token}
-						onClickDemo={
-							pair ? this.goTo(`trade/${pair}`) : this.goTo('trade/add/tabs')
-						}
-					/>
-					<AppFooter
-						theme={activeTheme}
-						onChangeLanguage={this.onChangeLanguage}
-						activeLanguage={activeLanguage}
-						constants={constants}
+					<div className="home_app_bar d-flex justify-content-between align-items-center my-2 mx-3">
+						<div className="d-flex align-items-center justify-content-center h-100">
+							{this.renderIcon()}
+						</div>
+						{isLoggedIn()
+							? this.renderAccountButton()
+							: this.renderButtonSection()}
+					</div>
+					<EditWrapper
+						iconId="EXCHANGE_LANDING_PAGE"
+						style={{ position: 'absolute', right: 10 }}
 					/>
+					<div className="home-page_content">
+						<div className="mx-2 mb-3">{this.generateSections(sections)}</div>
+					</div>
 				</div>
 			</div>
 		);
 	}
 }
 
-const mapStateToProps = (store) => ({
-	pair: store.app.pair,
-	token: store.auth.token,
-	verifyToken: store.auth.verifyToken,
-	// estimatedValue: 100,
-	// symbol: store.orderbook.symbol,
-	// quickTradeData: store.orderbook.quickTrade,
-	activeLanguage: store.app.language,
-	info: store.app.info,
-	activeTheme: store.app.theme,
-	constants: store.app.constants,
-});
+const getSourceOptions = (pairs = {}) => {
+	const coins = [];
+	Object.entries(pairs).forEach(([, { pair_base, pair_2 }]) => {
+		coins.push(pair_base);
+		coins.push(pair_2);
+	});
+
+	return unique(coins);
+};
+
+const mapStateToProps = (store) => {
+	const pair = store.app.pair;
+	const pairData = store.app.pairs[pair] || {};
+	const sourceOptions = getSourceOptions(store.app.pairs);
+	const qtlimits = QuickTradeLimitsSelector(store);
+
+	return {
+		sourceOptions,
+		pair,
+		pairData,
+		pairs: store.app.pairs,
+		coins: store.app.coins,
+		// estimatedValue: 100,
+		// symbol: store.orderbook.symbol,
+		// quickTradeData: store.orderbook.quickTrade,
+		activeLanguage: store.app.language,
+		info: store.app.info,
+		activeTheme: store.app.theme,
+		constants: store.app.constants,
+		tickers: store.app.tickers,
+		orderLimits: qtlimits,
+		user: store.user,
+		settings: store.user.settings,
+		fetchingAuth: store.auth.fetching,
+		isReady: store.app.isReady,
+	};
+};
 
 const mapDispatchToProps = (dispatch) => ({
 	// requestQuickTrade: bindActionCreators(requestQuickTrade, dispatch),
+	changePair: bindActionCreators(changePair, dispatch),
 	changeLanguage: bindActionCreators(setLanguage, dispatch),
 	logout: bindActionCreators(logout, dispatch),
+	getTickers: bindActionCreators(getTickers, dispatch),
 	getExchangeInfo: bindActionCreators(getExchangeInfo, dispatch),
 });
 
diff --git a/web/src/containers/Home/old_index.js b/web/src/containers/Home/old_index.js
new file mode 100644
index 0000000000..03f6cb310c
--- /dev/null
+++ b/web/src/containers/Home/old_index.js
@@ -0,0 +1,188 @@
+import React, { Component } from 'react';
+import classnames from 'classnames';
+import { connect } from 'react-redux';
+import EventListener from 'react-event-listener';
+import { bindActionCreators } from 'redux';
+import { isBrowser, isMobile } from 'react-device-detect';
+
+import { AppBar, AppFooter } from '../../components';
+// import { requestQuickTrade } from '../../actions/orderbookAction';
+import { setLanguage, getExchangeInfo } from '../../actions/appActions';
+import { logout } from '../../actions/authAction';
+import { getClasesForLanguage } from '../../utils/string';
+import { getThemeClass } from '../../utils/theme';
+
+import Section1 from './Section1';
+// import Section2 from './Section2';
+import Section3 from './Section3';
+import withConfig from 'components/ConfigProvider/withConfig';
+
+const INFORMATION_INDEX = 1;
+const MIN_HEIGHT = 450;
+
+class Home extends Component {
+	state = {
+		height: 0,
+		style: {
+			minHeight: MIN_HEIGHT,
+		},
+	};
+
+	componentDidMount() {
+		this.props.getExchangeInfo();
+	}
+
+	setContainerRef = (el) => {
+		if (el) {
+			this.container = el;
+			this.onResize();
+		}
+	};
+
+	onResize = () => {
+		if (this.container) {
+			const height = window.innerHeight - 45;
+			this.setState({
+				style: {
+					minHeight: height,
+					// maxHeight: height,
+				},
+				height,
+			});
+			// this.onClickScrollTo(0)();
+		}
+	};
+
+	onClickScrollTo = (children = 0) => () => {
+		if (this.container && typeof children === 'number') {
+			const sections = this.container.children;
+			if (children < sections.length) {
+				sections[children].scrollIntoView({
+					behavior: 'smooth',
+				});
+			}
+		}
+	};
+
+	goTo = (path) => () => {
+		this.props.router.push(path);
+	};
+
+	// onReviewQuickTrade = () => {
+	// 	if (this.props.token) {
+	// 		this.goTo('quick-trade')();
+	// 	} else {
+	// 		this.goTo('login')();
+	// 	}
+	// };
+
+	onChangeLanguage = (language) => () => {
+		return this.props.changeLanguage(language);
+	};
+
+	onLogout = () => this.props.logout('');
+
+	render() {
+		const {
+			token,
+			verifyToken,
+			pair,
+			// symbol,
+			// quickTradeData,
+			// requestQuickTrade,
+			activeLanguage,
+			router,
+			activeTheme,
+			constants = {},
+			icons: ICONS = {},
+		} = this.props;
+		const { style } = this.state;
+		return (
+			<div
+				className={classnames(
+					'app_container',
+					'home_container',
+					'app_background',
+					getClasesForLanguage(activeLanguage),
+					getThemeClass(activeTheme),
+					{
+						'layout-mobile': isMobile,
+						'layout-desktop': isBrowser,
+					}
+				)}
+				style={{ background: `url(${ICONS['EXCHANGE_BOARDING_IMAGE']})` }}
+			>
+				<EventListener target="window" onResize={this.onResize} />
+				<AppBar
+					noBorders={true}
+					isHome={true}
+					token={token}
+					verifyToken={verifyToken}
+					router={router}
+					logout={this.onLogout}
+				/>
+				<div
+					className={classnames(
+						'app_container-content',
+						'home_container-content',
+						'flex-column',
+						'overflow-y'
+					)}
+					ref={this.setContainerRef}
+				>
+					<Section1
+						style={{
+							minHeight:
+								style.minHeight > MIN_HEIGHT ? style.minHeight : MIN_HEIGHT,
+						}}
+						onClickScrollTo={this.onClickScrollTo(INFORMATION_INDEX)}
+						onClickLearnMore={this.onClickScrollTo(INFORMATION_INDEX)}
+						token={token}
+					/>
+					{/*<Section2
+						style={style}
+						onReviewQuickTrade={this.onReviewQuickTrade}
+						onRequestMarketValue={requestQuickTrade}
+						symbol={symbol}
+						quickTradeData={quickTradeData}
+					/>*/}
+					<Section3
+						style={style}
+						token={token}
+						onClickDemo={
+							pair ? this.goTo(`trade/${pair}`) : this.goTo('trade/add/tabs')
+						}
+					/>
+					<AppFooter
+						theme={activeTheme}
+						onChangeLanguage={this.onChangeLanguage}
+						activeLanguage={activeLanguage}
+						constants={constants}
+					/>
+				</div>
+			</div>
+		);
+	}
+}
+
+const mapStateToProps = (store) => ({
+	pair: store.app.pair,
+	token: store.auth.token,
+	verifyToken: store.auth.verifyToken,
+	// estimatedValue: 100,
+	// symbol: store.orderbook.symbol,
+	// quickTradeData: store.orderbook.quickTrade,
+	activeLanguage: store.app.language,
+	info: store.app.info,
+	activeTheme: store.app.theme,
+	constants: store.app.constants,
+});
+
+const mapDispatchToProps = (dispatch) => ({
+	// requestQuickTrade: bindActionCreators(requestQuickTrade, dispatch),
+	changeLanguage: bindActionCreators(setLanguage, dispatch),
+	logout: bindActionCreators(logout, dispatch),
+	getExchangeInfo: bindActionCreators(getExchangeInfo, dispatch),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(withConfig(Home));
diff --git a/web/src/containers/OperatorControls/_OperatorControls.scss b/web/src/containers/OperatorControls/_OperatorControls.scss
index 46ef1db4c8..b3bba631e1 100644
--- a/web/src/containers/OperatorControls/_OperatorControls.scss
+++ b/web/src/containers/OperatorControls/_OperatorControls.scss
@@ -1,6 +1,7 @@
 $operator-controls__panel-main-color: #0000ff;
 $operator-controls__panel-text-color: #ffffff;
-$operator-controls__panel-text-color-inactive: #ffffff80;
+$operator-controls__panel-text-color-inactive: #ffffffcc;
+$operator-controls__panel-text-color-pale-inactive: #ffffff80;
 $operator-controls__panel-border-color: #a7a7a7;
 
 @import './components/ImageUpload';
@@ -36,7 +37,7 @@ $operator-controls__panel-border-color: #a7a7a7;
 	align-items: center;
 
 	&.disabled {
-		color: $operator-controls__panel-text-color-inactive;
+		color: $operator-controls__panel-text-color-pale-inactive;
 		cursor: not-allowed;
 		height: 31px;
 		transform: translateY(0);
@@ -50,6 +51,49 @@ $operator-controls__panel-border-color: #a7a7a7;
 	width: 100%;
 	border-top: solid $operator-controls__panel-border-color 1px;
 	background-color: $operator-controls__panel-main-color;
+
+	&.deep {
+		height: 306px;
+	}
+
+	.ant-tabs {
+		transform: translateY(-36px);
+	}
+
+	.ant-tabs-content {
+		height: 100% !important;
+	}
+
+	textarea {
+		border: none;
+		padding: 0 46px;
+		&.ant-input {
+			font-weight: 600;
+		}
+	}
+
+	.ant-tabs-nav-wrap {
+		padding-left: 46px;
+	}
+
+	.ant-tabs-tab {
+		color: $operator-controls__panel-text-color-inactive;
+	}
+
+	.ant-tabs-tab-active {
+		color: $operator-controls__panel-text-color;
+		.ant-tabs-tab-btn {
+			font-weight: bold;
+		}
+	}
+
+	.ant-tabs-ink-bar {
+		background: $operator-controls__panel-text-color;
+	}
+
+	.ant-tabs-top > .ant-tabs-nav::before {
+		border-color: $operator-controls__panel-text-color-inactive;
+	}
 }
 
 .operator-controls__panel-list {
@@ -76,6 +120,13 @@ $operator-controls__panel-border-color: #a7a7a7;
 	width: 145px;
 	margin-right: 37px;
 	text-transform: uppercase;
+	&.small {
+		height: 37px;
+		width: 99px;
+		margin-top: 8px;
+		margin-right: 12px;
+		font-size: 1rem;
+	}
 }
 
 .operator-controls__save-button {
@@ -181,15 +232,15 @@ $operator-controls__panel-border-color: #a7a7a7;
 	.ant-divider-horizontal,
 	.ant-divider,
 	.ant-divider-inner-text {
-		color: $operator-controls__panel-text-color-inactive !important;
+		color: $operator-controls__panel-text-color-pale-inactive !important;
 		font-size: small !important;
 		font-weight: 600;
-		border-color: $operator-controls__panel-text-color-inactive !important;
+		border-color: $operator-controls__panel-text-color-pale-inactive !important;
 	}
 
 	.ant-divider-with-text::after,
 	.ant-divider-with-text::before {
-		border-color: $operator-controls__panel-text-color-inactive !important;
+		border-color: $operator-controls__panel-text-color-pale-inactive !important;
 	}
 
 	.ant-divider-inner-text {
@@ -312,3 +363,16 @@ $operator-controls__panel-border-color: #a7a7a7;
 		color: white;
 	}
 }
+
+.sortable_section {
+	td {
+		cursor: grab;
+		&:active {
+			cursor: grabbing;
+		}
+	}
+	cursor: grab;
+	&:active {
+		cursor: grabbing;
+	}
+}
diff --git a/web/src/containers/OperatorControls/components/AddSection.js b/web/src/containers/OperatorControls/components/AddSection.js
new file mode 100644
index 0000000000..59d404d30a
--- /dev/null
+++ b/web/src/containers/OperatorControls/components/AddSection.js
@@ -0,0 +1,86 @@
+import React, { Component } from 'react';
+import Modal from 'components/Dialog/DesktopDialog';
+import { Button, Checkbox } from 'antd';
+
+class SectionsModal extends Component {
+	constructor(props) {
+		super(props);
+		const { sections } = this.props;
+		this.state = {
+			sections,
+		};
+	}
+
+	toggleSection = ({ target: { name, checked: is_active } }) => {
+		this.setState((prevState) => ({
+			...prevState,
+			sections: {
+				...prevState.sections,
+				[name]: {
+					...prevState.sections[name],
+					is_active,
+				},
+			},
+		}));
+	};
+
+	render() {
+		const { isOpen, onCloseDialog, onSave } = this.props;
+
+		const { sections } = this.state;
+
+		return (
+			<Modal
+				isOpen={isOpen}
+				label="operator-controls-modal"
+				className="operator-controls__modal"
+				disableTheme={true}
+				onCloseDialog={onCloseDialog}
+				shouldCloseOnOverlayClick={true}
+				showCloseText={true}
+				bodyOpenClassName="operator-controls__modal-open"
+			>
+				<div className="operator-controls__all-strings-header">
+					<div className="operator-controls__modal-title">Add section</div>
+				</div>
+
+				<div style={{ width: '40rem' }}>Add a section to your home page.</div>
+
+				<table className="mt-4" style={{ fontSize: '1rem' }}>
+					<thead>
+						<tr>
+							<th style={{ width: '5rem' }}>Select</th>
+							<th>Section</th>
+						</tr>
+					</thead>
+					<tbody>
+						{Object.entries(sections).map(([key, { name, is_active }]) => (
+							<tr key={`item-${key}`}>
+								<td>
+									<Checkbox
+										checked={is_active}
+										name={key}
+										onChange={this.toggleSection}
+									/>
+								</td>
+								<td>{name}</td>
+							</tr>
+						))}
+					</tbody>
+				</table>
+
+				<div className="d-flex justify-content-end pt-4 mt-4">
+					<Button
+						type="primary"
+						className="operator-controls__save-button confirm"
+						onClick={() => onSave(sections)}
+					>
+						Confirm
+					</Button>
+				</div>
+			</Modal>
+		);
+	}
+}
+
+export default SectionsModal;
diff --git a/web/src/containers/OperatorControls/components/Sections.js b/web/src/containers/OperatorControls/components/Sections.js
new file mode 100644
index 0000000000..03710d5500
--- /dev/null
+++ b/web/src/containers/OperatorControls/components/Sections.js
@@ -0,0 +1,133 @@
+import React, { Component } from 'react';
+import { SortableContainer, SortableElement } from 'react-sortable-hoc';
+import arrayMove from 'array-move';
+import Modal from 'components/Dialog/DesktopDialog';
+import { Button } from 'antd';
+import { MenuOutlined } from '@ant-design/icons';
+
+const SortableItem = SortableElement(({ section: { name }, order }) => (
+	<tr className="sortable_section">
+		<td>{order + 1}</td>
+		<td>{name}</td>
+		<td>
+			<MenuOutlined />
+		</td>
+	</tr>
+));
+
+const SortableList = SortableContainer(({ items }) => {
+	return (
+		<table className="mt-4" style={{ fontSize: '1rem', width: '30rem' }}>
+			<thead>
+				<tr>
+					<th>Order</th>
+					<th>Section</th>
+					<th>Move</th>
+				</tr>
+			</thead>
+			<tbody>
+				{items.map(({ key, ...section }, index) => (
+					<SortableItem
+						key={`item-${key}`}
+						index={index}
+						section={section}
+						order={index}
+					/>
+				))}
+			</tbody>
+		</table>
+	);
+});
+
+class SectionsModal extends Component {
+	constructor(props) {
+		super(props);
+		const { sections } = this.props;
+		const activeSectionsArray = Object.entries(sections)
+			.filter(([_, { is_active }]) => is_active)
+			.sort(
+				([_, { order: order_a }], [__, { order: order_b }]) => order_a - order_b
+			)
+			.map(([key, section], index) => ({ key, ...section }));
+
+		const inactiveSectionsArray = Object.entries(sections)
+			.filter(([_, { is_active }]) => !is_active)
+			.map(([key, section], index) => ({ key, ...section }));
+
+		this.state = {
+			items: activeSectionsArray,
+			inactiveItems: inactiveSectionsArray,
+		};
+	}
+
+	onSortEnd = ({ oldIndex, newIndex }) => {
+		this.setState(({ items }) => ({
+			items: arrayMove(items, oldIndex, newIndex),
+		}));
+	};
+
+	confirmSectionsOrder = () => {
+		const { onSave } = this.props;
+		const { items, inactiveItems } = this.state;
+		const sections = {};
+		[...items, ...inactiveItems].forEach(({ key, ...rest }, order) => {
+			sections[key] = {
+				...rest,
+				order,
+			};
+		});
+
+		onSave(sections);
+	};
+
+	render() {
+		const { isOpen, onCloseDialog, onLinkClick } = this.props;
+		const { items } = this.state;
+
+		return (
+			<Modal
+				isOpen={isOpen}
+				label="operator-controls-modal"
+				className="operator-controls__modal"
+				disableTheme={true}
+				onCloseDialog={onCloseDialog}
+				shouldCloseOnOverlayClick={true}
+				showCloseText={true}
+				bodyOpenClassName="operator-controls__modal-open"
+			>
+				<div className="operator-controls__all-strings-header">
+					<div className="operator-controls__modal-title">Sections</div>
+				</div>
+
+				<div style={{ width: '40rem' }}>
+					Add and remove sections on your home page. Drag and drop the sections
+					below to change order displayed on your home page.
+				</div>
+
+				<div
+					className="underline-text pointer pl-2 pt-4"
+					onClick={() => {
+						onCloseDialog();
+						onLinkClick();
+					}}
+				>
+					Add/remove section
+				</div>
+
+				<SortableList items={items} onSortEnd={this.onSortEnd} />
+
+				<div className="d-flex justify-content-end pt-4 mt-4">
+					<Button
+						type="primary"
+						className="operator-controls__save-button confirm"
+						onClick={this.confirmSectionsOrder}
+					>
+						Confirm
+					</Button>
+				</div>
+			</Modal>
+		);
+	}
+}
+
+export default SectionsModal;
diff --git a/web/src/containers/OperatorControls/index.js b/web/src/containers/OperatorControls/index.js
index 21fc1471ab..627d10a186 100644
--- a/web/src/containers/OperatorControls/index.js
+++ b/web/src/containers/OperatorControls/index.js
@@ -1,17 +1,18 @@
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { connect } from 'react-redux';
 import { Link } from 'react-router';
 import { bindActionCreators } from 'redux';
+import isEqual from 'lodash.isequal';
 import debounce from 'lodash.debounce';
 import classnames from 'classnames';
 import merge from 'lodash.merge';
 import { EditFilled } from '@ant-design/icons';
 import { getStringByKey, getAllStrings } from 'utils/string';
 import Modal from 'components/Dialog/DesktopDialog';
-import { Input, Button, Divider } from 'antd';
+import { Input, Button, Divider, Tabs, message } from 'antd';
 import { DeleteOutlined, SettingFilled, KeyOutlined } from '@ant-design/icons';
 import { initializeStrings, getValidLanguages } from 'utils/initialize';
-import { publish } from 'actions/operatorActions';
+import { publish, updateInjectedHTML } from 'actions/operatorActions';
 import LANGUAGES from 'config/languages';
 import { content as CONTENT } from 'config/localizedStrings';
 import AllStringsModal from './components/AllStringsModal';
@@ -21,6 +22,8 @@ import ThemeSettings from './components/ThemeSettings';
 import AddTheme from './components/AddTheme';
 import AllIconsModal from './components/AllIconsModal';
 import UploadIcon from './components/UploadIcon';
+import SectionsModal from './components/Sections';
+import AddSection from './components/AddSection';
 import withConfig from 'components/ConfigProvider/withConfig';
 import { setLanguage } from 'actions/appActions';
 import {
@@ -30,12 +33,17 @@ import {
 } from 'utils/string';
 import { filterThemes } from 'utils/color';
 import { getIconByKey, getAllIconsArray } from 'utils/icon';
+import withEdit from 'components/EditProvider/withEdit';
+
+const { TabPane } = Tabs;
+const { TextArea } = Input;
+const TAB_KEYS = ['head', 'body'];
 
 class OperatorControls extends Component {
 	constructor(props) {
 		super(props);
 
-		const { themeOptions } = this.props;
+		const { themeOptions, injected_html = {} } = this.props;
 
 		const strings = localStorage.getItem('strings') || '{}';
 		const icons = localStorage.getItem('icons') || '{}';
@@ -70,10 +78,13 @@ class OperatorControls extends Component {
 			isStringsSettingsOpen: false,
 			isAddLanguageModalOpen: false,
 			isExitConfirmationOpen: false,
+			isExitConsoleConfirmationOpen: false,
 			isPublishConfirmationOpen: false,
 			isUploadIconOpen: false,
 			isThemeSettingsOpen: false,
 			isAddThemeOpen: false,
+			isSectionsModalOpen: false,
+			isAddSectionOpen: false,
 			selectedTheme: '',
 			iconsOverwrites,
 			colorOverwrites,
@@ -81,6 +92,7 @@ class OperatorControls extends Component {
 			isAllIconsModalOpen: false,
 			selectedThemes,
 			allIconsArray: [],
+			injected_html,
 		};
 	}
 
@@ -186,10 +198,10 @@ class OperatorControls extends Component {
 
 	handleEditButton = ({ target: { dataset = {} } }, source) => {
 		const { isEditModalOpen, isUploadIconOpen } = this.state;
-		const { editMode } = this.props;
-		const { stringId, iconId } = dataset;
+		const { isEditMode } = this.props;
+		const { stringId, iconId, sectionId } = dataset;
 
-		if (editMode && !isEditModalOpen && !isUploadIconOpen) {
+		if (isEditMode && !isEditModalOpen && !isUploadIconOpen) {
 			const string_ids_array = stringId ? stringId.split(',') : [];
 			const icon_ids_array = iconId ? iconId.split(',') : [];
 
@@ -208,6 +220,8 @@ class OperatorControls extends Component {
 						}
 					} else if (iconId) {
 						this.openUploadIcon();
+					} else if (sectionId) {
+						this.openSectionsModal();
 					}
 				}
 			);
@@ -285,11 +299,17 @@ class OperatorControls extends Component {
 
 		languageKeys.forEach((lang) => {
 			Object.entries(saveData[lang]).forEach(([key, string]) => {
+				const isEnglish = lang === 'en';
+				const isUnchangedString = string === getStringByKey(key, lang, CONTENT);
+				const isEqualToDefault = string === getStringByKey(key, 'en', CONTENT);
+				const hasInvalidPlaceholders =
+					string && !this.validateString(string, key);
+				const hasDeletedEnglish = !string && isEnglish;
 				if (
-					string === getStringByKey(key, lang, CONTENT) ||
-					string === getStringByKey(key, 'en', CONTENT) ||
-					!string ||
-					!this.validateString(key, lang)
+					isUnchangedString ||
+					isEqualToDefault ||
+					hasInvalidPlaceholders ||
+					hasDeletedEnglish
 				) {
 					delete saveData[lang][key];
 				}
@@ -320,39 +340,57 @@ class OperatorControls extends Component {
 		return matches ? matches.length : 0;
 	};
 
-	validateString = (key, lang) => {
-		const { editData } = this.state;
-		const defaultPlaceholders = this.countPlaceholders(
-			getStringByKey(key, lang, CONTENT)
+	validateString = (string, key) => {
+		const benchmarkLanguage = 'en';
+		const benchmarkPlaceholders = this.countPlaceholders(
+			getStringByKey(key, benchmarkLanguage, CONTENT)
 		);
-		const placeholders = this.countPlaceholders(editData[lang][key]);
+		const placeholders = this.countPlaceholders(string);
 
-		return defaultPlaceholders === placeholders;
+		return placeholders === benchmarkPlaceholders;
 	};
 
 	handlePublish = () => {
-		const {
-			overwrites,
-			iconsOverwrites: icons,
-			colorOverwrites,
-			languageKeys,
-		} = this.state;
+		const { isEditMode, isInjectMode } = this.props;
+
+		if (isEditMode) {
+			const {
+				overwrites,
+				iconsOverwrites: icons,
+				colorOverwrites,
+				languageKeys,
+			} = this.state;
 
-		const { defaults } = this.props;
+			const { defaults, sections } = this.props;
 
-		const valid_languages = languageKeys.join();
-		const strings = filterOverwrites(overwrites);
-		const color = filterThemes(colorOverwrites);
+			const valid_languages = languageKeys.join();
+			const strings = filterOverwrites(overwrites);
+			const color = filterThemes(colorOverwrites);
 
-		const configs = {
-			defaults,
-			color,
-			strings,
-			icons,
-			valid_languages,
-		};
+			const configs = {
+				defaults,
+				color,
+				strings,
+				icons,
+				valid_languages,
+				sections,
+			};
 
-		publish(configs).then(this.reload);
+			publish(configs)
+				.then(this.reload)
+				.catch((err) => {
+					const error = err && err.data ? err.data.message : err.message;
+					message.error(error);
+				});
+		} else if (isInjectMode) {
+			const { injected_html } = this.state;
+			updateInjectedHTML(injected_html)
+				.then(this.reload)
+				.catch((err) => {
+					const error = err && err.data ? err.data.message : err.message;
+					message.error(error);
+				});
+		}
 	};
 
 	reload = () => window.location.reload(false);
@@ -364,18 +402,32 @@ class OperatorControls extends Component {
 	};
 
 	toggleEditMode = () => {
-		const { onChangeEditMode, editMode } = this.props;
-		if (!editMode) {
-			onChangeEditMode();
-		} else {
-			this.openExitConfirmationModal();
+		const { handleEditMode, isEditMode, isInjectMode } = this.props;
+		if (!isInjectMode) {
+			if (!isEditMode) {
+				handleEditMode();
+			} else {
+				this.openExitConfirmationModal();
+			}
+		}
+	};
+
+	toggleInjectMode = () => {
+		const { handleInjectMode, isEditMode, isInjectMode } = this.props;
+		const { injected_html } = this.state;
+		if (!isEditMode) {
+			if (!isInjectMode || isEqual(injected_html, this.props.injected_html)) {
+				handleInjectMode();
+			} else {
+				this.openExitConsoleConfirmationModal();
+			}
 		}
 	};
 
 	exitEditMode = () => {
 		const { isPublishEnabled } = this.state;
-		const { onChangeEditMode } = this.props;
-		onChangeEditMode();
+		const { handleEditMode } = this.props;
+		handleEditMode();
 		this.closeExitConfirmationModal();
 
 		if (isPublishEnabled) {
@@ -383,6 +435,14 @@ class OperatorControls extends Component {
 		}
 	};
 
+	exitInjectMode = () => {
+		const { handleInjectMode, injected_html } = this.props;
+		this.setState({ injected_html }, () => {
+			handleInjectMode();
+			this.closeExitConsoleConfirmationModal();
+		});
+	};
+
 	getLanguageLabel = (key) => {
 		const { label } = LANGUAGES.find(({ value }) => value === key);
 		return label;
@@ -588,6 +648,14 @@ class OperatorControls extends Component {
 		this.setState({ isExitConfirmationOpen: false });
 	};
 
+	openExitConsoleConfirmationModal = () => {
+		this.setState({ isExitConsoleConfirmationOpen: true });
+	};
+
+	closeExitConsoleConfirmationModal = () => {
+		this.setState({ isExitConsoleConfirmationOpen: false });
+	};
+
 	openPublishConfirmationModal = () => {
 		this.setState({ isPublishConfirmationOpen: true });
 	};
@@ -735,6 +803,57 @@ class OperatorControls extends Component {
 		);
 	};
 
+	updateSectionsOrder = (sections) => {
+		const { updateSections } = this.props;
+		updateSections(sections);
+		this.enablePublish();
+		this.closeSectionsModal();
+	};
+
+	updateSections = (sections) => {
+		const { updateSections } = this.props;
+		updateSections(sections);
+		this.enablePublish();
+		this.closeAddSectionModal();
+	};
+
+	openSectionsModal = () => {
+		this.setState({
+			isSectionsModalOpen: true,
+		});
+	};
+
+	closeSectionsModal = () => {
+		this.setState({
+			isSectionsModalOpen: false,
+		});
+	};
+
+	openAddSectionModal = () => {
+		this.setState({
+			isAddSectionOpen: true,
+		});
+	};
+
+	closeAddSectionModal = () => {
+		this.setState(
+			{
+				isAddSectionOpen: false,
+			},
+			this.openSectionsModal
+		);
+	};
+
+	handleTextAreaChange = ({ target: { name, value } }) => {
+		this.setState((prevState) => ({
+			...prevState,
+			injected_html: {
+				...prevState.injected_html,
+				[name]: value,
+			},
+		}));
+	};
+
 	render() {
 		const {
 			isPublishEnabled,
@@ -750,6 +869,7 @@ class OperatorControls extends Component {
 			selectedLanguages,
 			isStringsSettingsOpen,
 			isExitConfirmationOpen,
+			isExitConsoleConfirmationOpen,
 			isAddLanguageModalOpen,
 			isPublishConfirmationOpen,
 			iconsEditData,
@@ -762,77 +882,143 @@ class OperatorControls extends Component {
 			selectedThemes,
 			iconSearchValue,
 			iconSearchResults,
+			isSectionsModalOpen,
+			isAddSectionOpen,
+			injected_html,
 		} = this.state;
-		const { editMode, color: themes, themeOptions } = this.props;
+		const {
+			isEditMode,
+			color: themes,
+			themeOptions,
+			sections,
+			isInjectMode,
+		} = this.props;
 
 		return (
 			<div
-				className={classnames('operator-controls__wrapper', { open: editMode })}
+				className={classnames('operator-controls__wrapper', {
+					open: isEditMode || isInjectMode,
+				})}
 			>
 				<div className="operator-controls__buttons-wrapper">
 					<div
-						className="operator-controls__button"
+						className={classnames('operator-controls__button', {
+							disabled: isInjectMode,
+						})}
 						onClick={this.toggleEditMode}
 					>
 						<EditFilled />
 						<span className="pl-1">
-							{`${editMode ? 'Exit' : 'Enter'} edit mode`}
+							{`${isEditMode ? 'Exit' : 'Enter'} edit mode`}
 						</span>
 					</div>
 					<div
 						className={classnames('operator-controls__button', {
-							disabled: editMode,
+							disabled: isEditMode || isInjectMode,
 						})}
 					>
-						{!editMode && (
+						{!isEditMode && !isInjectMode ? (
 							<Link to="/admin">
 								<SettingFilled />
 								<span className="pl-1">Operator controls</span>
 							</Link>
-						)}
-						{editMode && (
+						) : (
 							<div>
 								<SettingFilled />
 								<span className="pl-1">Operator controls</span>
 							</div>
 						)}
 					</div>
+					<div
+						className={classnames('operator-controls__button', {
+							disabled: isEditMode,
+						})}
+						onClick={this.toggleInjectMode}
+					>
+						<span>{`</>`}</span>
+						<span className="pl-1">Console</span>
+					</div>
 				</div>
-				<div className="operator-controls__panel">
-					<div className="operator-controls__panel-list">
-						<div
-							className="operator-controls__panel-item"
-							onClick={this.openAllStringsModal}
-						>
-							All strings
-						</div>
-						<div
-							className="operator-controls__panel-item"
-							onClick={this.openThemeSettings}
-						>
-							Themes
-						</div>
-						<div
-							className="operator-controls__panel-item"
-							onClick={this.openAllIconsModal}
-						>
-							All graphics
+				<div
+					className={classnames('operator-controls__panel', {
+						deep: isInjectMode,
+					})}
+				>
+					{isEditMode && !isInjectMode && (
+						<Fragment>
+							<div className="operator-controls__panel-list">
+								<div
+									className="operator-controls__panel-item"
+									onClick={this.openAllStringsModal}
+								>
+									All strings
+								</div>
+								<div
+									className="operator-controls__panel-item"
+									onClick={this.openThemeSettings}
+								>
+									Themes
+								</div>
+								<div
+									className="operator-controls__panel-item"
+									onClick={this.openAllIconsModal}
+								>
+									All graphics
+								</div>
+							</div>
+							<div className="d-flex align-items-center">
+								<Button
+									type="primary"
+									onClick={this.openPublishConfirmationModal}
+									className="operator-controls__publish-button bold"
+									disabled={!isPublishEnabled}
+								>
+									Publish
+								</Button>
+							</div>
+						</Fragment>
+					)}
+					{isInjectMode && !isEditMode && (
+						<div className="w-100 h-100">
+							<div className="d-flex justify-content-end">
+								<div className="d-flex align-items-center">
+									<Button
+										type="primary"
+										onClick={this.openPublishConfirmationModal}
+										className="operator-controls__publish-button small bold"
+										disabled={isEqual(injected_html, this.props.injected_html)}
+										style={{ zIndex: 1 }}
+									>
+										Publish
+									</Button>
+								</div>
+							</div>
+							<Tabs className="w-100 h-100">
+								{TAB_KEYS.map((key) => {
+									const title = `${'<'}${key.toUpperCase()}${'>'}`;
+									const placeholder = `${'<'}!-- In this section you can insert any HTML code to the ${title} of your website --${'>'}`;
+									return (
+										<TabPane className="w-100 h-100" tab={title} key={key}>
+											<div className="w-100 h-100">
+												<TextArea
+													name={key}
+													placeholder={placeholder}
+													onChange={this.handleTextAreaChange}
+													value={injected_html[key]}
+													style={{ resize: 'none' }}
+													className="w-100 h-100"
+												/>
+											</div>
+										</TabPane>
+									);
+								})}
+							</Tabs>
 						</div>
-					</div>
-					<div className="d-flex align-items-center">
-						<Button
-							type="primary"
-							onClick={this.openPublishConfirmationModal}
-							className="operator-controls__publish-button bold"
-							disabled={!isPublishEnabled}
-						>
-							Publish
-						</Button>
-					</div>
+					)}
 				</div>
 
 				<Modal
-					isOpen={editMode && isEditModalOpen}
+					isOpen={isEditMode && isEditModalOpen}
 					label="operator-controls-modal"
 					className="operator-controls__modal"
 					disableTheme={true}
@@ -842,7 +1028,7 @@ class OperatorControls extends Component {
 					bodyOpenClassName="operator-controls__modal-open"
 				>
 					<div className="operator-controls__modal-title pb-3">Edit string</div>
-					{editMode &&
+					{isEditMode &&
 						isEditModalOpen &&
 						editableElementIds.map((key) => {
 							return (
@@ -904,7 +1090,7 @@ class OperatorControls extends Component {
 				</Modal>
 				{isAllIconsModalOpen && (
 					<AllIconsModal
-						isOpen={editMode && isAllIconsModalOpen}
+						isOpen={isEditMode && isAllIconsModalOpen}
 						icons={iconSearchResults}
 						onCloseDialog={this.closeAllIconsModal}
 						onSearch={this.handleIconSearch}
@@ -919,7 +1105,7 @@ class OperatorControls extends Component {
 				)}
 				{isAllStringsModalOpen && (
 					<AllStringsModal
-						isOpen={editMode && isAllStringsModalOpen}
+						isOpen={isEditMode && isAllStringsModalOpen}
 						strings={searchResults}
 						onCloseDialog={this.closeAllStringsModal}
 						onSearch={this.handleSearch}
@@ -932,7 +1118,7 @@ class OperatorControls extends Component {
 					/>
 				)}
 				<StringSettingsModal
-					isOpen={editMode && isStringsSettingsOpen}
+					isOpen={isEditMode && isStringsSettingsOpen}
 					onCloseDialog={this.closeStringSettingsModal}
 					languages={languageOptions}
 					onAddLanguageClick={this.openAddLanguageModal}
@@ -940,7 +1126,7 @@ class OperatorControls extends Component {
 					defaultLanguage={this.props.defaults.language}
 				/>
 				<AddLanguageModal
-					isOpen={editMode && isAddLanguageModalOpen}
+					isOpen={isEditMode && isAddLanguageModalOpen}
 					onCloseDialog={this.closeAddLanguageModal}
 					languages={LANGUAGES.filter(
 						({ value }) => !languageKeys.includes(value)
@@ -960,7 +1146,7 @@ class OperatorControls extends Component {
 				)}
 				{isThemeSettingsOpen && (
 					<ThemeSettings
-						isOpen={editMode && isThemeSettingsOpen}
+						isOpen={isEditMode && isThemeSettingsOpen}
 						onCloseDialog={this.closeThemeSettings}
 						themes={themeOptions}
 						onAddThemeClick={this.openAddTheme}
@@ -970,7 +1156,7 @@ class OperatorControls extends Component {
 				)}
 				{isAddThemeOpen && (
 					<AddTheme
-						isOpen={editMode && isAddThemeOpen}
+						isOpen={isEditMode && isAddThemeOpen}
 						onCloseDialog={this.closeAddTheme}
 						selectedTheme={selectedTheme}
 						themes={themes}
@@ -978,6 +1164,25 @@ class OperatorControls extends Component {
 					/>
 				)}
 
+				{isSectionsModalOpen && (
+					<SectionsModal
+						isOpen={isEditMode && isSectionsModalOpen}
+						onCloseDialog={this.closeSectionsModal}
+						sections={sections}
+						onSave={this.updateSectionsOrder}
+						onLinkClick={this.openAddSectionModal}
+					/>
+				)}
+
+				{isAddSectionOpen && (
+					<AddSection
+						isOpen={isEditMode && isAddSectionOpen}
+						onCloseDialog={this.closeAddSectionModal}
+						sections={sections}
+						onSave={this.updateSections}
+					/>
+				)}
+
 				<Modal
 					isOpen={isExitConfirmationOpen}
 					label="operator-controls-modal"
@@ -1012,6 +1217,39 @@ class OperatorControls extends Component {
 						</Button>
 					</footer>
 				</Modal>
+				<Modal
+					isOpen={isExitConsoleConfirmationOpen}
+					label="operator-controls-modal"
+					className="operator-controls__modal"
+					disableTheme={true}
+					onCloseDialog={this.closeExitConsoleConfirmationModal}
+					shouldCloseOnOverlayClick={true}
+					showCloseText={true}
+					bodyOpenClassName="operator-controls__modal-open"
+				>
+					<div className="operator-controls__modal-title">Exit</div>
+					<div className="pt-3" style={{ width: '292px' }}>
+						You are about to close the console with some unpublished changes.
+					</div>
+					<footer className="d-flex justify-content-end pt-4">
+						<Button
+							block
+							className="mr-1 bold"
+							onClick={this.closeExitConsoleConfirmationModal}
+						>
+							Cancel
+						</Button>
+						<Button
+							block
+							className="ml-1 bold"
+							type="primary"
+							onClick={this.exitInjectMode}
+							danger
+						>
+							Exit
+						</Button>
+					</footer>
+				</Modal>
 				<Modal
 					isOpen={isPublishConfirmationOpen}
 					label="operator-controls-modal"
@@ -1053,6 +1291,7 @@ class OperatorControls extends Component {
 
 const mapStateToProps = (state) => ({
 	activeLanguage: state.app.language,
+	injected_html: state.app.injected_html,
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -1062,4 +1301,4 @@ const mapDispatchToProps = (dispatch) => ({
 export default connect(
 	mapStateToProps,
 	mapDispatchToProps
-)(withConfig(OperatorControls));
+)(withEdit(withConfig(OperatorControls)));
diff --git a/web/src/containers/QuickTrade/_QuickTrade.scss b/web/src/containers/QuickTrade/_QuickTrade.scss
index 30882d078b..cce12fc9e1 100644
--- a/web/src/containers/QuickTrade/_QuickTrade.scss
+++ b/web/src/containers/QuickTrade/_QuickTrade.scss
@@ -49,9 +49,11 @@
 		min-height: $max-content-height-double-bar-mobile;
 		max-height: $max-content-height-double-bar-mobile;
 		.quick_trade-wrapper {
-			flex: 1;
-			min-width: 100vw;
+			flex: 1 1;
+			min-width: 95vw;
 			max-width: 100vw;
+			margin: 1rem;
+			padding: 1rem;
 		}
 	}
 	.base_negative_balance,
diff --git a/web/src/containers/QuickTrade/index.js b/web/src/containers/QuickTrade/index.js
index cc091d8eaf..b0dff25473 100644
--- a/web/src/containers/QuickTrade/index.js
+++ b/web/src/containers/QuickTrade/index.js
@@ -5,6 +5,7 @@ import { bindActionCreators } from 'redux';
 import { isMobile } from 'react-device-detect';
 import { browserHistory } from 'react-router';
 import math from 'mathjs';
+import { QuickTradeLimitsSelector } from './utils';
 
 import { submitOrder } from 'actions/orderAction';
 import STRINGS from 'config/localizedStrings';
@@ -33,7 +34,7 @@ class QuickTradeContainer extends PureComponent {
 		const [, selectedSource = sourceOptions[0]] = pair.split('-');
 		const targetOptions = this.getTargetOptions(selectedSource);
 		const [selectedTarget = targetOptions[0]] = pair.split('-');
-		const { close: tickerClose } = tickers[pair];
+		const { close: tickerClose } = tickers[pair] || {};
 
 		this.state = {
 			pair,
@@ -66,11 +67,15 @@ class QuickTradeContainer extends PureComponent {
 	componentDidMount() {
 		if (
 			this.props.constants &&
+			this.props.constants.features &&
 			!this.props.constants.features.quick_trade &&
 			!this.props.fetchingAuth
 		) {
 			this.props.router.push('/account');
 		}
+		if (this.props.sourceOptions && this.props.sourceOptions.length) {
+			this.constructTraget();
+		}
 	}
 
 	UNSAFE_componentWillReceiveProps(nextProps) {
@@ -79,6 +84,16 @@ class QuickTradeContainer extends PureComponent {
 		}
 	}
 
+	componentDidUpdate(prevProps, prevState) {
+		if (
+			!prevProps.sourceOptions.length &&
+			JSON.stringify(prevProps.sourceOptions) !==
+				JSON.stringify(this.props.sourceOptions)
+		) {
+			this.constructTraget();
+		}
+	}
+
 	changePair = (pair) => {
 		this.setState({ pair });
 		this.props.changePair(pair);
@@ -229,6 +244,20 @@ class QuickTradeContainer extends PureComponent {
 		this.goToPair(pair);
 	};
 
+	constructTraget = () => {
+		const {
+			sourceOptions,
+			routeParams: { pair = '' },
+		} = this.props;
+		const [, selectedSource = sourceOptions[0]] = pair.split('-');
+		const targetOptions = this.getTargetOptions(selectedSource);
+		const [selectedTarget = targetOptions[0]] = pair.split('-');
+		this.setState({
+			selectedTarget,
+			targetOptions,
+		});
+	};
+
 	getTargetOptions = (sourceKey) => {
 		const { sourceOptions, pairs } = this.props;
 
@@ -345,7 +374,7 @@ class QuickTradeContainer extends PureComponent {
 						symbol={pair}
 						theme={activeTheme}
 						disabled={this.isReviewDisabled()}
-						orderLimits={orderLimits[pair]}
+						orderLimits={orderLimits[pair] || {}}
 						pairs={pairs}
 						coins={coins}
 						sourceOptions={sourceOptions}
@@ -379,7 +408,7 @@ class QuickTradeContainer extends PureComponent {
 										/>
 										<ReviewBlock
 											symbol={selectedTarget}
-											text={'Estimated Recieving Amount'}
+											text={'Estimated Receiving Amount'}
 											amount={targetAmount}
 										/>
 										<footer className="d-flex pt-4">
@@ -428,6 +457,7 @@ const mapStateToProps = (store) => {
 	const pair = store.app.pair;
 	const pairData = store.app.pairs[pair] || {};
 	const sourceOptions = getSourceOptions(store.app.pairs);
+	const qtlimits = QuickTradeLimitsSelector(store);
 
 	return {
 		sourceOptions,
@@ -438,7 +468,7 @@ const mapStateToProps = (store) => {
 		tickers: store.app.tickers,
 		activeTheme: store.app.theme,
 		activeLanguage: store.app.language,
-		orderLimits: store.app.orderLimits,
+		orderLimits: qtlimits,
 		user: store.user,
 		settings: store.user.settings,
 		constants: store.app.constants,
diff --git a/web/src/containers/QuickTrade/utils.js b/web/src/containers/QuickTrade/utils.js
new file mode 100644
index 0000000000..a72a3500cc
--- /dev/null
+++ b/web/src/containers/QuickTrade/utils.js
@@ -0,0 +1,24 @@
+import { createSelector } from 'reselect';
+import math from 'mathjs';
+
+const getTickers = (state) => state.app.tickers;
+const getOrderLimits = (state) => state.app.orderLimits;
+
+export const QuickTradeLimitsSelector = createSelector(
+	[getTickers, getOrderLimits],
+	(tickers, orderLimits) => {
+		const QTLimits = {};
+		Object.entries(orderLimits).forEach(([pair, limits]) => {
+			const { close = 0 } = tickers[pair] || {};
+			const { SIZE = {} } = limits;
+			const { MIN, MAX, STEP } = SIZE;
+			const QTPRICE = {
+				STEP: math.multiply(STEP, close),
+				MIN: math.multiply(MIN, close),
+				MAX: math.multiply(MAX, close),
+			};
+			QTLimits[pair] = { ...limits, PRICE: QTPRICE };
+		});
+		return QTLimits;
+	}
+);
diff --git a/web/src/containers/Summary/_Summary.scss b/web/src/containers/Summary/_Summary.scss
index b0f320b1dd..2489ff3084 100644
--- a/web/src/containers/Summary/_Summary.scss
+++ b/web/src/containers/Summary/_Summary.scss
@@ -70,7 +70,6 @@ $trade-tab--arrow-size: 0.4rem;
 			// width: 17rem;
 		}
 		.assets-wrapper {
-			margin-top: 40px;
 			.price-text {
 				font-size: $font-size-mobile-txt !important;
 			}
@@ -93,15 +92,28 @@ $trade-tab--arrow-size: 0.4rem;
 	margin: 1rem auto;
 	width: 75rem;
 
+	.icon_title-wrapper {
+		justify-content: flex-start;
+		flex-direction: row;
+	}
+
+	.account-details-text {
+		padding-top: 1rem;
+		padding-bottom: 2rem;
+	}
+
 	.summary-block_wrapper {
-		border-top: 0.2rem solid $colors-border;
+		// border: 1px solid $colors-main-border;
 		color: $colors-deactivate-color2;
-		// margin: 0 .5rem;
-		padding: 0.5rem;
+		margin: 11px 0;
+		padding: 1.5rem 1rem 1rem 1.5rem;
+		background-color: $app-sidebar-background;
+		border-radius: 3px;
+		border: 1px solid $colors-super-pale-black;
 
 		.summary-block-title {
 			color: $colors-black;
-			font-size: 1rem;
+			font-size: $font-size-subhead4;
 			font-weight: bold;
 		}
 		.summary-title-icon {
@@ -110,7 +122,7 @@ $trade-tab--arrow-size: 0.4rem;
 	}
 
 	.summary-content-txt {
-		font-size: $font-size-subtext;
+		font-size: $font-size-main;
 	}
 
 	.trader-account-wrapper {
@@ -153,7 +165,7 @@ $trade-tab--arrow-size: 0.4rem;
 		font-weight: bold;
 	}
 	.summary-section_1 {
-		height: 30rem;
+		// height: 30rem;
 
 		.assets-wrapper {
 			.donut-container {
@@ -274,7 +286,7 @@ $trade-tab--arrow-size: 0.4rem;
 
 	.assets-wrapper {
 		font-size: 0.8rem;
-		margin-right: 1.5rem;
+		// margin-right: 1.5rem;
 		// width: 25rem;
 
 		.assets-description {
@@ -525,7 +537,7 @@ $trade-tab--arrow-size: 0.4rem;
 		top: calc(50% - 0.6rem);
 	}
 	.trade_tabs-search-field {
-		background-color: $app-background-color;
+		background-color: $app-sidebar-background;
 		color: $colors-deactivate-color1;
 		margin: 0;
 		padding-right: 0.5rem;
@@ -733,9 +745,9 @@ $trade-tab--arrow-size: 0.4rem;
 		.trader-account-wrapper {
 			font-size: 0.9rem;
 		}
-		.summary-section_1 {
-			height: 31rem !important;
-		}
+		// .summary-section_1 {
+		// height: 31rem !important;
+		// }
 		.summary-section_2 {
 			height: 44rem !important;
 		}
@@ -744,3 +756,10 @@ $trade-tab--arrow-size: 0.4rem;
 		font-size: 0.9rem;
 	}
 }
+// @media screen and (max-width: 960px) {
+// .summary-container {
+// .summary-section_1 {
+// height: 33rem !important;
+// }
+// }
+// }
diff --git a/web/src/containers/Summary/components/AccountAssets.js b/web/src/containers/Summary/components/AccountAssets.js
index 76b3c6bd34..ba0b140297 100644
--- a/web/src/containers/Summary/components/AccountAssets.js
+++ b/web/src/containers/Summary/components/AccountAssets.js
@@ -71,7 +71,11 @@ const AccountAssets = ({
 							<DonutChart coins={coins} chartData={chartData} />
 						)}
 					</div>
-					<Carousel items={assetCards()} groupItems={7} isActive={true} />
+					<Carousel
+						items={assetCards()}
+						groupItems={isMobile ? 4 : 7}
+						isActive={true}
+					/>
 				</div>
 			</div>
 			{SHOW_TOTAL_ASSETS ? (
diff --git a/web/src/containers/Summary/components/AccountDetails.js b/web/src/containers/Summary/components/AccountDetails.js
index 6d5ecbe312..c3883f22f0 100644
--- a/web/src/containers/Summary/components/AccountDetails.js
+++ b/web/src/containers/Summary/components/AccountDetails.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import { isMobile } from 'react-device-detect';
+import { EditWrapper } from 'components';
 
 import AccountTypesList from './AccountTypesList';
 import AccountTypeDetails from './AccountTypeDetails';
@@ -23,11 +24,19 @@ const AccountDetails = ({
 }) => {
 	return (
 		<div className="account-details-wrapper summary-content-txt">
-			<div>
-				<div>{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_1']}</div>
-				<div>{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_2']}</div>
-				<div className="mt-2">{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_3']}</div>
-				<div className="mt-2">{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_4']}</div>
+			<div className="account-details-text">
+				<EditWrapper stringId="SUMMARY.ACCOUNT_DETAILS_TXT_1">
+					<div>{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_1']}</div>
+				</EditWrapper>
+				<EditWrapper stringId="SUMMARY.ACCOUNT_DETAILS_TXT_2">
+					<div>{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_2']}</div>
+				</EditWrapper>
+				<EditWrapper stringId="SUMMARY.ACCOUNT_DETAILS_TXT_3">
+					<div className="mt-2">{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_3']}</div>
+				</EditWrapper>
+				<EditWrapper stringId="SUMMARY.ACCOUNT_DETAILS_TXT_4">
+					<div className="mt-2">{STRINGS['SUMMARY.ACCOUNT_DETAILS_TXT_4']}</div>
+				</EditWrapper>
 			</div>
 			{isMobile ? (
 				<MobileAccountTypeList
diff --git a/web/src/containers/Summary/components/Markets.js b/web/src/containers/Summary/components/Markets.js
index 512a5341e9..362c26ce20 100644
--- a/web/src/containers/Summary/components/Markets.js
+++ b/web/src/containers/Summary/components/Markets.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { formatPercentage } from 'utils/currency';
 import { isMobile } from 'react-device-detect';
 import { withRouter } from 'react-router';
+import math from 'mathjs';
 
 import { SearchBox } from 'components';
 import MarketList from '../../TradeTabs/components/MarketList';
@@ -10,6 +11,7 @@ import withConfig from 'components/ConfigProvider/withConfig';
 import STRINGS from 'config/localizedStrings';
 import { BASE_CURRENCY, DEFAULT_COIN_DATA } from 'config/constants';
 import { getSparklines } from 'actions/chartAction';
+import { EditWrapper } from 'components';
 
 class Markets extends Component {
 	constructor(props) {
@@ -52,9 +54,11 @@ class Markets extends Component {
 		const { pageSize } = this.state;
 		const pairs = searchValue ? this.getSearchPairs(searchValue) : pairData;
 		const pairKeys = Object.keys(pairs).sort((a, b) => {
-			let tickA = tickers[a] || {};
-			let tickB = tickers[b] || {};
-			return tickB.volume - tickA.volume;
+			const { volume: volumeA = 0, close: closeA = 0 } = tickers[a] || {};
+			const { volume: volumeB = 0, close: closeB = 0 } = tickers[b] || {};
+			const marketCapA = math.multiply(volumeA, closeA);
+			const marketCapB = math.multiply(volumeB, closeB);
+			return marketCapB - marketCapA;
 		});
 		const count = pairKeys.length;
 		const initItem = page * pageSize;
@@ -113,7 +117,14 @@ class Markets extends Component {
 	};
 
 	render() {
-		const { pairs, tickers, coins } = this.props;
+		const {
+			pairs,
+			tickers,
+			coins,
+			showSearch = true,
+			showMarkets = false,
+			router,
+		} = this.props;
 		const { data, chartData, page, pageSize, count } = this.state;
 
 		const processedData = data.map((key) => {
@@ -147,32 +158,47 @@ class Markets extends Component {
 
 		return (
 			<div>
-				<div className="d-flex justify-content-end">
-					<div className={isMobile ? '' : 'w-25'}>
-						<SearchBox
-							name={STRINGS['SEARCH_ASSETS']}
-							className="trade_tabs-search-field"
-							outlineClassName="trade_tabs-search-outline"
-							placeHolder={`${STRINGS['SEARCH_ASSETS']}...`}
-							handleSearch={this.handleTabSearch}
-						/>
+				{showSearch && (
+					<div className="d-flex justify-content-end">
+						<div className={isMobile ? '' : 'w-25'}>
+							<SearchBox
+								name={STRINGS['SEARCH_ASSETS']}
+								className="trade_tabs-search-field"
+								outlineClassName="trade_tabs-search-outline"
+								placeHolder={`${STRINGS['SEARCH_ASSETS']}...`}
+								handleSearch={this.handleTabSearch}
+							/>
+						</div>
 					</div>
-				</div>
+				)}
 				<MarketList
 					markets={processedData}
 					chartData={chartData}
 					handleClick={this.handleClick}
 				/>
-				<div className="text-right">
-					{page * pageSize + pageSize < count ? (
+				{!showMarkets && page * pageSize + pageSize < count && (
+					<div className="text-right">
 						<span
 							className="trade-account-link pointer"
 							onClick={this.handleLoadMore}
 						>
 							{STRINGS['SUMMARY.VIEW_MORE_MARKETS']}
 						</span>
-					) : null}
-				</div>
+					</div>
+				)}
+				{showMarkets && (
+					<div className="d-flex justify-content-center app_bar-link blue-link pointer py-2 underline-text market-list__footer">
+						<EditWrapper stringId="MARKETS_TABLE.VIEW_MARKETS" />
+						<div
+							onClick={() => {
+								router.push('/trade/add/tabs');
+							}}
+							className="pt-1"
+						>
+							{STRINGS['MARKETS_TABLE.VIEW_MARKETS']}
+						</div>
+					</div>
+				)}
 			</div>
 		);
 	}
diff --git a/web/src/containers/Summary/index.js b/web/src/containers/Summary/index.js
index e950d70b58..5c0b1181b9 100644
--- a/web/src/containers/Summary/index.js
+++ b/web/src/containers/Summary/index.js
@@ -32,6 +32,7 @@ import STRINGS from '../../config/localizedStrings';
 import { formatAverage, formatBaseAmount } from 'utils/currency';
 import { getLastMonthVolume } from './components/utils';
 import { getUserReferralCount } from '../../actions/userAction';
+import withConfig from 'components/ConfigProvider/withConfig';
 
 class Summary extends Component {
 	state = {
@@ -135,6 +136,7 @@ class Summary extends Component {
 			chartData,
 			totalAsset,
 			router,
+			icons: ICONS,
 		} = this.props;
 		const {
 			selectedAccount,
@@ -155,6 +157,8 @@ class Summary extends Component {
 						stringId="SUMMARY.TITLE"
 						text={`${STRINGS['SUMMARY.TITLE']}`}
 						textType="title"
+						iconPath={ICONS['TAB_SUMMARY']}
+						iconId={`${STRINGS['SUMMARY.TITLE']}`}
 					/>
 				)}
 				{isMobile ? (
@@ -180,7 +184,7 @@ class Summary extends Component {
 					/>
 				) : (
 					<div>
-						<div className="d-flex align-items-center">
+						<div className="d-flex">
 							<div className="summary-section_1 trader-account-wrapper d-flex">
 								<SummaryBlock title={traderAccTitle} wrapperClassname="w-100">
 									<TraderAccounts
@@ -208,35 +212,35 @@ class Summary extends Component {
 										contentClassName="requirements-content"
 									/>
 								</SummaryBlock> */}
-								<div
+								{/* <div
 									className={classnames(
 										'assets-wrapper',
 										'asset_wrapper_width'
 									)}
+								> */}
+								<SummaryBlock
+									stringId="SUMMARY.ACCOUNT_ASSETS"
+									title={STRINGS['SUMMARY.ACCOUNT_ASSETS']}
+									secondaryTitle={
+										SHOW_TOTAL_ASSETS && BASE_CURRENCY ? (
+											<span>
+												<span className="title-font">{totalAssets}</span>
+												{` ${fullname}`}
+											</span>
+										) : null
+									}
+									wrapperClassname={classnames('assets-wrapper', 'w-100')}
 								>
-									<SummaryBlock
-										stringId="SUMMARY.ACCOUNT_ASSETS"
-										title={STRINGS['SUMMARY.ACCOUNT_ASSETS']}
-										secondaryTitle={
-											SHOW_TOTAL_ASSETS && BASE_CURRENCY ? (
-												<span>
-													<span className="title-font">{totalAssets}</span>
-													{` ${fullname}`}
-												</span>
-											) : null
-										}
-										// wrapperClassname={classnames({ 'w-100': !SHOW_SUMMARY_ACCOUNT_DETAILS })}
-									>
-										<AccountAssets
-											user={user}
-											chartData={chartData}
-											totalAssets={totalAssets}
-											balance={balance}
-											coins={coins}
-											activeTheme={activeTheme}
-										/>
-									</SummaryBlock>
-								</div>
+									<AccountAssets
+										user={user}
+										chartData={chartData}
+										totalAssets={totalAssets}
+										balance={balance}
+										coins={coins}
+										activeTheme={activeTheme}
+									/>
+								</SummaryBlock>
+								{/* </div> */}
 							</div>
 						</div>
 						<div className="w-100">
@@ -324,4 +328,7 @@ const mapDispatchToProps = (dispatch) => ({
 	getUserReferralCount: bindActionCreators(getUserReferralCount, dispatch),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(Summary);
+export default connect(
+	mapStateToProps,
+	mapDispatchToProps
+)(withConfig(Summary));
diff --git a/web/src/containers/Trade/ChartConfig.js b/web/src/containers/Trade/ChartConfig.js
index 3ef7a604e0..174eca0445 100644
--- a/web/src/containers/Trade/ChartConfig.js
+++ b/web/src/containers/Trade/ChartConfig.js
@@ -9,7 +9,7 @@ const TRADING_VIEW_TEXT = '#292b2c';
 
 export const getToolbarBG = (theme, colors = {}) => {
 	const themeData = colors[theme] || {};
-	return themeData['base_background'] || BACKGROUND_COLOR;
+	return themeData['base_wallet-sidebar-and-popup'] || BACKGROUND_COLOR;
 };
 
 export const getWidgetTheme = (base_background = BACKGROUND_COLOR) => {
@@ -21,7 +21,8 @@ export const getTheme = ({
 	'trading_selling-related-elements': sell = DOWN_COLOR_WHITE,
 	...rest
 }) => ({
-	'paneProperties.background': rest['base_background'] || BACKGROUND_COLOR,
+	'paneProperties.background':
+		rest['base_wallet-sidebar-and-popup'] || BACKGROUND_COLOR,
 	'paneProperties.vertGridProperties.color':
 		rest['calculated_trad-view_axis'] || TRADING_VIEW_AXIS,
 	'paneProperties.horzGridProperties.color':
@@ -33,7 +34,7 @@ export const getTheme = ({
 	'scalesProperties.textColor':
 		rest['calculated_trad-view_text'] || TRADING_VIEW_TEXT,
 	'scalesProperties.backgroundColor':
-		rest['base_background'] || BACKGROUND_COLOR,
+		rest['base_wallet-sidebar-and-popup'] || BACKGROUND_COLOR,
 	'mainSeriesProperties.showPriceLine': true,
 	// Candles-property
 	'mainSeriesProperties.candleStyle.upColor': buy,
diff --git a/web/src/containers/Trade/MobileTrade.js b/web/src/containers/Trade/MobileTrade.js
index 1f178ddd61..928ef4fbf9 100644
--- a/web/src/containers/Trade/MobileTrade.js
+++ b/web/src/containers/Trade/MobileTrade.js
@@ -26,12 +26,13 @@ const MobileTrade = ({
 				'd-flex',
 				'justify-content-between',
 				'f-1',
-				'apply_rtl'
+				'apply_rtl',
+				'w-100'
 			)}
 		>
 			<TradeBlock
 				title={''}
-				className="p-relative order-book flex-column"
+				className="p-relative order-book flex-column w-50"
 				alignChildY={true}
 			>
 				{/* <Link className={classnames('blue-link', 'mb-2', 'caps')} to={`/quick-trade/${pair}`}>
@@ -49,7 +50,7 @@ const MobileTrade = ({
 					setSizeRef={setSizeRef}
 				/>
 			</TradeBlock>
-			<TradeBlock title={STRINGS['ORDERBOOK']} className="order-entry">
+			<TradeBlock title={STRINGS['ORDERBOOK']} className="order-entry w-50">
 				{orderbookReady && <Orderbook {...orderbookProps} />}
 			</TradeBlock>
 		</div>
diff --git a/web/src/containers/Trade/_Trade.scss b/web/src/containers/Trade/_Trade.scss
index 85dc8fa5dc..d086f1474c 100644
--- a/web/src/containers/Trade/_Trade.scss
+++ b/web/src/containers/Trade/_Trade.scss
@@ -14,9 +14,9 @@ $trade_title-border--size: 0.2rem;
 $trade-font-size: $font-size-subtext;
 $trade-post-font-size: 12px;
 
-$side-column--width: 17.5rem;
-$side-column--width-sm: 16rem;
-$side-column--width-lg: 20rem;
+$side-column--width: 23rem;
+$side-column--width-sm: 23rem;
+$side-column--width-lg: 24rem;
 $order_entry-column--width: 20rem;
 $order_entry-column--width-sm: 20rem;
 $order_entry-column--width-lg: 20rem;
@@ -141,6 +141,21 @@ $order_entry-column--width-lg: 20rem;
 			}
 		}
 	}
+	.recent-trades {
+		&.cell_box-type {
+			display: flex;
+			.buy {
+				min-width: 3rem;
+				padding-left: 0.5rem;
+				padding-right: 0.5rem;
+			}
+			.sell {
+				min-width: 3rem;
+				padding-left: 0.5rem;
+				padding-right: 0.5rem;
+			}
+		}
+	}
 }
 
 .quick-trade-tab {
@@ -199,3 +214,67 @@ $order_entry-column--width-lg: 20rem;
 	min-height: $market-selector--height;
 	max-height: $market-selector--height;
 }
+
+.public-history__header {
+	font-size: $font-size-subtext !important;
+	.custom-select-input-style {
+		font-size: 1rem !important;
+		max-width: 8rem;
+		.ant-select-selector {
+			height: 1.5rem !important;
+			line-height: 1.5rem !important;
+			padding: 0;
+			font-size: $font-size-subtext !important;
+		}
+		.ant-select-selection-item {
+			height: 1.5rem !important;
+			line-height: 1.5rem !important;
+			font-weight: bold;
+		}
+		.ant-select-arrow {
+			right: 2px;
+		}
+	}
+}
+
+.mobile-tab_market-indicator {
+	width: 2.5rem !important;
+	margin: 0.3rem 0.3rem 0 0.3rem;
+
+	svg {
+		.btc0,
+		.btc1,
+		.eth0,
+		.eth1,
+		.bch-icon,
+		.xrp-icon,
+		.xht-icon,
+		.xmr-icon,
+		.xlm-icon,
+		.eos-icon,
+		.trx-icon,
+		.ada-icon,
+		.bnb-icon,
+		.tusd-icon,
+		.dai-icon,
+		.ltc-icon,
+		.default-icon {
+			fill: $app-bar-menu-list-color !important;
+		}
+		.plus,
+		.minus {
+			stroke: $app-bar-menu-list-color !important;
+			stroke-width: 0.2rem;
+		}
+		.st0 {
+			fill: $base_top-bar-navigation_text;
+			stroke-width: 0rem;
+		}
+		.icon-check-1 {
+			stroke: $base_top-bar-navigation_text;
+		}
+		.xht-icon-1 {
+			fill: $dark-app-background-color !important;
+		}
+	}
+}
diff --git a/web/src/containers/Trade/_TradeContainer.scss b/web/src/containers/Trade/_TradeContainer.scss
index 7b181794d5..536a4c553d 100644
--- a/web/src/containers/Trade/_TradeContainer.scss
+++ b/web/src/containers/Trade/_TradeContainer.scss
@@ -8,7 +8,7 @@
 		.trade-main_content {
 			flex: 6;
 			min-height: 25vh;
-			max-height: 78vh;
+			max-height: 60vh;
 		}
 
 		.trade-tabs_content {
@@ -103,7 +103,7 @@
 		}
 	}
 	.trade_orderbook-spread {
-		height: 2rem;
+		min-height: 3rem !important;
 		margin: 1rem 0;
 	}
 	.trade_orderbook-asks,
diff --git a/web/src/containers/Trade/components/ActiveOrders.js b/web/src/containers/Trade/components/ActiveOrders.js
index 85d0d08045..a4c023e2d0 100644
--- a/web/src/containers/Trade/components/ActiveOrders.js
+++ b/web/src/containers/Trade/components/ActiveOrders.js
@@ -127,7 +127,7 @@ const generateHeaders = (pairData = {}, onCancel, onCancelAll, ICONS) => [
 	},
 	{
 		label: (
-			<div className="trade__active-orders_cancel-All">
+			<span className="trade__active-orders_cancel-All">
 				<ActionNotification
 					stringId="CANCEL_ALL"
 					text={STRINGS['CANCEL_ALL']}
@@ -135,10 +135,12 @@ const generateHeaders = (pairData = {}, onCancel, onCancelAll, ICONS) => [
 					iconPath={ICONS['CANCEL_CROSS_ACTIVE']}
 					onClick={() => onCancelAll()}
 					status="information"
+					textPosition="left"
 				/>
-			</div>
+			</span>
 		),
 		key: 'cancel',
+		className: 'trade__active-orders-header_cancel-All',
 		renderCell: ({ size = 0, filled = 0, id }, key, index) => {
 			return (
 				<td key={index} style={{ position: 'relative' }}>
diff --git a/web/src/containers/Trade/components/OrderEntry.js b/web/src/containers/Trade/components/OrderEntry.js
index 38d3411560..1d592ea0e3 100644
--- a/web/src/containers/Trade/components/OrderEntry.js
+++ b/web/src/containers/Trade/components/OrderEntry.js
@@ -28,7 +28,7 @@ import {
 	step,
 	normalizeFloat,
 } from '../../../components/Form/validations';
-import { Loader } from '../../../components';
+import { Loader, Tooltip } from '../../../components';
 import { takerFee, DEFAULT_COIN_DATA } from '../../../config/constants';
 
 import STRINGS from '../../../config/localizedStrings';
@@ -97,6 +97,46 @@ class OrderEntry extends Component {
 		}
 	}
 
+	calculateOrderForBudget = (budget, orders = []) =>
+		orders.reduce(
+			([accumulatedPrice, accumulatedSize], [price = 0, size = 0]) => {
+				if (mathjs.larger(budget, accumulatedPrice)) {
+					const remainingBudget = mathjs.subtract(budget, accumulatedPrice);
+					const orderPrice = mathjs.multiply(size, price);
+					if (mathjs.largerEq(remainingBudget, orderPrice)) {
+						return [
+							mathjs.sum(accumulatedPrice, orderPrice),
+							mathjs.sum(accumulatedSize, size),
+						];
+					} else {
+						const remainingSize = mathjs.divide(remainingBudget, price);
+						return [
+							mathjs.sum(accumulatedPrice, remainingBudget),
+							mathjs.sum(accumulatedSize, remainingSize),
+						];
+					}
+				} else {
+					return [accumulatedPrice, accumulatedSize];
+				}
+			},
+			[0, 0]
+		);
+
+	calculateMarketOrder = (percent) => {
+		const { pair_2, balance = {}, side, pairsOrderbooks, pair } = this.props;
+
+		const availableBalance = balance[`${pair_2}_available`];
+		const budget = mathjs.multiply(
+			availableBalance,
+			mathjs.divide(percent, 100)
+		);
+
+		const { [side === 'buy' ? 'asks' : 'bids']: orders = [] } =
+			pairsOrderbooks[pair] || {};
+
+		return this.calculateOrderForBudget(budget, orders);
+	};
+
 	setMax = (percent = 100) => {
 		const {
 			side,
@@ -121,10 +161,12 @@ class OrderEntry extends Component {
 			maxSize = mathjs.divide(balance[`${pair_2}_available`] || 0, price);
 		}
 
-		const calculatedSize = mathjs.multiply(
-			maxSize,
-			mathjs.divide(percent, 100)
-		);
+		let calculatedSize;
+		if (type === 'market' && side === 'buy') {
+			calculatedSize = this.calculateMarketOrder(percent)[1];
+		} else {
+			calculatedSize = mathjs.multiply(maxSize, mathjs.divide(percent, 100));
+		}
 
 		if (calculatedSize !== size) {
 			this.props.change(
@@ -212,6 +254,21 @@ class OrderEntry extends Component {
 			order.price = formatNumber(values.price, getDecimals(increment_price));
 		}
 
+		if (values.order_type === 'stops') {
+			order.stop = formatNumber(values.stop, getDecimals(increment_price));
+		} else {
+			delete order.stop;
+		}
+
+		if (values.post_only) {
+			order.meta = {
+				post_only: values.post_only,
+			};
+		}
+
+		delete order.post_only;
+		delete order.order_type;
+
 		return this.props.submitOrder(order).then(() => {
 			if (
 				values.type === 'market' &&
@@ -443,7 +500,11 @@ class OrderEntry extends Component {
 			},
 			postOnly: {
 				name: 'post_only',
-				label: <span className="px-1">{STRINGS['POST_ONLY']}</span>,
+				label: (
+					<Tooltip text={STRINGS['POST_ONLY_TOOLTIP']} className="light-theme">
+						<span className="px-1 post-only-txt">{STRINGS['POST_ONLY']}</span>
+					</Tooltip>
+				),
 				type: 'checkbox',
 				className: 'align-start my-0',
 			},
@@ -516,6 +577,7 @@ class OrderEntry extends Component {
 					orderType={orderType}
 				>
 					<Review
+						side={side}
 						price={price}
 						size={size}
 						type={type}
@@ -568,6 +630,7 @@ const mapStateToProps = (state) => {
 		user: state.user,
 		settings: state.user.settings,
 		coins: state.app.coins,
+		pairsOrderbooks: state.orderbook.pairsOrderbooks,
 		asks,
 		bids,
 		marketPrice,
diff --git a/web/src/containers/Trade/components/OrderEntryReview.js b/web/src/containers/Trade/components/OrderEntryReview.js
index 70d25fc2f6..bf3b3debc9 100644
--- a/web/src/containers/Trade/components/OrderEntryReview.js
+++ b/web/src/containers/Trade/components/OrderEntryReview.js
@@ -1,7 +1,8 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import classnames from 'classnames';
 import math from 'mathjs';
-
+import { connect } from 'react-redux';
+import { estimatedMarketPriceSelector } from 'containers/Trade/utils';
 import STRINGS from '../../../config/localizedStrings';
 
 const ROW_CLASSNAMES = ['d-flex', 'justify-content-between'];
@@ -19,6 +20,7 @@ const Review = ({
 	formatToCurrency,
 	type,
 	onFeeStructureAndLimits,
+	estimatedPrice,
 }) => {
 	// const orderAmountReceived = math.add(
 	// 	math.fraction(orderPrice),
@@ -29,18 +31,36 @@ const Review = ({
 		<div className="trade_order_entry-review d-flex flex-column">
 			<div className={classnames(...ROW_CLASSNAMES)}>
 				<div>
-					{type === 'market' ? STRINGS['MARKET_PRICE'] : STRINGS['ORDER_PRICE']}
+					{type === 'market'
+						? STRINGS['ESTIMATED_PRICE']
+						: STRINGS['ORDER_PRICE']}
 					:
 				</div>
 				<div className="text-price">
-					{upToMarket
-						? price
-							? renderAmount(
-									formatToCurrency(price * size, increment_price),
-									currency
-							  )
-							: 0
-						: STRINGS['UP_TO_MARKET']}
+					{type !== 'market' && (
+						<Fragment>
+							{upToMarket
+								? price
+									? renderAmount(
+											formatToCurrency(price * size, increment_price),
+											currency
+									  )
+									: 0
+								: STRINGS['UP_TO_MARKET']}
+						</Fragment>
+					)}
+					{type === 'market' && (
+						<Fragment>
+							{size
+								? estimatedPrice
+									? renderAmount(
+											formatToCurrency(estimatedPrice, increment_price),
+											currency
+									  )
+									: STRINGS['UP_TO_MARKET']
+								: 0}
+						</Fragment>
+					)}
 				</div>
 			</div>
 			<div className={classnames(...ROW_CLASSNAMES)}>
@@ -64,4 +84,12 @@ Review.defaultProps = {
 	formatToCurrency: (value) => value,
 };
 
-export default Review;
+const mapStateToProps = (store, ownProps) => {
+	const [estimatedPrice] = estimatedMarketPriceSelector(store, ownProps);
+
+	return {
+		estimatedPrice,
+	};
+};
+
+export default connect(mapStateToProps)(Review);
diff --git a/web/src/containers/Trade/components/Orderbook.js b/web/src/containers/Trade/components/Orderbook.js
index 66bc7a0123..bf48dee794 100644
--- a/web/src/containers/Trade/components/Orderbook.js
+++ b/web/src/containers/Trade/components/Orderbook.js
@@ -40,6 +40,7 @@ const PriceRow = (
 	const fillStyle = {
 		backgroundSize: `${calcPercentage(amount, maxCumulative)}% 100%`,
 	};
+	const totalAmount = isBase ? cumulative : cumulativePrice;
 
 	return (
 		<div
@@ -55,18 +56,21 @@ const PriceRow = (
 				style={fillStyle}
 			>
 				<div
-					className={`f-1 trade_orderbook-cell trade_orderbook-cell pointer`}
+					className={`f-1 trade_orderbook-cell trade_orderbook-cell-price pointer`}
 					onClick={onPriceClick(price)}
 				>
 					{formatToCurrency(price, increment_price)}
 				</div>
 				<div
-					className="f-1 trade_orderbook-cell pointer"
+					className="f-1 trade_orderbook-cell trade_orderbook-cell-amount pointer"
 					onClick={onAmountClick(amount)}
 				>
 					{formatToCurrency(amount, increment_size)}
 				</div>
-				<div className="f-1 trade_orderbook-cell trade_orderbook-cell_total">
+				<div
+					className="f-1 trade_orderbook-cell trade_orderbook-cell_total pointer"
+					onClick={onAmountClick(totalAmount)}
+				>
 					{isBase
 						? formatToCurrency(cumulative, increment_size)
 						: formatToCurrency(cumulativePrice, increment_price)}
@@ -99,14 +103,31 @@ class Orderbook extends Component {
 	state = {
 		dataBlockHeight: 0,
 		isBase: true,
+		positioned: false,
+		isOpen: false,
 	};
 
 	componentDidMount() {
-		this.scrollTop();
+		const { orderbookFetched } = this.props;
+		if (orderbookFetched) {
+			setTimeout(() => {
+				window.dispatchEvent(new Event('resize'));
+			}, 1000);
+		}
 	}
 
-	UNSAFE_componentWillReceiveProps(nextProps) {
-		// this.scrollTop();
+	componentDidUpdate(prevProps) {
+		const { orderbookFetched } = this.props;
+		const { positioned } = this.state;
+		if (
+			!positioned &&
+			prevProps.orderbookFetched === false &&
+			orderbookFetched === true
+		) {
+			setTimeout(() => {
+				window.dispatchEvent(new Event('resize'));
+			}, 1000);
+		}
 	}
 
 	componentWillUnmount() {
@@ -131,7 +152,7 @@ class Orderbook extends Component {
 			if (needScroll && askDif > 0) {
 				this.wrapper.scrollTop = askDif;
 			}
-			this.setState({ dataBlockHeight });
+			this.setState({ dataBlockHeight, positioned: true });
 		}
 	};
 
@@ -183,6 +204,10 @@ class Orderbook extends Component {
 
 	onSelect = (isBase) => this.setState({ isBase });
 
+	dropdownVisibleChange = (isOpen) => {
+		this.setState({ isOpen });
+	};
+
 	render() {
 		const {
 			asks,
@@ -191,12 +216,12 @@ class Orderbook extends Component {
 			pair,
 			coins,
 			maxCumulative,
-			increment_price,
-			depth,
+			increment_price = 1,
+			depth = 1,
 			lastPrice,
 		} = this.props;
 
-		const { isBase } = this.state;
+		const { isBase, positioned, isOpen } = this.state;
 		// const blockStyle = {};
 		const { dataBlockHeight } = this.state;
 		const blockStyle =
@@ -231,27 +256,35 @@ class Orderbook extends Component {
 						<PlusSquareOutlined />
 					</Button>
 				</div>
-				<div className="trade_orderbook-headers d-flex">
+				<div className="trade_orderbook-headers d-flex align-end">
 					<div className="f-1 trade_orderbook-cell">
-						{STRINGS.formatString(
-							STRINGS['PRICE_CURRENCY'],
-							symbol.toUpperCase()
-						)}
+						<div>{STRINGS['PRICE_CURRENCY']}</div>
+						<div>({symbol.toUpperCase()})</div>
 					</div>
 					<div className="f-1 trade_orderbook-cell">
-						{STRINGS.formatString(STRINGS['AMOUNT_SYMBOL'], pairBase)}
+						<div>{STRINGS['AMOUNT_SYMBOL']}</div>
+						<div>({pairBase})</div>
 					</div>
 					<div className="f-1 trade_orderbook-cell">
-						{STRINGS['CUMULATIVE_AMOUNT_SYMBOL']}
+						<div className="d-flex align-items-center">
+							{STRINGS['CUMULATIVE_AMOUNT_SYMBOL']}
+						</div>
 						<Select
 							bordered={false}
 							defaultValue={false}
 							size="small"
-							suffixIcon={<CaretDownOutlined />}
+							suffixIcon={
+								<CaretDownOutlined
+									onClick={() => this.dropdownVisibleChange(!isOpen)}
+								/>
+							}
 							value={isBase}
 							onSelect={this.onSelect}
+							onDropdownVisibleChange={this.dropdownVisibleChange}
+							open={isOpen}
 							className="custom-select-input-style order-entry no-border"
-							dropdownClassName="custom-select-style"
+							dropdownClassName="custom-select-style trade-select-option-wrapper"
+							dropdownStyle={{ minWidth: '7rem' }}
 						>
 							<Option value={false}>{symbol.toUpperCase()}</Option>
 							<Option value={true}>{pairBase}</Option>
@@ -264,6 +297,7 @@ class Orderbook extends Component {
 				<div
 					ref={this.setRefs('wrapper')}
 					className={classnames('trade_orderbook-content', 'f-1', 'overflow-y')}
+					style={{ visibility: positioned ? 'visible' : 'hidden' }}
 				>
 					<div
 						className={classnames(
diff --git a/web/src/containers/Trade/components/TradeBlockTabs.js b/web/src/containers/Trade/components/TradeBlockTabs.js
index d238e2e70a..4f99a0dcb2 100644
--- a/web/src/containers/Trade/components/TradeBlockTabs.js
+++ b/web/src/containers/Trade/components/TradeBlockTabs.js
@@ -50,7 +50,7 @@ class TradeBlockTabs extends Component {
 	renderContent = (maxHeight) => {
 		const { content, overflowY } = this.props;
 		const { activeTab, height } = this.state;
-		return height < maxHeight ? (
+		return height < maxHeight && false ? (
 			<div className="trade_block-wrapper trade_block_tabs-wrapper d-flex flex-column">
 				{this.renderTitles(activeTab, content)}
 				<div
diff --git a/web/src/containers/Trade/components/TradeHistory.js b/web/src/containers/Trade/components/TradeHistory.js
index e68e3627b8..7b6f61dd94 100644
--- a/web/src/containers/Trade/components/TradeHistory.js
+++ b/web/src/containers/Trade/components/TradeHistory.js
@@ -24,6 +24,7 @@ class TradeHistory extends Component {
 		data: [],
 		isprevious: false,
 		isBase: true,
+		isOpen: false,
 	};
 
 	componentWillMount() {
@@ -44,7 +45,10 @@ class TradeHistory extends Component {
 			this.generateData(this.props.data);
 		}
 
-		if (prevState.isBase !== this.state.isBase) {
+		if (
+			prevState.isBase !== this.state.isBase ||
+			prevState.isOpen !== this.state.isOpen
+		) {
 			this.calculateHeaders();
 		}
 	}
@@ -73,9 +77,13 @@ class TradeHistory extends Component {
 
 	onSelect = (isBase) => this.setState({ isBase });
 
+	dropdownVisibleChange = (isOpen) => {
+		this.setState({ isOpen });
+	};
+
 	generateHeaders = (pairs) => {
 		const { icons: ICONS, maxAmount } = this.props;
-		const { isBase } = this.state;
+		const { isBase, isOpen } = this.state;
 		const { coins, pairData } = this.props;
 		const pairBase = pairData.pair_base.toUpperCase();
 		const { symbol } = coins[pairData.pair_2] || DEFAULT_COIN_DATA;
@@ -83,7 +91,9 @@ class TradeHistory extends Component {
 		return [
 			{
 				key: 'price',
-				label: STRINGS['PRICE'],
+				label: (
+					<div className="d-flex justify-content-start">{STRINGS['PRICE']}</div>
+				),
 				renderCell: (
 					{ side, price = 0, isSameBefore, upDownRate, timestamp },
 					index
@@ -110,21 +120,30 @@ class TradeHistory extends Component {
 			{
 				key: 'size',
 				label: (
-					<div>
-						{STRINGS['SIZE']}
-						<Select
-							bordered={false}
-							defaultValue={false}
-							size="small"
-							suffixIcon={<CaretDownOutlined />}
-							value={isBase}
-							onSelect={this.onSelect}
-							className="custom-select-input-style order-entry no-border"
-							dropdownClassName="custom-select-style"
-						>
-							<Option value={false}>{symbol.toUpperCase()}</Option>
-							<Option value={true}>{pairBase}</Option>
-						</Select>
+					<div className="d-flex align-items-baseline content-center public-history__header">
+						<div>{STRINGS['SIZE']}</div>
+						<div>
+							<Select
+								bordered={false}
+								defaultValue={false}
+								size="small"
+								suffixIcon={
+									<CaretDownOutlined
+										onClick={() => this.dropdownVisibleChange(!isOpen)}
+									/>
+								}
+								value={isBase}
+								onSelect={this.onSelect}
+								open={isOpen}
+								onDropdownVisibleChange={this.dropdownVisibleChange}
+								className="custom-select-input-style order-entry no-border"
+								dropdownClassName="custom-select-style trade-select-option-wrapper"
+								dropdownStyle={{ minWidth: '7rem' }}
+							>
+								<Option value={false}>{symbol.toUpperCase()}</Option>
+								<Option value={true}>{pairBase}</Option>
+							</Select>
+						</div>
 					</div>
 				),
 				renderCell: ({ size = 0, side, sizePrice = 0 }, index) => {
@@ -146,7 +165,9 @@ class TradeHistory extends Component {
 			},
 			{
 				key: 'timestamp',
-				label: STRINGS['TIME'],
+				label: (
+					<div className="d-flex justify-content-end">{STRINGS['TIME']}</div>
+				),
 				renderCell: ({ timestamp, side }, index) => (
 					<div
 						className={classnames('trade_history-row', side)}
@@ -162,11 +183,11 @@ class TradeHistory extends Component {
 	render() {
 		const { data } = this.state;
 		return (
-			<div className="apply_rtl trade_history-wrapper">
+			<div className="flex-auto d-flex  apply_rtl trade_history-wrapper">
 				<DisplayTable
 					headers={this.state.headers}
 					data={data}
-					rowClassName="trade_history-row-wrapper"
+					// rowClassName="trade_history-row-wrapper"
 				/>
 			</div>
 		);
diff --git a/web/src/containers/Trade/components/UserTrades.js b/web/src/containers/Trade/components/UserTrades.js
index 15c97fe9a4..9b9a0b2bf9 100644
--- a/web/src/containers/Trade/components/UserTrades.js
+++ b/web/src/containers/Trade/components/UserTrades.js
@@ -1,25 +1,26 @@
 import React from 'react';
 
 import { Table } from '../../../components';
-import {
-	generateTradeHeaders,
-	generateLessTradeHeaders,
-} from '../../TransactionsHistory/utils';
+import { generateRecentTradeHeaders } from '../../TransactionsHistory/utils';
 
 const ActiveOrders = ({
 	trades,
 	pairData,
 	pair,
 	pairs,
-	lessHeaders,
+	/*lessHeaders,*/
 	pageSize,
 	coins,
 	discount,
 	prices,
 }) => {
-	const headers = lessHeaders
-		? generateLessTradeHeaders(pairData.pair_base, pairs, coins, discount)
-		: generateTradeHeaders(pairData.pair_base, pairs, coins, discount, prices);
+	const headers = generateRecentTradeHeaders(
+		pairData.pair_base,
+		pairs,
+		coins,
+		discount,
+		prices
+	);
 	if (!pair) {
 		return <div />;
 	}
diff --git a/web/src/containers/Trade/components/_OrderEntry.scss b/web/src/containers/Trade/components/_OrderEntry.scss
index 4ad1897b50..5eb1d046ee 100644
--- a/web/src/containers/Trade/components/_OrderEntry.scss
+++ b/web/src/containers/Trade/components/_OrderEntry.scss
@@ -10,8 +10,6 @@
 	.trade_order_entry-selector {
 		border-top: 1px solid $trade-section-border--color;
 		position: relative;
-		width: 60% !important;
-		margin-left: 40% !important;
 
 		> div {
 			line-height: 2rem;
@@ -115,6 +113,9 @@
 		.ant-collapse-content-box {
 			padding: 0;
 		}
+		.underline-text {
+			font-size: 11px;
+		}
 	}
 }
 
@@ -125,6 +126,11 @@
 	&.order_side-selector-buy {
 		@include entry_form($buy, $colors-deactivate-color1, $buy-bids-text);
 	}
+	.post-only-txt {
+		font-size: 1rem;
+		color: $colors-deactivate-color2;
+		cursor: pointer;
+	}
 }
 
 .risky-trade-wrapper {
@@ -180,11 +186,6 @@
 		font-size: $font-size-mobile-txt !important;
 	}
 	.trade_orderbook-wrapper {
-		.trade_orderbook-headers {
-			.trade_orderbook-cell {
-				font-size: $font-size-mobile-innertxt !important;
-			}
-		}
 		.trade_asks-limit_bar {
 			.orderbook-limit_bar-wrapper {
 				.orderbook-limit_bar-text {
diff --git a/web/src/containers/Trade/components/_Orderbook.scss b/web/src/containers/Trade/components/_Orderbook.scss
index c3a3e2b496..3d90e8887b 100644
--- a/web/src/containers/Trade/components/_Orderbook.scss
+++ b/web/src/containers/Trade/components/_Orderbook.scss
@@ -1,26 +1,74 @@
 .trade_orderbook-wrapper {
-	height: 84vh;
+	height: 49vh;
+	.trade_orderbook-headers {
+		.trade_orderbook-cell {
+			font-size: $font-size-subtext !important;
+			flex-direction: column;
+			.custom-select-input-style {
+				font-size: 1rem !important;
+				max-width: 8rem;
+				.ant-select-selector {
+					height: 1.5rem !important;
+					line-height: 1.5rem !important;
+					padding: 0;
+					font-size: $font-size-subtext !important;
+				}
+				.ant-select-selection-item {
+					height: 1.5rem !important;
+					line-height: 1.5rem !important;
+					font-weight: bold;
+				}
+				.ant-select-arrow {
+					right: 2px;
+				}
+			}
+		}
+	}
 	.trade_orderbook-cell {
 		padding: 0 0.25rem;
 		.ant-select-arrow {
 			color: $colors-main-black;
+			z-index: 1;
 		}
-		&:not(.trade_orderbook-cell_total) {
-			&:hover {
-				color: $colors-main-black;
-			}
+		// &:not(.trade_orderbook-cell_total) {
+		// 	&:hover {
+		// 		color: $colors-main-black;
+		// 	}
+		// }
+		.ant-select-single.ant-select-sm:not(.ant-select-customize-input)
+			.ant-select-selector {
+			padding-right: 0;
 		}
 	}
 
 	.price-row-wrapper {
 		margin: 1px 0;
 		text-align: right;
+
+		.trade_orderbook-cell-price {
+			text-align: left;
+		}
+		.trade_orderbook-cell-amount {
+			text-align: right;
+		}
+		.trade_orderbook-cell-amount {
+			color: $orderbook-text;
+		}
+		.trade_orderbook-cell_total {
+			color: $orderbook-secondary-text;
+		}
+		.trade_orderbook-cell-price:hover,
+		.trade_orderbook-cell-amount:hover,
+		.trade_orderbook-cell_total:hover {
+			color: $colors-main-black !important;
+		}
 	}
 
 	.fill {
 		background-repeat: no-repeat;
-		background-position: 0 0;
+		// background-position: 0 0;
 		background-size: 0;
+		background-position: right;
 	}
 
 	.fill-bid {
@@ -44,8 +92,9 @@
 	.trade_orderbook-headers {
 		font-weight: bold;
 		border-bottom: 1px solid $colors-border;
-		text-transform: uppercase;
+		text-transform: capitalize;
 		min-height: 1.5rem;
+		font-size: 0.85rem;
 
 		.waves-icon {
 			width: 3rem;
@@ -55,7 +104,7 @@
 	.trade_orderbook-content {
 		.trade_orderbook-spread {
 			flex: 0;
-			min-height: 6rem;
+			min-height: 4rem;
 			color: $colors-deactivate-color2;
 			// font-size: $font-size-main;
 			padding: 0 0.25rem;
@@ -79,6 +128,22 @@
 				min-height: 1.5rem;
 			}
 		}
+		.trade_orderbook-bids {
+			.trade_orderbook-cell-price {
+				color: $buy;
+			}
+			.price-row-wrapper:hover {
+				background-color: $buying-orderbook-hover;
+			}
+		}
+		.trade_orderbook-asks {
+			.trade_orderbook-cell-price {
+				color: $sell;
+			}
+			.price-row-wrapper:hover {
+				background-color: $selling-orderbook-hover;
+			}
+		}
 	}
 
 	.trade_asks-limit_bar {
@@ -95,13 +160,21 @@
 	}
 
 	.trade_orderbook-asks > .price-row-wrapper:first-child {
-		color: $colors-main-black;
+		// color: $colors-main-black;
+		background-color: $selling-orderbook-best-bar;
 		font-weight: bold;
+		.trade_orderbook-cell-price {
+			color: $orderbook-text;
+		}
 	}
 
 	.trade_orderbook-bids > .price-row-wrapper:first-child {
-		color: $colors-main-black;
+		// color: $colors-main-black;
+		background-color: $buying-orderbook-best-bar;
 		font-weight: bold;
+		.trade_orderbook-cell-price {
+			color: $orderbook-text;
+		}
 	}
 
 	.trade_orderbook-bids {
@@ -125,7 +198,17 @@
 		}
 	}
 }
+.trade-select-option-wrapper {
+	.ant-select-item,
+	.ant-select-item-option-content {
+		font-size: 11px;
+	}
+}
 
+.order-book-select-coin .ant-select-item,
+.order-book-select-coin .ant-select-item-option {
+	font-size: 0.8rem;
+}
 .trade_orderbook-depth-selector {
 	padding: 4px;
 	.ant-btn-text {
diff --git a/web/src/containers/Trade/components/_TradeBlock.scss b/web/src/containers/Trade/components/_TradeBlock.scss
index e557319d79..ec733c209b 100644
--- a/web/src/containers/Trade/components/_TradeBlock.scss
+++ b/web/src/containers/Trade/components/_TradeBlock.scss
@@ -1,8 +1,14 @@
 $tabs-title--margin: 2rem;
 .trade__active-orders_cancel-All {
+	position: relative;
+	min-height: 2rem;
 	min-width: 6rem;
 }
 
+.trade__active-orders-header_cancel-All {
+	position: relative;
+}
+
 .trade_cancel-All-confirmation {
 	.ant-modal-header,
 	.ant-modal-content,
@@ -51,10 +57,12 @@ $tabs-title--margin: 2rem;
 
 .trade_block-wrapper {
 	padding: 1rem;
-	flex: 1;
+	// border: 1px solid $colors-main-border;
+	margin: 6px 3px 3px 3px;
+	background-color: $app-sidebar-background;
 
 	.trade_block-title {
-		border-top: $trade_title-border--size solid $trade_title-border--color;
+		// border-top: $trade_title-border--size solid $trade_title-border--color;
 		text-transform: uppercase;
 		font-weight: bold;
 		margin-bottom: 1rem;
@@ -78,7 +86,11 @@ $tabs-title--margin: 2rem;
 		font-size: $trade-font-size;
 		overflow-y: scroll;
 		height: 100%;
-		transform: translateY(-1rem);
+		.sidebar_hub-content {
+			min-height: 42vh;
+			max-height: 56vh;
+			overflow-y: auto;
+		}
 	}
 }
 
@@ -138,13 +150,16 @@ $tabs-title--margin: 2rem;
 }
 
 .trade_history-wrapper {
-	height: 84vh;
+	height: 49vh;
 
 	.display_table-wrapper {
 		.display_table-header {
 			:nth-child(2) {
 				text-align: center;
 			}
+			.ant-select-arrow {
+				z-index: 1;
+			}
 		}
 
 		.display_table-body {
diff --git a/web/src/containers/Trade/index.js b/web/src/containers/Trade/index.js
index ce58049161..583158a8a8 100644
--- a/web/src/containers/Trade/index.js
+++ b/web/src/containers/Trade/index.js
@@ -34,16 +34,18 @@ import TVChartContainer from './ChartContainer';
 import OrdersWrapper from './components/OrdersWrapper';
 import { AddTradeTabs } from 'containers';
 
-import { Loader, MobileBarTabs } from '../../components';
+import { Loader, MobileBarTabs, SidebarHub } from '../../components';
 
 import STRINGS from '../../config/localizedStrings';
 import { playBackgroundAudioNotification } from '../../utils/utils';
+import withConfig from 'components/ConfigProvider/withConfig';
 
 class Trade extends PureComponent {
 	constructor(props) {
 		super(props);
 		this.state = {
 			wsInitialized: false,
+			orderbookFetched: false,
 			orderbookWs: null,
 			activeTab: 0,
 			chartHeight: 0,
@@ -86,24 +88,15 @@ class Trade extends PureComponent {
 			this.props.getUserTrades(symbol);
 		}
 		this.props.changePair(symbol);
-		this.setState({ symbol: '' }, () => {
+		this.setState({ symbol: '', orderbookFetched: false }, () => {
 			setTimeout(() => {
 				this.setState({ symbol });
 			}, 1000);
 		});
 	};
 
-	onSubmitOrder = ({ post_only, order_type, stop, ...values }) => {
-		if (post_only) {
-			values.meta = {
-				post_only,
-			};
-		}
-
-		return submitOrder({
-			...values,
-			...(order_type === 'stops' ? { stop } : {}),
-		})
+	onSubmitOrder = (values) => {
+		return submitOrder(values)
 			.then((body) => {})
 			.catch((err) => {
 				const _error =
@@ -237,6 +230,7 @@ class Trade extends PureComponent {
 						delete tempData.data;
 						this.orderCache = { ...this.orderCache, ...tempData };
 						this.storeOrderData(this.orderCache);
+						this.setState({ orderbookFetched: true });
 						break;
 
 					default:
@@ -301,8 +295,9 @@ class Trade extends PureComponent {
 			coins,
 			discount,
 			fees,
+			icons,
 		} = this.props;
-		const { chartHeight, symbol, activeTab } = this.state;
+		const { chartHeight, symbol, activeTab, orderbookFetched } = this.state;
 
 		if (symbol !== pair || !pairData) {
 			return <Loader background={false} />;
@@ -317,6 +312,7 @@ class Trade extends PureComponent {
 			coins,
 			onPriceClick: this.onPriceClick,
 			onAmountClick: this.onAmountClick,
+			orderbookFetched,
 		};
 
 		const mobileTabs = [
@@ -381,13 +377,14 @@ class Trade extends PureComponent {
 				{isMobile ? (
 					<div className="">
 						<MobileBarTabs
-							showMarketSelector={true}
+							showMarketSelector={activeTab !== 3}
 							tabs={mobileTabs}
 							activeTab={activeTab}
 							setActiveTab={this.setActiveTab}
 							pair={pair}
 							goToPair={this.goToPair}
 							goToMarkets={() => this.setActiveTab(3)}
+							icons={icons}
 						/>
 						<div className="content-with-bar d-flex">
 							{mobileTabs[activeTab].content}
@@ -396,24 +393,6 @@ class Trade extends PureComponent {
 				) : (
 					<div className={classnames('trade-container', 'd-flex')}>
 						<EventListener target="window" onResize={this.onResize} />
-						<div
-							className={classnames(
-								'trade-col_side_wrapper',
-								'flex-column',
-								'd-flex',
-								'apply_rtl'
-							)}
-						>
-							<TradeBlock
-								stringId="ORDERBOOK"
-								isLoggedIn={isLoggedIn()}
-								title={STRINGS['ORDERBOOK']}
-								pairData={pairData}
-								pair={pair}
-							>
-								{orderbookReady && <Orderbook {...orderbookProps} />}
-							</TradeBlock>
-						</div>
 						<div
 							className={classnames(
 								'trade-col_main_wrapper',
@@ -430,33 +409,6 @@ class Trade extends PureComponent {
 									'd-flex'
 								)}
 							>
-								<div
-									className={classnames(
-										'trade-col_action_wrapper',
-										'flex-column',
-										'd-flex',
-										'apply_rtl'
-									)}
-								>
-									<TradeBlock
-										stringId="ORDER_ENTRY"
-										title={STRINGS['ORDER_ENTRY']}
-										pairData={pairData}
-										pair={pair}
-									>
-										<OrderEntry
-											submitOrder={this.onSubmitOrder}
-											openCheckOrder={this.openCheckOrder}
-											onRiskyTrade={this.onRiskyTrade}
-											symbol={symbol}
-											balance={balance}
-											fees={fees}
-											showPopup={settings.notification.popup_order_confirmation}
-											setPriceRef={this.setPriceRef}
-											setSizeRef={this.setSizeRef}
-										/>
-									</TradeBlock>
-								</div>
 								<TradeBlock
 									stringId="CHART"
 									title={STRINGS['CHART']}
@@ -504,6 +456,15 @@ class Trade extends PureComponent {
 								'apply_rtl'
 							)}
 						>
+							<TradeBlock
+								stringId="ORDERBOOK"
+								isLoggedIn={isLoggedIn()}
+								title={STRINGS['ORDERBOOK']}
+								pairData={pairData}
+								pair={pair}
+							>
+								{orderbookReady && <Orderbook {...orderbookProps} />}
+							</TradeBlock>
 							<TradeBlock
 								stringId="PUBLIC_SALES"
 								title={STRINGS['PUBLIC_SALES']}
@@ -513,6 +474,41 @@ class Trade extends PureComponent {
 								<TradeHistory pairData={pairData} language={activeLanguage} />
 							</TradeBlock>
 						</div>
+
+						<div
+							className={classnames(
+								'trade-col_action_wrapper',
+								'flex-column',
+								'd-flex',
+								'apply_rtl'
+							)}
+						>
+							<TradeBlock
+								stringId="ORDER_ENTRY"
+								title={STRINGS['ORDER_ENTRY']}
+								pairData={pairData}
+								pair={pair}
+							>
+								<OrderEntry
+									submitOrder={this.onSubmitOrder}
+									openCheckOrder={this.openCheckOrder}
+									onRiskyTrade={this.onRiskyTrade}
+									symbol={symbol}
+									balance={balance}
+									fees={fees}
+									showPopup={settings.notification.popup_order_confirmation}
+									setPriceRef={this.setPriceRef}
+									setSizeRef={this.setSizeRef}
+								/>
+							</TradeBlock>
+							<TradeBlock title={STRINGS.WALLET_TITLE} className="f-1">
+								<SidebarHub
+									isLogged={isLoggedIn()}
+									pair={pair}
+									theme={activeTheme}
+								/>
+							</TradeBlock>
+						</div>
 					</div>
 				)}
 			</div>
@@ -575,4 +571,4 @@ const mapDispatchToProps = (dispatch) => ({
 	setOrderbooks: bindActionCreators(setOrderbooks, dispatch),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(Trade);
+export default connect(mapStateToProps, mapDispatchToProps)(withConfig(Trade));
diff --git a/web/src/containers/Trade/utils.js b/web/src/containers/Trade/utils.js
index 3b73444396..275946d09e 100644
--- a/web/src/containers/Trade/utils.js
+++ b/web/src/containers/Trade/utils.js
@@ -1,5 +1,6 @@
 import math from 'mathjs';
 import { createSelector } from 'reselect';
+import { getDecimals } from 'utils/utils';
 
 export const subtract = (a = 0, b = 0) => {
 	const remaining = math.chain(a).subtract(b).done();
@@ -27,11 +28,24 @@ const pushCumulativeAmounts = (orders) => {
 };
 
 const round = (number, depth) => {
-	let result = math.chain(number).divide(depth).round().multiply(depth).done();
+	const precision = getDecimals(depth);
+	let result = math
+		.chain(number)
+		.divide(depth)
+		.round()
+		.multiply(depth)
+		.round(precision)
+		.done();
 
 	// this is to prevent setting the price to 0
 	if (!result) {
-		result = math.chain(number).divide(depth).ceil().multiply(depth).done();
+		result = math
+			.chain(number)
+			.divide(depth)
+			.ceil()
+			.multiply(depth)
+			.round(precision)
+			.done();
 	}
 
 	return result;
@@ -63,8 +77,8 @@ const getDepth = (state) => state.orderbook.depth;
 
 export const orderbookSelector = createSelector(
 	[getPairsOrderBook, getPair, getOrderBookLevels, getPairs, getDepth],
-	(pairsOrders, pair, level, pairs, depthLevel) => {
-		const { increment_price } = pairs[pair] || {};
+	(pairsOrders, pair, level, pairs, depthLevel = 1) => {
+		const { increment_price = 1 } = pairs[pair] || {};
 		const { asks: rawAsks = [], bids: rawBids = [] } = pairsOrders[pair] || {};
 
 		const depth = math.multiply(depthLevel, increment_price);
@@ -122,3 +136,43 @@ export const userTradesSelector = createSelector(
 		return filtered;
 	}
 );
+
+const getSide = (_, { side }) => side;
+const getSize = (_, { size }) => (!!size ? size : 0);
+
+const calculateMarketPrice = (orderSize = 0, orders = []) =>
+	orders.reduce(
+		([accumulatedPrice, accumulatedSize], [price = 0, size = 0]) => {
+			if (math.larger(orderSize, accumulatedSize)) {
+				const remainingSize = math.subtract(orderSize, accumulatedSize);
+				if (math.largerEq(remainingSize, size)) {
+					return [
+						math.sum(accumulatedPrice, math.multiply(size, price)),
+						math.sum(accumulatedSize, size),
+					];
+				} else {
+					return [
+						math.sum(accumulatedPrice, math.multiply(remainingSize, price)),
+						math.sum(accumulatedSize, remainingSize),
+					];
+				}
+			} else {
+				return [accumulatedPrice, accumulatedSize];
+			}
+		},
+		[0, 0]
+	);
+
+export const estimatedMarketPriceSelector = createSelector(
+	[getPairsOrderBook, getPair, getSide, getSize],
+	(pairsOrders, pair, side, size) => {
+		const { [side === 'buy' ? 'asks' : 'bids']: orders = [] } =
+			pairsOrders[pair] || {};
+		const totalOrders = sumQuantities(orders);
+		if (math.larger(size, totalOrders)) {
+			return [0, size];
+		} else {
+			return calculateMarketPrice(size, orders);
+		}
+	}
+);
diff --git a/web/src/containers/TradeTabs/components/MarketCard.js b/web/src/containers/TradeTabs/components/MarketCard.js
index 2bee9b6569..ced06919f6 100644
--- a/web/src/containers/TradeTabs/components/MarketCard.js
+++ b/web/src/containers/TradeTabs/components/MarketCard.js
@@ -105,7 +105,7 @@ class MarketCard extends Component {
 								</Transition>
 							</div>
 							<div className="trade_tab-pair-volume">
-								{`${ticker.volume} ${symbol.toUpperCase()}`}
+								{ticker.volume && `${ticker.volume} ${symbol.toUpperCase()}`}
 							</div>
 						</div>
 					</div>
diff --git a/web/src/containers/TradeTabs/components/MarketList.js b/web/src/containers/TradeTabs/components/MarketList.js
index b1de43acb4..e5ed12b13c 100644
--- a/web/src/containers/TradeTabs/components/MarketList.js
+++ b/web/src/containers/TradeTabs/components/MarketList.js
@@ -10,22 +10,65 @@ import {
 	func,
 } from 'prop-types';
 
+import { Paginator } from 'components';
 import STRINGS from 'config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
 import MarketRow from './MarketRow';
+import { EditWrapper } from 'components';
 
-const MarketList = ({ markets, handleClick, chartData, icons: ICONS }) => {
+const MarketList = ({
+	markets,
+	handleClick,
+	chartData,
+	icons: ICONS,
+	page,
+	pageSize,
+	count,
+	goToNextPage,
+	goToPreviousPage,
+	showPaginator = false,
+}) => {
 	return (
 		<div className="market-list__container">
 			<div className="market-list__block">
 				<table className="market-list__block-table">
 					<thead>
 						<tr className="table-bottom-border">
-							<th>Amount</th>
-							<th>{STRINGS['PRICE']}</th>
-							<th>24h Change</th>
-							<th>24h Volume</th>
-							<th>24 Price Graph</th>
+							<th className="sticky-col">
+								<div>
+									<EditWrapper stringId="MARKETS_TABLE.MARKETS">
+										{STRINGS['MARKETS_TABLE.MARKETS']}
+									</EditWrapper>
+								</div>
+							</th>
+							<th>
+								<div>
+									<EditWrapper stringId="MARKETS_TABLE.LAST_PRICE">
+										{STRINGS['MARKETS_TABLE.LAST_PRICE']}
+									</EditWrapper>
+								</div>
+							</th>
+							<th>
+								<div>
+									<EditWrapper stringId="MARKETS_TABLE.CHANGE_24H">
+										{STRINGS['MARKETS_TABLE.CHANGE_24H']}
+									</EditWrapper>
+								</div>
+							</th>
+							<th>
+								<div>
+									<EditWrapper stringId="MARKETS_TABLE.VOLUME_24h">
+										{STRINGS['MARKETS_TABLE.VOLUME_24h']}
+									</EditWrapper>
+								</div>
+							</th>
+							<th>
+								<div>
+									<EditWrapper stringId="MARKETS_TABLE.CHART_24H">
+										{STRINGS['MARKETS_TABLE.CHART_24H']}
+									</EditWrapper>
+								</div>
+							</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -41,6 +84,15 @@ const MarketList = ({ markets, handleClick, chartData, icons: ICONS }) => {
 					</tbody>
 				</table>
 			</div>
+			{showPaginator && (
+				<Paginator
+					currentPage={page + 1}
+					pageSize={pageSize}
+					count={count}
+					goToPreviousPage={goToPreviousPage}
+					goToNextPage={goToNextPage}
+				/>
+			)}
 		</div>
 	);
 };
diff --git a/web/src/containers/TradeTabs/components/MarketRow.js b/web/src/containers/TradeTabs/components/MarketRow.js
index f1de0fb6ca..f2524b2de9 100644
--- a/web/src/containers/TradeTabs/components/MarketRow.js
+++ b/web/src/containers/TradeTabs/components/MarketRow.js
@@ -47,7 +47,7 @@ class MarketRow extends Component {
 				className="table-row table-bottom-border"
 				onClick={() => handleClick(key)}
 			>
-				<td>
+				<td className="sticky-col">
 					<div className="d-flex align-items-center">
 						<Image
 							iconId={
@@ -91,7 +91,7 @@ class MarketRow extends Component {
 					</Transition>
 				</td>
 				<td>{ticker.volume}</td>
-				<td style={{ width: '150px', height: '50px' }}>
+				<td className="td-chart">
 					<SparkLine
 						data={chartData[key] || []}
 						containerProps={{ style: { height: '100%', width: '100%' } }}
diff --git a/web/src/containers/TradeTabs/components/_MarketList.scss b/web/src/containers/TradeTabs/components/_MarketList.scss
index 9722b3d2df..d77bc5d44c 100644
--- a/web/src/containers/TradeTabs/components/_MarketList.scss
+++ b/web/src/containers/TradeTabs/components/_MarketList.scss
@@ -76,6 +76,10 @@
 					background-color: $app-light-background;
 					color: $colors-black;
 				}
+				.td-chart {
+					width: 150px;
+					height: 50px;
+				}
 			}
 
 			.table-bottom-border td,
@@ -113,6 +117,8 @@
 			.market-list__block-table {
 				th {
 					font-family: $raleway--font-family;
+					vertical-align: middle;
+					padding: 0.5rem;
 				}
 				th,
 				td {
@@ -147,3 +153,38 @@
 		}
 	}
 }
+
+.layout-mobile {
+	.market-list__container {
+		.market-list__block {
+			overflow-x: auto;
+			position: relative;
+			.market-list__block-table {
+				thead {
+					font-size: 1.3rem !important;
+				}
+				.table-row {
+					td {
+						padding: 0.5rem;
+						min-width: 10rem;
+					}
+					font-size: 1.3rem !important;
+					.td-chart {
+						min-width: 15rem;
+						padding: 0 !important;
+					}
+				}
+				.sticky-col {
+					position: -webkit-sticky;
+					position: sticky;
+					background-color: $app-sidebar-background;
+					left: 0;
+					width: 12rem !important;
+					min-width: 12rem !important;
+					max-width: 12rem !important;
+					z-index: 1;
+				}
+			}
+		}
+	}
+}
diff --git a/web/src/containers/TradeTabs/index.js b/web/src/containers/TradeTabs/index.js
index 23af673016..6dfb4f4d65 100644
--- a/web/src/containers/TradeTabs/index.js
+++ b/web/src/containers/TradeTabs/index.js
@@ -3,6 +3,7 @@ import { connect } from 'react-redux';
 import { Link } from 'react-router';
 import { getSparklines } from 'actions/chartAction';
 import { isMobile } from 'react-device-detect';
+import math from 'mathjs';
 
 import MarketCards from './components/MarketCards';
 import MarketList from './components/MarketList';
@@ -54,9 +55,11 @@ class AddTradeTab extends Component {
 		const { pageSize } = this.state;
 		const pairs = searchValue ? this.getSearchPairs(searchValue) : pairval;
 		const pairKeys = Object.keys(pairs).sort((a, b) => {
-			let tickA = tickers[a] || {};
-			let tickB = tickers[b] || {};
-			return tickB.volume - tickA.volume;
+			const { volume: volumeA = 0, close: closeA = 0 } = tickers[a] || {};
+			const { volume: volumeB = 0, close: closeB = 0 } = tickers[b] || {};
+			const marketCapA = math.multiply(volumeA, closeA);
+			const marketCapB = math.multiply(volumeB, closeB);
+			return marketCapB - marketCapA;
 		});
 		const count = pairKeys.length;
 		const initItem = page * pageSize;
@@ -249,6 +252,12 @@ class AddTradeTab extends Component {
 								markets={processedData}
 								chartData={chartData}
 								handleClick={handleClick}
+								page={page}
+								pageSize={pageSize}
+								count={count}
+								goToNextPage={goToNextPage}
+								goToPreviousPage={goToPreviousPage}
+								showPaginator={true}
 							/>
 						) : (
 							<MarketCards
diff --git a/web/src/containers/TransactionsHistory/HistoryDisplay.js b/web/src/containers/TransactionsHistory/HistoryDisplay.js
index e1834aefd0..a9d9500fb1 100644
--- a/web/src/containers/TransactionsHistory/HistoryDisplay.js
+++ b/web/src/containers/TransactionsHistory/HistoryDisplay.js
@@ -98,6 +98,7 @@ const HistoryDisplay = (props) => {
 				<Loader />
 			) : (
 				<Table
+					className="transactions-history-table"
 					data={data}
 					count={count}
 					headers={headers}
diff --git a/web/src/containers/TransactionsHistory/_Filters.scss b/web/src/containers/TransactionsHistory/_Filters.scss
index 104d9183dd..6903c1df7e 100644
--- a/web/src/containers/TransactionsHistory/_Filters.scss
+++ b/web/src/containers/TransactionsHistory/_Filters.scss
@@ -83,5 +83,28 @@
 			color: $colors-main-black;
 			border-color: $colors-main-black;
 		}
+
+		&.active_search_button {
+			animation: shine 2s linear infinite alternate;
+			animation-fill-mode: both;
+			color: $colors-black;
+			box-shadow: 0 0 8px 0.1px $app-sidebar-background;
+			position: relative;
+		}
+	}
+}
+
+@keyframes shine {
+	10% {
+		color: $colors-black;
+		box-shadow: 0 0 8px 0.1px $app-sidebar-background;
+		transition-property: color, box-shadow;
+		transition-duration: 0.7s, 0.7s;
+		transition-timing-function: ease;
+	}
+	100% {
+		color: $colors-main-black;
+		box-shadow: 0 0 8px 0.1px $colors-black;
+		transition-property: color, box-shadow;
 	}
 }
diff --git a/web/src/containers/TransactionsHistory/_TransactionsHistory.scss b/web/src/containers/TransactionsHistory/_TransactionsHistory.scss
index 7a41c93394..5e270d75f9 100644
--- a/web/src/containers/TransactionsHistory/_TransactionsHistory.scss
+++ b/web/src/containers/TransactionsHistory/_TransactionsHistory.scss
@@ -9,6 +9,7 @@
 		height: calc(100% - 4.5rem);
 		.history_block-wrapper {
 			max-height: calc(100% - 1rem);
+			overflow-x: scroll;
 
 			.table-content {
 				overflow-x: scroll;
@@ -31,6 +32,39 @@
 			min-height: 2rem !important;
 		}
 	}
+
+	.table_container {
+		.table-content {
+			&.transactions-history-table {
+				overflow-x: auto;
+				position: relative;
+				thead,
+				td {
+					font-size: 1.2rem !important;
+				}
+				td {
+					padding: 0.5rem;
+					min-width: 9rem;
+				}
+
+				.sticky-col {
+					&.coin-cell {
+						width: 12rem !important;
+						min-width: 12rem !important;
+						max-width: 12rem !important;
+					}
+					position: -webkit-sticky;
+					position: sticky;
+					background-color: $app-sidebar-background;
+					left: 0;
+					width: 10rem !important;
+					min-width: 10rem !important;
+					max-width: 10rem !important;
+					z-index: 1;
+				}
+			}
+		}
+	}
 }
 
 .icon-cell {
@@ -95,6 +129,9 @@
 
 .history_block-wrapper {
 	position: relative;
+	background-color: $app-sidebar-background;
+	padding: 20px;
+	margin: 20px 0;
 
 	.action_notification-svg svg {
 		width: 1.2rem !important;
@@ -124,6 +161,22 @@
 	.check-deposit-txt {
 		right: 100px !important;
 	}
+	.loader_wrapper {
+		top: 0;
+		left: 0;
+	}
+	.table-wrapper {
+		.table_body-wrapper.with_icon {
+			tr td:first-child {
+				border-top: 1px solid $colors-border !important;
+				border-bottom: 1px solid $colors-border !important;
+			}
+			.coin-icons {
+				width: 30px;
+				padding-top: 4px;
+			}
+		}
+	}
 }
 
 .action_notification-svg svg {
@@ -147,6 +200,13 @@
 			fill: $colors-black;
 		}
 	}
+	.icon_title-wrapper {
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+	.with_border_top {
+		border-top: none !important;
+	}
 }
 .display_table-wrapper {
 	.display_table-cell {
diff --git a/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js b/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js
index ad4bb5507f..83918d5fdd 100644
--- a/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js
+++ b/web/src/containers/TransactionsHistory/components/DepositAndWithdrawlFilters.js
@@ -53,7 +53,7 @@ const Filters = ({ coins = {}, onSearch, formName }) => {
 							width: 100,
 						}}
 						size="small"
-						className="custom-select-input-style no-border elevated"
+						className="custom-select-input-style elevated"
 						dropdownClassName="custom-select-style"
 						bordered={false}
 						suffixIcon={<CaretDownOutlined />}
@@ -80,7 +80,7 @@ const Filters = ({ coins = {}, onSearch, formName }) => {
 							width: 100,
 						}}
 						size="small"
-						className="custom-select-input-style no-border elevated"
+						className="custom-select-input-style elevated"
 						dropdownClassName="custom-select-style"
 						bordered={false}
 						suffixIcon={<CaretDownOutlined />}
diff --git a/web/src/containers/TransactionsHistory/components/TradeAndOrderFilters.js b/web/src/containers/TransactionsHistory/components/TradeAndOrderFilters.js
index 843c30c1ba..c285c4f8ea 100644
--- a/web/src/containers/TransactionsHistory/components/TradeAndOrderFilters.js
+++ b/web/src/containers/TransactionsHistory/components/TradeAndOrderFilters.js
@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useState } from 'react';
+import classnames from 'classnames';
 import { Select, Form, Row, DatePicker, Button, Radio } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
 import { dateFilters } from '../filterUtils';
@@ -8,9 +9,11 @@ const { RangePicker } = DatePicker;
 
 const Filters = ({ pairs, onSearch, formName }) => {
 	const [form] = Form.useForm();
+	const [isSearchShining, setIsSearchShining] = useState(false);
 
 	const onFinish = (values) => {
 		onSearch(values);
+		setIsSearchShining(false);
 	};
 
 	const onValuesChange = ({ size }, _) => {
@@ -20,6 +23,7 @@ const Filters = ({ pairs, onSearch, formName }) => {
 			} = dateFilters;
 			form.setFieldsValue({ range });
 		}
+		setIsSearchShining(true);
 	};
 
 	return (
@@ -49,7 +53,7 @@ const Filters = ({ pairs, onSearch, formName }) => {
 							width: 100,
 						}}
 						size="small"
-						className="custom-select-input-style no-border elevated"
+						className="custom-select-input-style elevated"
 						dropdownClassName="custom-select-style"
 						bordered={false}
 						suffixIcon={<CaretDownOutlined />}
@@ -79,7 +83,12 @@ const Filters = ({ pairs, onSearch, formName }) => {
 					/>
 				</Form.Item>
 				<Form.Item>
-					<Button type="ghost" htmlType="submit" size="small">
+					<Button
+						type="ghost"
+						htmlType="submit"
+						size="small"
+						className={classnames({ active_search_button: isSearchShining })}
+					>
 						Search
 					</Button>
 				</Form.Item>
diff --git a/web/src/containers/TransactionsHistory/index.js b/web/src/containers/TransactionsHistory/index.js
index f61a347199..09a75ebfa1 100644
--- a/web/src/containers/TransactionsHistory/index.js
+++ b/web/src/containers/TransactionsHistory/index.js
@@ -17,7 +17,7 @@ import {
 	IconTitle,
 	TabController,
 	Loader,
-	CheckTitle,
+	// CheckTitle,
 	Dialog,
 	Button,
 	CurrencyBallWithPrice,
@@ -131,10 +131,10 @@ class TransactionsHistory extends Component {
 		} = this.props;
 
 		switch (activeTab) {
-			case 0:
+			case 1:
 				getOrdersHistory(RECORD_LIMIT, 1, { ...params, open: false });
 				break;
-			case 1:
+			case 0:
 				getUserTrades(RECORD_LIMIT, 1, params);
 				break;
 			case 2:
@@ -165,7 +165,7 @@ class TransactionsHistory extends Component {
 
 	generateHeaders(symbol, coins, discount, prices) {
 		const { withdrawalPopup } = this;
-		const { pairs } = this.props;
+		const { pairs, icons: ICONS } = this.props;
 		this.setState({
 			headers: {
 				orders: isMobile
@@ -174,8 +174,18 @@ class TransactionsHistory extends Component {
 				trades: isMobile
 					? generateTradeHeadersMobile(symbol, pairs, coins, discount)
 					: generateTradeHeaders(symbol, pairs, coins, discount, prices),
-				deposits: generateDepositsHeaders(symbol, coins, withdrawalPopup),
-				withdrawals: generateWithdrawalsHeaders(symbol, coins, withdrawalPopup),
+				deposits: generateDepositsHeaders(
+					symbol,
+					coins,
+					withdrawalPopup,
+					ICONS
+				),
+				withdrawals: generateWithdrawalsHeaders(
+					symbol,
+					coins,
+					withdrawalPopup,
+					ICONS
+				),
 			},
 		});
 	}
@@ -256,7 +266,7 @@ class TransactionsHistory extends Component {
 		const pageTemp = pageNumber % 2 === 0 ? 2 : 1;
 		const apiPageTemp = Math.floor((pageNumber + 1) / 2);
 		switch (this.state.activeTab) {
-			case 0:
+			case 1:
 				if (
 					RECORD_LIMIT === pageCount * pageTemp &&
 					apiPageTemp >= orders.page &&
@@ -269,7 +279,7 @@ class TransactionsHistory extends Component {
 					this.setState({ jumpToPage: pageNumber });
 				}
 				break;
-			case 1:
+			case 0:
 				if (
 					RECORD_LIMIT === pageCount * pageTemp &&
 					apiPageTemp >= trades.page &&
@@ -277,7 +287,6 @@ class TransactionsHistory extends Component {
 				) {
 					this.props.getUserTrades(RECORD_LIMIT, trades.page + 1, {
 						...params,
-						open: false,
 					});
 					this.setState({ jumpToPage: pageNumber });
 				}
@@ -331,7 +340,7 @@ class TransactionsHistory extends Component {
 		};
 
 		switch (activeTab) {
-			case 0:
+			case 1:
 				props.stringId = 'ORDER_HISTORY';
 				props.title = `${STRINGS['ORDER_HISTORY']}`;
 				props.headers = headers.orders;
@@ -343,7 +352,7 @@ class TransactionsHistory extends Component {
 				props.handleDownload = downloadUserOrders;
 				props.filters = filters.orders;
 				break;
-			case 1:
+			case 0:
 				props.stringId = 'TRANSACTION_HISTORY.TITLE_TRADES';
 				props.title = `${STRINGS['TRANSACTION_HISTORY.TITLE_TRADES']}`;
 				props.headers = headers.trades;
@@ -407,7 +416,7 @@ class TransactionsHistory extends Component {
 						stringId="TRANSACTION_HISTORY.TITLE"
 						text={STRINGS['TRANSACTION_HISTORY.TITLE']}
 						iconId="TRANSACTION_HISTORY"
-						iconPath={ICONS['TRANSACTION_HISTORY']}
+						iconPath={ICONS['TAB_HISTORY']}
 						textType="title"
 					/>
 				)}
@@ -415,50 +424,54 @@ class TransactionsHistory extends Component {
 					tabs={[
 						{
 							title: isMobile ? (
-								STRINGS['ORDER_HISTORY']
+								STRINGS['TRANSACTION_HISTORY.TRADES']
 							) : (
-								<CheckTitle
-									stringId="ORDER_HISTORY"
-									title={STRINGS['ORDER_HISTORY']}
-									iconId="TRADE_HISTORY"
-									icon={ICONS['TRADE_HISTORY']}
-								/>
+								// <CheckTitle
+								// 	stringId="TRANSACTION_HISTORY.TRADES"
+								// 	title={STRINGS['TRANSACTION_HISTORY.TRADES']}
+								// 	iconId="TRADE_HISTORY"
+								// 	icon={ICONS['TRADE_HISTORY']}
+								// />
+								<div>{STRINGS['TRANSACTION_HISTORY.TRADES']}</div>
 							),
 						},
 						{
 							title: isMobile ? (
-								STRINGS['TRANSACTION_HISTORY.TRADES']
+								STRINGS['ORDER_HISTORY']
 							) : (
-								<CheckTitle
-									stringId="TRANSACTION_HISTORY.TRADES"
-									title={STRINGS['TRANSACTION_HISTORY.TRADES']}
-									iconId="TRADE_HISTORY"
-									icon={ICONS['TRADE_HISTORY']}
-								/>
+								// <CheckTitle
+								// 	stringId="ORDER_HISTORY"
+								// 	title={STRINGS['ORDER_HISTORY']}
+								// 	iconId="TRADE_HISTORY"
+								// 	icon={ICONS['TRADE_HISTORY']}
+								// />
+								<div>{STRINGS['ORDER_HISTORY']}</div>
 							),
 						},
 						{
 							title: isMobile ? (
 								STRINGS['TRANSACTION_HISTORY.DEPOSITS']
 							) : (
-								<CheckTitle
-									stringId="TRANSACTION_HISTORY.DEPOSITS"
-									title={STRINGS['TRANSACTION_HISTORY.DEPOSITS']}
-									iconId="DEPOSIT_HISTORY"
-									icon={ICONS['DEPOSIT_HISTORY']}
-								/>
+								// <CheckTitle
+								// 	stringId="TRANSACTION_HISTORY.DEPOSITS"
+								// 	title={STRINGS['TRANSACTION_HISTORY.DEPOSITS']}
+								// 	iconId="DEPOSIT_HISTORY"
+								// 	icon={ICONS['DEPOSIT_HISTORY']}
+								// />
+								<div>{STRINGS['TRANSACTION_HISTORY.DEPOSITS']}</div>
 							),
 						},
 						{
 							title: isMobile ? (
 								STRINGS['TRANSACTION_HISTORY.WITHDRAWALS']
 							) : (
-								<CheckTitle
-									stringId="TRANSACTION_HISTORY.WITHDRAWALS"
-									title={STRINGS['TRANSACTION_HISTORY.WITHDRAWALS']}
-									iconId="WITHDRAW_HISTORY"
-									icon={ICONS['WITHDRAW_HISTORY']}
-								/>
+								// <CheckTitle
+								// 	stringId="TRANSACTION_HISTORY.WITHDRAWALS"
+								// 	title={STRINGS['TRANSACTION_HISTORY.WITHDRAWALS']}
+								// 	iconId="WITHDRAW_HISTORY"
+								// 	icon={ICONS['WITHDRAW_HISTORY']}
+								// />
+								<div>{STRINGS['TRANSACTION_HISTORY.WITHDRAWALS']}</div>
 							),
 						},
 					]}
diff --git a/web/src/containers/TransactionsHistory/utils.js b/web/src/containers/TransactionsHistory/utils.js
index 003176d0b4..eb195c58e2 100644
--- a/web/src/containers/TransactionsHistory/utils.js
+++ b/web/src/containers/TransactionsHistory/utils.js
@@ -7,14 +7,14 @@ import { isMobile } from 'react-device-detect';
 
 import STRINGS from '../../config/localizedStrings';
 
-import { CurrencyBall } from '../../components';
+import { Image } from '../../components';
 import {
 	EXPLORERS_ENDPOINT,
 	BASE_CURRENCY,
 	CURRENCY_PRICE_FORMAT,
 	DEFAULT_COIN_DATA,
 } from '../../config/constants';
-import { getFormatTimestamp, isBlockchainTx } from '../../utils/utils';
+import { getFormatTimestamp } from '../../utils/utils';
 import { formatToCurrency, formatBaseAmount } from 'utils/currency';
 
 notification.config({
@@ -69,11 +69,12 @@ export const generateOrderHistoryHeaders = (
 		{
 			stringId: 'PAIR',
 			label: STRINGS['PAIR'],
+			className: 'sticky-col',
 			key: 'pair',
 			exportToCsv: ({ symbol }) => symbol.toUpperCase(),
 			renderCell: ({ symbol }, key, index) => {
 				return (
-					<td key={index} className="text-uppercase">
+					<td key={index} className="text-uppercase sticky-col">
 						{symbol}
 					</td>
 				);
@@ -315,9 +316,10 @@ export const generateTradeHeaders = (
 			label: STRINGS['PAIR'],
 			key: 'pair',
 			exportToCsv: ({ symbol }) => symbol.toUpperCase(),
+			className: 'sticky-col',
 			renderCell: ({ symbol }, key, index) => {
 				return (
-					<td key={index} className="text-uppercase">
+					<td key={index} className="text-uppercase sticky-col">
 						{symbol}
 					</td>
 				);
@@ -330,7 +332,7 @@ export const generateTradeHeaders = (
 			exportToCsv: ({ side = '' }) => side,
 			renderCell: ({ side = '' }, key, index) => {
 				return (
-					<td key={index} className={classnames('cell_box-type')}>
+					<td key={index} className={classnames('cell_box-type recent-trades')}>
 						<div className={classnames(side)}>
 							{STRINGS[`SIDES_VALUES.${side}`]}
 						</div>
@@ -547,36 +549,49 @@ export const generateTradeHeaders = (
 export const generateWithdrawalsHeaders = (
 	symbol,
 	coins = {},
-	withdrawalPopup
+	withdrawalPopup,
+	ICONS
 ) => {
 	return [
-		{
-			label: '',
-			key: 'icon',
-			renderCell: ({ currency }, key, index) => {
-				const data = coins[currency] || DEFAULT_COIN_DATA;
-				return (
-					<td className={classnames('icon-cell')} key={index}>
-						<CurrencyBall
-							name={data.symbol.toUpperCase()}
-							symbol={currency}
-							size="s"
-						/>
-					</td>
-				);
-			},
-		},
+		// {
+		// 	label: '',
+		// 	key: 'icon',
+		// 	renderCell: ({ currency }, key, index) => {
+		// 		const data = coins[currency] || DEFAULT_COIN_DATA;
+		// 		return (
+		// 			<td className={classnames('icon-cell')} key={index}>
+		// 				<CurrencyBall
+		// 					name={data.symbol.toUpperCase()}
+		// 					symbol={currency}
+		// 					size="s"
+		// 				/>
+		// 			</td>
+		// 		);
+		// 	},
+		// },
 		{
 			stringId: 'CURRENCY',
 			label: STRINGS['CURRENCY'],
+			className: 'sticky-col',
 			key: 'currency',
 			exportToCsv: ({ currency }) => {
 				const { fullname } = coins[currency] || DEFAULT_COIN_DATA;
 				return fullname;
 			},
 			renderCell: ({ currency }, key, index) => {
-				const { fullname } = coins[currency] || DEFAULT_COIN_DATA;
-				return <td key={index}>{fullname}</td>;
+				const data = coins[currency] || DEFAULT_COIN_DATA;
+				return (
+					<td key={index} className="coin-cell sticky-col">
+						<div className="d-flex align-items-center">
+							<Image
+								iconId={`${data.symbol.toUpperCase()}_ICON`}
+								icon={ICONS[`${data.symbol.toUpperCase()}_ICON`]}
+								wrapperClassName="coin-icons"
+							/>
+							{data.fullname}
+						</div>
+					</td>
+				);
 			},
 		},
 		{
@@ -680,6 +695,7 @@ export const generateWithdrawalsHeaders = (
 					id,
 					amount,
 					type,
+					network,
 				},
 				key,
 				index
@@ -727,12 +743,13 @@ export const generateWithdrawalsHeaders = (
 					);
 				} else {
 					// Completed Status
-					return isBlockchainTx(transaction_id) &&
-						currency !== BASE_CURRENCY ? (
+					// return isBlockchainTx(transaction_id) &&
+					return network ? (
+						// currency !== BASE_CURRENCY ? (
 						<td key={index}>
 							<a
 								target="blank"
-								href={EXPLORERS_ENDPOINT(currency) + transaction_id}
+								href={EXPLORERS_ENDPOINT(network) + transaction_id}
 							>
 								{STRINGS['VIEW']}
 							</a>
@@ -782,6 +799,13 @@ export const generateLessTradeHeaders = (symbol, pairs, coins, discount) => {
 	);
 };
 
+export const generateRecentTradeHeaders = (symbol, pairs, coins, discount) => {
+	const KEYS = ['side', 'size', 'price', 'amount'];
+	return generateTradeHeaders(symbol, pairs, coins, discount).filter(
+		({ key }) => KEYS.indexOf(key) > -1
+	);
+};
+
 const getClassNameByStatus = (
 	status = false,
 	dismissed = false,
diff --git a/web/src/containers/UserSecurity/ChangePasswordForm.js b/web/src/containers/UserSecurity/ChangePasswordForm.js
index 79458ca980..520b8f5046 100644
--- a/web/src/containers/UserSecurity/ChangePasswordForm.js
+++ b/web/src/containers/UserSecurity/ChangePasswordForm.js
@@ -31,6 +31,7 @@ export const generateFormValues = () => ({
 				'ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.CURRENT_PASSWORD.placeholder'
 			],
 		fullWidth: isMobile,
+		ishorizontalfield: true,
 	},
 	new_password: {
 		type: 'password',
@@ -41,6 +42,7 @@ export const generateFormValues = () => ({
 		placeholder:
 			STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.NEW_PASSWORD.placeholder'],
 		fullWidth: isMobile,
+		ishorizontalfield: true,
 	},
 	new_password_confirm: {
 		type: 'password',
@@ -56,6 +58,7 @@ export const generateFormValues = () => ({
 				'ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.NEW_PASSWORD_REPEAT.placeholder'
 			],
 		fullWidth: isMobile,
+		ishorizontalfield: true,
 	},
 });
 
@@ -68,14 +71,19 @@ const Form = ({
 	initialValues,
 	formFields,
 }) => (
-	<form onSubmit={handleSubmit}>
-		{renderFields(formFields)}
-		{error && <div className="warning_text">{error}</div>}
-		<EditWrapper stringId="ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.BUTTON" />
-		<Button
-			label={STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.BUTTON']}
-			disabled={pristine || submitting || !valid}
-		/>
+	<form onSubmit={handleSubmit} className="change-password-form-wrapper">
+		<div className="change-password-form">
+			{renderFields(formFields)}
+			{error && <div className="warning_text">{error}</div>}
+		</div>
+		<div className="d-flex justify-content-center mb-4">
+			<EditWrapper stringId="ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.BUTTON" />
+			<Button
+				label={STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.FORM.BUTTON']}
+				disabled={pristine || submitting || !valid}
+				className="password-btn"
+			/>
+		</div>
 	</form>
 );
 
diff --git a/web/src/containers/UserSecurity/DeveloperSection.js b/web/src/containers/UserSecurity/DeveloperSection.js
index bfe8338b92..8d56f90659 100644
--- a/web/src/containers/UserSecurity/DeveloperSection.js
+++ b/web/src/containers/UserSecurity/DeveloperSection.js
@@ -130,5 +130,7 @@ export const DeveloperSection = ({ verification_level, ...rest }) => {
 	} else {
 		content = <ApiKeyContainer {...rest} />;
 	}
-	return <div className="mt-4 mb-4 apply_rtl">{content}</div>;
+	return (
+		<div className="mt-4 mb-4 apply_rtl dev-section-wrapper">{content}</div>
+	);
 };
diff --git a/web/src/containers/UserSecurity/OTP.js b/web/src/containers/UserSecurity/OTP.js
index 6b1369ae67..85135b5c5c 100644
--- a/web/src/containers/UserSecurity/OTP.js
+++ b/web/src/containers/UserSecurity/OTP.js
@@ -78,14 +78,16 @@ export const OTP = ({
 	children,
 	icons = {},
 }) => (
-	<div className="user_security-wrapper">
-		{!otp_enabled && (
-			<div className="warning_text">
-				<EditWrapper stringId="ACCOUNT_SECURITY.OTP.CONTENT.WARNING">
-					{STRINGS['ACCOUNT_SECURITY.OTP.CONTENT.WARNING']}
-				</EditWrapper>
-			</div>
-		)}
+	<div>
+		<div className={!otp_enabled ? 'user_security-wrapper' : ''}>
+			{!otp_enabled && (
+				<div className="warning_text">
+					<EditWrapper stringId="ACCOUNT_SECURITY.OTP.CONTENT.WARNING">
+						{STRINGS['ACCOUNT_SECURITY.OTP.CONTENT.WARNING']}
+					</EditWrapper>
+				</div>
+			)}
+		</div>
 		<CheckboxButton
 			stringId="ACCOUNT_SECURITY.OTP.CONTENT.ENABLE,ACCOUNT_SECURITY.OTP.CONTENT.DISABLE"
 			label={
diff --git a/web/src/containers/UserSecurity/_UserSecurity.scss b/web/src/containers/UserSecurity/_UserSecurity.scss
index 43e2dc9fbb..7710b2f732 100644
--- a/web/src/containers/UserSecurity/_UserSecurity.scss
+++ b/web/src/containers/UserSecurity/_UserSecurity.scss
@@ -1,4 +1,11 @@
 .user_security-wrapper {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	margin-top: 30px;
+	padding: 30px;
+	background-color: $app-sidebar-background;
 	> *:not(:last-child) {
 		margin-bottom: 2rem;
 	}
@@ -70,10 +77,10 @@
 	max-width: 5rem;
 }
 
-.tokens-tokenkey {
-	min-width: 15rem;
-	// max-width: 15rem;
-}
+// .tokens-tokenkey {
+// 	min-width: 15rem;
+// 	max-width: 15rem;
+// }
 
 .tokens-date {
 	min-width: 5rem;
@@ -171,18 +178,84 @@ $padding-input: 4rem;
 		width: 1.5rem;
 	}
 }
+.change-password-form,
+.dev-section-wrapper {
+	border-radius: 4px;
+	margin: 30px 0px 40px;
+	background-color: $app-sidebar-background;
+}
+
+.dev-section-wrapper {
+	padding: 30px;
+}
+
+.change-password-form-wrapper {
+	.change-password-form {
+		padding: 20px 60px 20px;
+		.field-content {
+			border-bottom: 1px solid;
+		}
+	}
+	.password-btn {
+		width: 300px;
+	}
+}
+
+.user-security-container {
+	.icon_title-wrapper {
+		display: flex;
+		justify-content: flex-start !important;
+		flex-direction: row;
+		align-items: center;
+	}
+}
 
 .layout-mobile {
 	.user_security-wrapper {
 		.warning_text {
 			font-size: $font-size-mobile-txt !important;
 		}
+		.checkbutton-wrapper {
+			.checkbutton-input-wrapper {
+				width: 240px !important;
+				.checkbutton-input-wrapper--label {
+					font-size: $font-size-mobile-txt;
+					color: $link;
+				}
+			}
+		}
 	}
-	.checkbutton-wrapper {
-		.checkbutton-input-wrapper {
-			.checkbutton-input-wrapper--label {
-				font-size: $font-size-mobile-txt;
-				color: $link;
+	.dev-section-wrapper {
+		padding: 5px;
+		.table-wrapper {
+			th,
+			td {
+				padding: 0;
+			}
+		}
+		.field-error-content {
+			.field-error-text {
+				margin-top: 10px;
+			}
+		}
+	}
+	.change-password-form-wrapper {
+		.change-password-form {
+			.field-label-wrapper {
+				flex-direction: column;
+				.field-label {
+					font-size: 10px;
+				}
+				.input-box-field {
+					padding: 4px;
+					height: 30px;
+					margin-top: 5px;
+				}
+			}
+			.input_field-input {
+				&::placeholder {
+					font-size: 10px;
+				}
 			}
 		}
 	}
@@ -212,3 +285,28 @@ $padding-input: 4rem;
 		}
 	}
 }
+
+@media (max-width: 1060px) {
+	.change-password-form-wrapper {
+		.change-password-form {
+			padding: 10px;
+			.field-label-wrapper {
+				.field-label {
+					font-size: 12px;
+				}
+			}
+			.input_field-input {
+				&::placeholder {
+					font-size: 12px;
+				}
+			}
+		}
+	}
+	.user-security-wrapper {
+		.tab_controller-tabs {
+			.tab_item {
+				font-size: 12px !important;
+			}
+		}
+	}
+}
diff --git a/web/src/containers/UserSecurity/index.js b/web/src/containers/UserSecurity/index.js
index a7ae3a529a..b9088fb252 100644
--- a/web/src/containers/UserSecurity/index.js
+++ b/web/src/containers/UserSecurity/index.js
@@ -12,9 +12,9 @@ import {
 	otpRevoke,
 } from '../../actions/userAction';
 import {
-	CustomTabs,
+	// CustomTabs,
 	CustomMobileTabs,
-	CustomTabBar,
+	// CustomTabBar,
 	MobileTabBar,
 	Dialog,
 	SuccessDisplay,
@@ -23,6 +23,7 @@ import {
 	Loader,
 	HeaderSection,
 	Button,
+	TabController,
 } from '../../components';
 import { errorHandler } from '../../components/OtpForm/utils';
 import ChangePasswordForm, { generateFormValues } from './ChangePasswordForm';
@@ -37,6 +38,7 @@ import { getUserLogins } from '../../actions/userAction';
 
 import STRINGS from '../../config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
+// import { ICONS } from 'config/constants';
 
 class UserVerification extends Component {
 	state = {
@@ -145,11 +147,12 @@ class UserVerification extends Component {
 						icon={ICONS.SETTING_NOTIFICATION_ICON}
 					/>
 				) : (
-					<CustomTabs
-						stringId={'ACCOUNT_SECURITY.OTP.TITLE'}
-						title={STRINGS['ACCOUNT_SECURITY.OTP.TITLE']}
-						icon={ICONS.SECURITY_OTP_ICON}
-					/>
+					// <CustomTabs
+					// 	stringId={'ACCOUNT_SECURITY.OTP.TITLE'}
+					// 	title={STRINGS['ACCOUNT_SECURITY.OTP.TITLE']}
+					// 	icon={ICONS.SECURITY_OTP_ICON}
+					// />
+					<div>{STRINGS['ACCOUNT_SECURITY.OTP.TITLE']}</div>
 				),
 				content: activeTab === 0 && (
 					<OTP
@@ -193,11 +196,12 @@ class UserVerification extends Component {
 						icon={ICONS.SECURITY_CHANGE_PASSWORD_ICON}
 					/>
 				) : (
-					<CustomTabs
-						stringId={'ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE'}
-						title={STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE']}
-						icon={ICONS.SECURITY_CHANGE_PASSWORD_ICON}
-					/>
+					// <CustomTabs
+					// 	stringId={'ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE'}
+					// 	title={STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE']}
+					// 	icon={ICONS.SECURITY_CHANGE_PASSWORD_ICON}
+					// />
+					<div>{STRINGS['ACCOUNT_SECURITY.CHANGE_PASSWORD.TITLE']}</div>
 				),
 				content: activeTab === 1 && (
 					<ChangePasswordForm
@@ -224,11 +228,12 @@ class UserVerification extends Component {
 						icon={ICONS.SECURITY_API_ICON}
 					/>
 				) : (
-					<CustomTabs
-						stringId={'DEVELOPER_SECTION.TITLE'}
-						title={STRINGS['DEVELOPER_SECTION.TITLE']}
-						icon={ICONS.SECURITY_API_ICON}
-					/>
+					// <CustomTabs
+					// 	stringId={'DEVELOPER_SECTION.TITLE'}
+					// 	title={STRINGS['DEVELOPER_SECTION.TITLE']}
+					// 	icon={ICONS.SECURITY_API_ICON}
+					// />
+					<div>{STRINGS['DEVELOPER_SECTION.TITLE']}</div>
 				),
 				content: activeTab === 2 && (
 					<DeveloperSection
@@ -452,6 +457,7 @@ class UserVerification extends Component {
 		}
 		const { dialogIsOpen, modalText, activeTab, tabs, freeze } = this.state;
 		const { otp, email, otp_enabled } = this.props.user;
+		const { icons: ICONS } = this.props;
 		//const { onCloseDialog } = this;
 
 		if (freeze === true) {
@@ -495,11 +501,13 @@ class UserVerification extends Component {
 			);
 		}
 		return (
-			<div>
+			<div className="user-security-container">
 				{!isMobile && (
 					<IconTitle
 						stringId="ACCOUNTS.TAB_SECURITY"
 						text={STRINGS['ACCOUNTS.TAB_SECURITY']}
+						iconId="TAB_SECURITY"
+						iconPath={ICONS['TAB_SECURITY']}
 						textType="title"
 					/>
 				)}
@@ -535,7 +543,7 @@ class UserVerification extends Component {
 				</Dialog>
 
 				{!isMobile ? (
-					<CustomTabBar
+					<TabController
 						activeTab={activeTab}
 						setActiveTab={this.setActiveTab}
 						tabs={tabs}
@@ -555,7 +563,7 @@ class UserVerification extends Component {
 }
 
 const mapStateToProps = (state) => ({
-	logins: state.wallet.deposits,
+	logins: state.wallet.logins,
 	user: state.user,
 	activeLanguage: state.app.language,
 	activeTheme: state.app.theme,
diff --git a/web/src/containers/UserSettings/AudioForm.js b/web/src/containers/UserSettings/AudioForm.js
index 22cdb4538b..52f01c1eaa 100644
--- a/web/src/containers/UserSettings/AudioForm.js
+++ b/web/src/containers/UserSettings/AudioForm.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { reduxForm } from 'redux-form';
 
 import renderFields from '../../components/Form/factoryFields';
-import { Button, Accordion } from '../../components';
+import { Button, IconTitle } from '../../components';
 import { getErrorLocalized } from '../../utils/errors';
 import STRINGS from '../../config/localizedStrings';
 import { EditWrapper } from 'components';
@@ -88,16 +88,30 @@ const Form = ({
 	initialValues,
 	formFields,
 	callback,
+	ICONS,
 }) => (
-	<form onSubmit={handleSubmit}>
-		{renderFields(formFields, callback)}
-		{error && <div className="warning_text">{getErrorLocalized(error)}</div>}
-		<EditWrapper stringId="SETTING_BUTTON" />
-		<Button
-			className="mt-4"
-			label={STRINGS['SETTING_BUTTON']}
-			disabled={pristine || submitting || !valid}
-		/>
+	<form onSubmit={handleSubmit} className="settings-form-wrapper">
+		<div className="settings-form">
+			<IconTitle
+				stringId="USER_SETTINGS.TITLE_AUDIO_CUE"
+				text={STRINGS['USER_SETTINGS.TITLE_AUDIO_CUE']}
+				textType="title"
+				iconPath={ICONS['SETTING_AUDIO_ICON']}
+			/>
+			<div className="pr-4">
+				{renderFields(formFields, callback)}
+				{error && (
+					<div className="warning_text">{getErrorLocalized(error)}</div>
+				)}
+			</div>
+		</div>
+		<div className="d-flex align-items-center justify-content-center">
+			<EditWrapper stringId="SETTING_BUTTON" />
+			<Button
+				label={STRINGS['SETTING_BUTTON']}
+				disabled={pristine || submitting || !valid}
+			/>
+		</div>
 	</form>
 );
 
@@ -136,25 +150,13 @@ class AudioCueForm extends Component {
 	};
 
 	render() {
-		const section = [
-			{
-				stringId: 'USER_SETTINGS.TITLE_AUDIO_CUE',
-				title: STRINGS['USER_SETTINGS.TITLE_AUDIO_CUE'],
-				description: 'This is the description',
-				content: (
-					<div>
-						<p>{STRINGS['USER_SETTINGS.DESC_AUDIO_CUE']}</p>
-						<Form
-							{...this.props}
-							callback={this.callback}
-							formFields={this.state.formFields}
-						/>
-					</div>
-				),
-				isOpen: true,
-			},
-		];
-		return <Accordion sections={section} />;
+		return (
+			<Form
+				{...this.props}
+				callback={this.callback}
+				formFields={this.state.formFields}
+			/>
+		);
 	}
 }
 
diff --git a/web/src/containers/UserSettings/LanguageForm.js b/web/src/containers/UserSettings/LanguageForm.js
index dedc1a24a3..d9bb878a72 100644
--- a/web/src/containers/UserSettings/LanguageForm.js
+++ b/web/src/containers/UserSettings/LanguageForm.js
@@ -3,13 +3,13 @@ import { reduxForm } from 'redux-form';
 import { isMobile } from 'react-device-detect';
 
 import renderFields from '../../components/Form/factoryFields';
-import { Button } from '../../components';
+import { Button, IconTitle } from '../../components';
 import { required } from '../../components/Form/validations';
 import { getErrorLocalized } from '../../utils/errors';
 import STRINGS from '../../config/localizedStrings';
 import { EditWrapper } from 'components';
 
-export const generateLanguageFormValues = (values) => {
+export const generateLanguageFormValues = (values = '') => {
 	const langValues = STRINGS.SETTINGS_LANGUAGE_OPTIONS.filter((filterValue) => {
 		return values.includes(filterValue.value);
 	});
@@ -21,6 +21,7 @@ export const generateLanguageFormValues = (values) => {
 			label: STRINGS['SETTINGS_LANGUAGE_LABEL'],
 			options: langValues,
 			fullWidth: isMobile,
+			ishorizontalfield: true,
 		},
 	};
 };
@@ -43,18 +44,31 @@ class Form extends Component {
 			error,
 			valid,
 			formFields,
+			ICONS,
 		} = this.props;
 		return (
-			<form onSubmit={handleSubmit}>
-				{renderFields(formFields)}
-				{error && (
-					<div className="warning_text">{getErrorLocalized(error)}</div>
-				)}
-				<EditWrapper stringId="SETTING_BUTTON" />
-				<Button
-					label={STRINGS['SETTING_BUTTON']}
-					disabled={pristine || submitting || !valid}
-				/>
+			<form onSubmit={handleSubmit} className="settings-form-wrapper">
+				<div className="settings-form">
+					<IconTitle
+						stringId="USER_SETTINGS.TITLE_LANGUAGE"
+						text={STRINGS['USER_SETTINGS.TITLE_LANGUAGE']}
+						textType="title"
+						iconPath={ICONS['SETTING_LANGUAGE_ICON']}
+					/>
+					<div className="pr-4">
+						{renderFields(formFields)}
+						{error && (
+							<div className="warning_text">{getErrorLocalized(error)}</div>
+						)}
+					</div>
+				</div>
+				<div className="d-flex align-items-center justify-content-center">
+					<EditWrapper stringId="SETTING_BUTTON" />
+					<Button
+						label={STRINGS['SETTING_BUTTON']}
+						disabled={pristine || submitting || !valid}
+					/>
+				</div>
 			</form>
 		);
 	}
diff --git a/web/src/containers/UserSettings/NotificationForm.js b/web/src/containers/UserSettings/NotificationForm.js
index df798b55fd..180ac83404 100644
--- a/web/src/containers/UserSettings/NotificationForm.js
+++ b/web/src/containers/UserSettings/NotificationForm.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { reduxForm } from 'redux-form';
 
 import renderFields from '../../components/Form/factoryFields';
-import { Button, Accordion } from '../../components';
+import { Button, IconTitle } from '../../components';
 import { getErrorLocalized } from '../../utils/errors';
 import STRINGS from '../../config/localizedStrings';
 import { EditWrapper } from 'components';
@@ -37,16 +37,30 @@ const Form = ({
 	valid,
 	initialValues,
 	formFields,
+	ICONS,
 }) => (
-	<form onSubmit={handleSubmit}>
-		{renderFields(formFields)}
-		{error && <div className="warning_text">{getErrorLocalized(error)}</div>}
-		<EditWrapper stringId="SETTING_BUTTON" />
-		<Button
-			className="mt-4"
-			label={STRINGS['SETTING_BUTTON']}
-			disabled={pristine || submitting || !valid}
-		/>
+	<form onSubmit={handleSubmit} className="settings-form-wrapper">
+		<div className="settings-form">
+			<IconTitle
+				stringId="USER_SETTINGS.TITLE_NOTIFICATION"
+				text={STRINGS['USER_SETTINGS.TITLE_NOTIFICATION']}
+				textType="title"
+				iconPath={ICONS['SETTING_NOTIFICATION_ICON']}
+			/>
+			<div className="pr-3">
+				{renderFields(formFields)}
+				{error && (
+					<div className="warning_text">{getErrorLocalized(error)}</div>
+				)}
+			</div>
+		</div>
+		<div className="d-flex align-items-center justify-content-center">
+			<EditWrapper stringId="SETTING_BUTTON" />
+			<Button
+				label={STRINGS['SETTING_BUTTON']}
+				disabled={pristine || submitting || !valid}
+			/>
+		</div>
 	</form>
 );
 
@@ -61,15 +75,7 @@ class NotificationForm extends Component {
 	}
 
 	render() {
-		const section = [
-			{
-				stringId: 'USER_SETTINGS.NOTIFICATION_FORM.TRADE_POPUPS',
-				title: STRINGS['USER_SETTINGS.NOTIFICATION_FORM.TRADE_POPUPS'],
-				content: <Form {...this.props} />,
-				isOpen: true,
-			},
-		];
-		return <Accordion sections={section} />;
+		return <Form {...this.props} />;
 	}
 }
 
diff --git a/web/src/containers/UserSettings/RiskForm.js b/web/src/containers/UserSettings/RiskForm.js
index c9f318b64a..f8d97957fa 100644
--- a/web/src/containers/UserSettings/RiskForm.js
+++ b/web/src/containers/UserSettings/RiskForm.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { reduxForm } from 'redux-form';
 
-import { Accordion, Table, Button } from '../../components';
+import { Table, Button, IconTitle } from '../../components';
 import renderFields from '../../components/Form/factoryFields';
 import STRINGS from '../../config/localizedStrings';
 import { formatBaseAmount } from '../../utils/currency';
@@ -75,7 +75,7 @@ export const generateWarningFormValues = () => ({
 		type: 'toggle',
 		stringId: 'USER_SETTINGS.RISK_MANAGEMENT.WARNING_POP_UP',
 		label: STRINGS['USER_SETTINGS.RISK_MANAGEMENT.WARNING_POP_UP'],
-		className: 'toggle-wrapper',
+		// className: 'toggle-wrapper',
 		toggleOnly: true,
 	},
 });
@@ -101,6 +101,7 @@ class RiskForm extends Component {
 			valid,
 			formFields,
 			coins,
+			ICONS,
 		} = this.props;
 		const percentPrice =
 			(totalAssets / 100) * initialValues.order_portfolio_percentage;
@@ -161,14 +162,26 @@ class RiskForm extends Component {
 		];
 		return (
 			<div>
-				<form onSubmit={handleSubmit}>
-					<Accordion sections={sections} />
-					<EditWrapper stringId="SETTING_BUTTON" />
-					<Button
-						className="mt-4"
-						label={STRINGS['SETTING_BUTTON']}
-						disabled={pristine || submitting || !valid}
-					/>
+				<form onSubmit={handleSubmit} className="settings-form-wrapper">
+					{/* <Accordion sections={sections} /> */}
+					<div className="settings-form">
+						<IconTitle
+							stringId="USER_SETTINGS.TITLE_MANAGE_RISK"
+							text={STRINGS['USER_SETTINGS.TITLE_MANAGE_RISK']}
+							textType="title"
+							iconPath={ICONS['SETTING_RISK_ICON']}
+						/>
+						{sections.map((data, index) => {
+							return <div key={index}>{data.content}</div>;
+						})}
+					</div>
+					<div className="d-flex align-items-center justify-content-center">
+						<EditWrapper stringId="SETTING_BUTTON" />
+						<Button
+							label={STRINGS['SETTING_BUTTON']}
+							disabled={pristine || submitting || !valid}
+						/>
+					</div>
 				</form>
 			</div>
 		);
diff --git a/web/src/containers/UserSettings/SettingsForm.js b/web/src/containers/UserSettings/SettingsForm.js
index ed310d6ab6..3ec33ba18f 100644
--- a/web/src/containers/UserSettings/SettingsForm.js
+++ b/web/src/containers/UserSettings/SettingsForm.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { reduxForm } from 'redux-form';
 import { isMobile } from 'react-device-detect';
 import renderFields from '../../components/Form/factoryFields';
-import { Button } from '../../components';
+import { Button, IconTitle } from '../../components';
 import {
 	required,
 	minValue,
@@ -23,6 +23,7 @@ export const generateFormValues = ({ options = [] }) => ({
 		stringId: 'SETTINGS_THEME_LABEL',
 		label: STRINGS['SETTINGS_THEME_LABEL'],
 		options,
+		ishorizontalfield: true,
 	},
 	order_book_levels: {
 		type: 'number',
@@ -45,6 +46,7 @@ export const generateFormValues = ({ options = [] }) => ({
 		// 		useSvg: true,
 		// 		onClick: calculateMin
 		// 	}
+		ishorizontalfield: true,
 	},
 });
 
@@ -66,18 +68,31 @@ class Form extends Component {
 			error,
 			valid,
 			formFields,
+			ICONS,
 		} = this.props;
 		return (
-			<form onSubmit={handleSubmit}>
-				{renderFields(formFields)}
-				{error && (
-					<div className="warning_text">{getErrorLocalized(error)}</div>
-				)}
-				<EditWrapper stringId="SETTING_BUTTON" />
-				<Button
-					label={STRINGS['SETTING_BUTTON']}
-					disabled={pristine || submitting || !valid}
-				/>
+			<form onSubmit={handleSubmit} className="settings-form-wrapper">
+				<div className="settings-form">
+					<IconTitle
+						stringId="USER_SETTINGS.TITLE_INTERFACE"
+						text={STRINGS['USER_SETTINGS.TITLE_INTERFACE']}
+						textType="title"
+						iconPath={ICONS['SETTING_INTERFACE_ICON']}
+					/>
+					<div className="pr-3">
+						{renderFields(formFields)}
+						{error && (
+							<div className="warning_text">{getErrorLocalized(error)}</div>
+						)}
+					</div>
+				</div>
+				<div className="d-flex align-items-center justify-content-center">
+					<EditWrapper stringId="SETTING_BUTTON" />
+					<Button
+						label={STRINGS['SETTING_BUTTON']}
+						disabled={pristine || submitting || !valid}
+					/>
+				</div>
 			</form>
 		);
 	}
diff --git a/web/src/containers/UserSettings/UsernameForm.js b/web/src/containers/UserSettings/UsernameForm.js
index 6869714c57..787619c81d 100644
--- a/web/src/containers/UserSettings/UsernameForm.js
+++ b/web/src/containers/UserSettings/UsernameForm.js
@@ -4,7 +4,7 @@ import { isMobile } from 'react-device-detect';
 
 import renderFields from '../../components/Form/factoryFields';
 import { FieldError } from '../../components/Form/FormFields/FieldWrapper';
-import { Button } from '../../components';
+import { Button, IconTitle } from '../../components';
 import { required, username } from '../../components/Form/validations';
 import { getErrorLocalized } from '../../utils/errors';
 import STRINGS from '../../config/localizedStrings';
@@ -19,6 +19,7 @@ export const generateUsernameFormValues = (disabled = false) => ({
 		placeholder: STRINGS['USERNAME_PLACEHOLDER'],
 		disabled,
 		fullWidth: isMobile,
+		ishorizontalfield: true,
 	},
 });
 
@@ -40,26 +41,39 @@ class Form extends Component {
 			error,
 			valid,
 			formFields,
+			ICONS,
 		} = this.props;
 		return (
-			<form onSubmit={handleSubmit}>
-				{renderFields(formFields)}
-				{error && (
-					<div className="warning_text">{getErrorLocalized(error)}</div>
-				)}
-				{!formFields.username.disabled && (
-					<FieldError
-						className="warning_text mb-4"
-						displayError={true}
-						error={STRINGS['USERNAME_WARNING']}
-						stringId="USERNAME_WARNING"
+			<form onSubmit={handleSubmit} className="settings-form-wrapper">
+				<div className="settings-form">
+					<IconTitle
+						stringId="USER_SETTINGS.TITLE_CHAT"
+						text={STRINGS['USER_SETTINGS.TITLE_CHAT']}
+						textType="title"
+						iconPath={ICONS['SETTING_CHAT_ICON']}
 					/>
-				)}
-				<EditWrapper stringId="SETTING_BUTTON" />
-				<Button
-					label={STRINGS['SETTING_BUTTON']}
-					disabled={pristine || submitting || !valid}
-				/>
+					<div className="pr-4">
+						{renderFields(formFields)}
+						{error && (
+							<div className="warning_text">{getErrorLocalized(error)}</div>
+						)}
+						{!formFields.username.disabled && (
+							<FieldError
+								className="warning_text mb-4"
+								displayError={true}
+								error={STRINGS['USERNAME_WARNING']}
+								stringId="USERNAME_WARNING"
+							/>
+						)}
+					</div>
+				</div>
+				<div className="d-flex align-items-center justify-content-center">
+					<EditWrapper stringId="SETTING_BUTTON" />
+					<Button
+						label={STRINGS['SETTING_BUTTON']}
+						disabled={pristine || submitting || !valid}
+					/>
+				</div>
 			</form>
 		);
 	}
diff --git a/web/src/containers/UserSettings/_UserSettings.scss b/web/src/containers/UserSettings/_UserSettings.scss
index 4c6802d0c8..ab5568c244 100644
--- a/web/src/containers/UserSettings/_UserSettings.scss
+++ b/web/src/containers/UserSettings/_UserSettings.scss
@@ -31,8 +31,89 @@
 	color: $colors-deactivate;
 }
 
+.settings_container {
+	.icon_title-wrapper {
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+	.header_title-wrapper {
+		.action_notification-wrapper {
+			top: 30px;
+		}
+	}
+	.settings-form-wrapper {
+		.settings-form {
+			padding: 10px 30px 30px 30px;
+			border-radius: 4px;
+			margin: 30px 0px;
+			background-color: $app-sidebar-background;
+			.notification-icon {
+				width: 50px;
+			}
+			.icon_title-wrapper {
+				margin: 0;
+				flex-direction: row;
+				justify-content: flex-start;
+				.icon_title-svg svg {
+					width: 50px;
+				}
+				.icon_title-text {
+					font-size: 15px;
+					margin: 0;
+				}
+			}
+		}
+		.exir-button {
+			width: 300px;
+		}
+	}
+}
+
 .layout-mobile {
 	.portfolio-wrapper {
 		margin: 25% auto;
 	}
+	.settings_container {
+		.header_title-wrapper {
+			.action_notification-wrapper {
+				top: 0;
+			}
+		}
+		.settings-form-wrapper {
+			.settings-form {
+				margin: 15px 0 25px !important;
+				padding: 10px;
+				.field-wrapper {
+					.field-label-wrapper {
+						flex-direction: column;
+					}
+				}
+			}
+		}
+	}
+}
+
+@media (max-width: 1060px) {
+	.settings_container {
+		.settings-form-wrapper {
+			.settings-form {
+				.icon_title-wrapper {
+					.icon_title-text {
+						margin: 1rem;
+						margin-bottom: 0;
+					}
+				}
+				.field-wrapper {
+					.field-label {
+						font-size: 12px;
+					}
+				}
+			}
+		}
+		.tab_controller-wrapper {
+			.tab_item {
+				font-size: $font-size-mobile-txt;
+			}
+		}
+	}
 }
diff --git a/web/src/containers/UserSettings/index.js b/web/src/containers/UserSettings/index.js
index 0b8768622a..a8eeaac743 100644
--- a/web/src/containers/UserSettings/index.js
+++ b/web/src/containers/UserSettings/index.js
@@ -22,11 +22,12 @@ import {
 import {
 	IconTitle,
 	HeaderSection,
-	CustomTabs,
+	// CustomTabs,
 	CustomMobileTabs,
-	CustomTabBar,
+	// CustomTabBar,
 	MobileTabBar,
 	Loader,
+	TabController,
 } from '../../components';
 import SettingsForm, { generateFormValues } from './SettingsForm';
 import UsernameForm, { generateUsernameFormValues } from './UsernameForm';
@@ -145,12 +146,13 @@ class UserSettings extends Component {
 						icon={ICONS['SETTING_NOTIFICATION_ICON']}
 					/>
 				) : (
-					<CustomTabs
-						stringId="USER_SETTINGS.TITLE_NOTIFICATION"
-						title={STRINGS['USER_SETTINGS.TITLE_NOTIFICATION']}
-						iconId="SETTING_NOTIFICATION_ICON"
-						icon={ICONS['SETTING_NOTIFICATION_ICON']}
-					/>
+					// <CustomTabs
+					// 	stringId="USER_SETTINGS.TITLE_NOTIFICATION"
+					// 	title={STRINGS['USER_SETTINGS.TITLE_NOTIFICATION']}
+					// 	iconId="SETTING_NOTIFICATION_ICON"
+					// 	icon={ICONS['SETTING_NOTIFICATION_ICON']}
+					// />
+					<div>{STRINGS['USER_SETTINGS.TITLE_NOTIFICATION']}</div>
 				),
 				content: activeTab === 0 && (
 					<NotificationForm
@@ -159,6 +161,7 @@ class UserSettings extends Component {
 						}
 						formFields={notificationFormValues}
 						initialValues={settings.notification}
+						ICONS={ICONS}
 					/>
 				),
 			},
@@ -169,12 +172,13 @@ class UserSettings extends Component {
 						icon={ICONS['SETTING_INTERFACE_ICON']}
 					/>
 				) : (
-					<CustomTabs
-						stringId="USER_SETTINGS.TITLE_INTERFACE"
-						title={STRINGS['USER_SETTINGS.TITLE_INTERFACE']}
-						iconId="SETTING_INTERFACE_ICON"
-						icon={ICONS['SETTING_INTERFACE_ICON']}
-					/>
+					// <CustomTabs
+					// 	stringId="USER_SETTINGS.TITLE_INTERFACE"
+					// 	title={STRINGS['USER_SETTINGS.TITLE_INTERFACE']}
+					// 	iconId="SETTING_INTERFACE_ICON"
+					// 	icon={ICONS['SETTING_INTERFACE_ICON']}
+					// />
+					<div>{STRINGS['USER_SETTINGS.TITLE_INTERFACE']}</div>
 				),
 				content: activeTab === 1 && (
 					<SettingsForm
@@ -183,6 +187,7 @@ class UserSettings extends Component {
 						}
 						formFields={formValues}
 						initialValues={settings.interface}
+						ICONS={ICONS}
 					/>
 				),
 			},
@@ -193,12 +198,13 @@ class UserSettings extends Component {
 						icon={ICONS['SETTING_LANGUAGE_ICON']}
 					/>
 				) : (
-					<CustomTabs
-						stringId="USER_SETTINGS.TITLE_LANGUAGE"
-						title={STRINGS['USER_SETTINGS.TITLE_LANGUAGE']}
-						iconId="SETTING_LANGUAGE_ICON"
-						icon={ICONS['SETTING_LANGUAGE_ICON']}
-					/>
+					// <CustomTabs
+					// 	stringId="USER_SETTINGS.TITLE_LANGUAGE"
+					// 	title={STRINGS['USER_SETTINGS.TITLE_LANGUAGE']}
+					// 	iconId="SETTING_LANGUAGE_ICON"
+					// 	icon={ICONS['SETTING_LANGUAGE_ICON']}
+					// />
+					<div>{STRINGS['USER_SETTINGS.TITLE_LANGUAGE']}</div>
 				),
 				content: activeTab === 2 && (
 					<LanguageForm
@@ -207,6 +213,7 @@ class UserSettings extends Component {
 						}
 						formFields={languageFormValue}
 						initialValues={{ language: settings.language }}
+						ICONS={ICONS}
 					/>
 				),
 			},
@@ -217,18 +224,20 @@ class UserSettings extends Component {
 						icon={ICONS['SETTING_CHAT_ICON']}
 					/>
 				) : (
-					<CustomTabs
-						stringId="USER_SETTINGS.TITLE_CHAT"
-						title={STRINGS['USER_SETTINGS.TITLE_CHAT']}
-						iconId="SETTING_CHAT_ICON"
-						icon={ICONS['SETTING_CHAT_ICON']}
-					/>
+					// <CustomTabs
+					// 	stringId="USER_SETTINGS.TITLE_CHAT"
+					// 	title={STRINGS['USER_SETTINGS.TITLE_CHAT']}
+					// 	iconId="SETTING_CHAT_ICON"
+					// 	icon={ICONS['SETTING_CHAT_ICON']}
+					// />
+					<div>{STRINGS['USER_SETTINGS.TITLE_CHAT']}</div>
 				),
 				content: activeTab === 3 && (
 					<UsernameForm
 						onSubmit={this.onSubmitUsername}
 						formFields={usernameFormValues}
 						initialValues={{ username }}
+						ICONS={ICONS}
 					/>
 				),
 			},
@@ -239,18 +248,20 @@ class UserSettings extends Component {
 						icon={ICONS['SETTING_AUDIO_ICON']}
 					/>
 				) : (
-					<CustomTabs
-						stringId="USER_SETTINGS.TITLE_AUDIO_CUE"
-						title={STRINGS['USER_SETTINGS.TITLE_AUDIO_CUE']}
-						iconId="SETTING_AUDIO_ICON"
-						icon={ICONS['SETTING_AUDIO_ICON']}
-					/>
+					// <CustomTabs
+					// 	stringId="USER_SETTINGS.TITLE_AUDIO_CUE"
+					// 	title={STRINGS['USER_SETTINGS.TITLE_AUDIO_CUE']}
+					// 	iconId="SETTING_AUDIO_ICON"
+					// 	icon={ICONS['SETTING_AUDIO_ICON']}
+					// />
+					<div>{STRINGS['USER_SETTINGS.TITLE_AUDIO_CUE']}</div>
 				),
 				content: activeTab === 4 && (
 					<AudioCueForm
 						onSubmit={(formProps) => this.onSubmitSettings(formProps, 'audio')}
 						formFields={audioFormValues}
 						initialValues={audioFormInitialValues}
+						ICONS={ICONS}
 					/>
 				),
 			},
@@ -261,12 +272,13 @@ class UserSettings extends Component {
 						icon={ICONS['SETTING_RISK_ICON']}
 					/>
 				) : (
-					<CustomTabs
-						stringId="USER_SETTINGS.TITLE_MANAGE_RISK"
-						title={STRINGS['USER_SETTINGS.TITLE_MANAGE_RISK']}
-						iconId="SETTING_RISK_ICON"
-						icon={ICONS['SETTING_RISK_ICON']}
-					/>
+					// <CustomTabs
+					// 	stringId="USER_SETTINGS.TITLE_MANAGE_RISK"
+					// 	title={STRINGS['USER_SETTINGS.TITLE_MANAGE_RISK']}
+					// 	iconId="SETTING_RISK_ICON"
+					// 	icon={ICONS['SETTING_RISK_ICON']}
+					// />
+					<div>{STRINGS['USER_SETTINGS.TITLE_MANAGE_RISK']}</div>
 				),
 				content: activeTab === 5 && (
 					<RiskForm
@@ -276,6 +288,7 @@ class UserSettings extends Component {
 						onSubmit={(formProps) => this.onSubmitSettings(formProps, 'risk')}
 						formFields={warningFormValues}
 						initialValues={settings.risk}
+						ICONS={ICONS}
 					/>
 				),
 			},
@@ -388,13 +401,16 @@ class UserSettings extends Component {
 			return <Loader />;
 		}
 		const { activeTab, tabs } = this.state;
+		const { icons: ICONS } = this.props;
 		return (
-			<div className="presentation_container apply_rtl verification_container">
+			<div className="presentation_container apply_rtl settings_container">
 				{!isMobile && (
 					<IconTitle
 						stringId="ACCOUNTS.TAB_SETTINGS"
 						text={STRINGS['ACCOUNTS.TAB_SETTINGS']}
 						textType="title"
+						iconPath={ICONS['TAB_SETTING']}
+						iconId={STRINGS['ACCOUNTS.TAB_SETTINGS']}
 					/>
 				)}
 				<HeaderSection
@@ -416,7 +432,7 @@ class UserSettings extends Component {
 					</div>
 				</HeaderSection>
 				{!isMobile ? (
-					<CustomTabBar
+					<TabController
 						activeTab={activeTab}
 						setActiveTab={this.setActiveTab}
 						tabs={tabs}
diff --git a/web/src/containers/Verification/BankVerification.js b/web/src/containers/Verification/BankVerification.js
index 3dedef38d5..9605a6da08 100644
--- a/web/src/containers/Verification/BankVerification.js
+++ b/web/src/containers/Verification/BankVerification.js
@@ -43,6 +43,7 @@ class BankVerification extends Component {
 				],
 			validate: [required],
 			fullWidth: isMobile,
+			ishorizontalfield: true,
 		};
 		formFields.account_number = {
 			type: 'text',
@@ -67,6 +68,7 @@ class BankVerification extends Component {
 			],
 			maxLength: 50,
 			fullWidth: isMobile,
+			ishorizontalfield: true,
 		};
 		this.setState({ formFields });
 	};
@@ -102,7 +104,7 @@ class BankVerification extends Component {
 			error,
 			openContactForm,
 			icon,
-			iconId,
+			// iconId,
 		} = this.props;
 		const { formFields } = this.state;
 		return (
@@ -111,49 +113,50 @@ class BankVerification extends Component {
 					stringId="USER_VERIFICATION.BANK_VERIFICATION"
 					text={STRINGS['USER_VERIFICATION.BANK_VERIFICATION']}
 					textType="title"
+					iconPath={icon}
 				/>
 				<form className="d-flex flex-column w-100 verification_content-form-wrapper">
-					<HeaderSection
-						stringId="USER_VERIFICATION.TITLE_BANK_ACCOUNT"
-						title={STRINGS['USER_VERIFICATION.TITLE_BANK_ACCOUNT']}
-						iconId={iconId}
-						icon={icon}
-						openContactForm={openContactForm}
-					>
-						<div className="my-2">
-							<EditWrapper stringId="USER_VERIFICATION.BANK_VERIFICATION_TEXT_1">
-								{STRINGS['USER_VERIFICATION.BANK_VERIFICATION_TEXT_1']}
-							</EditWrapper>
-						</div>
-						<div className="my-2">
-							<EditWrapper stringId="USER_VERIFICATION.BANK_VERIFICATION_TEXT_2">
-								{STRINGS['USER_VERIFICATION.BANK_VERIFICATION_TEXT_2']}
-							</EditWrapper>
-						</div>
-						<ul className="pl-4">
-							<li className="my-1">
-								<EditWrapper stringId="USER_VERIFICATION.BASE_WITHDRAWAL">
-									{STRINGS['USER_VERIFICATION.BASE_WITHDRAWAL']}
+					<div className="verification-form-panel mt-3 mb-5">
+						<HeaderSection
+							stringId="USER_VERIFICATION.TITLE_BANK_ACCOUNT"
+							title={STRINGS['USER_VERIFICATION.TITLE_BANK_ACCOUNT']}
+							openContactForm={openContactForm}
+						>
+							<div className="my-2">
+								<EditWrapper stringId="USER_VERIFICATION.BANK_VERIFICATION_TEXT_1">
+									{STRINGS['USER_VERIFICATION.BANK_VERIFICATION_TEXT_1']}
 								</EditWrapper>
-							</li>
-							<li className="my-1">
-								<EditWrapper stringId="USER_VERIFICATION.BASE_DEPOSITS">
-									{STRINGS['USER_VERIFICATION.BASE_DEPOSITS']}
+							</div>
+							<div className="my-2">
+								<EditWrapper stringId="USER_VERIFICATION.BANK_VERIFICATION_TEXT_2">
+									{STRINGS['USER_VERIFICATION.BANK_VERIFICATION_TEXT_2']}
 								</EditWrapper>
-							</li>
-							<li className="my-1">
-								<EditWrapper stringId="USER_VERIFICATION.WARNING.LIST_ITEM_3">
-									{STRINGS['USER_VERIFICATION.WARNING.LIST_ITEM_3']}
-								</EditWrapper>
-							</li>
-						</ul>
-					</HeaderSection>
-					{renderFields(formFields)}
-					{error && (
-						<div className="warning_text">{getErrorLocalized(error)}</div>
-					)}
-					<div className="d-flex">
-						<div className="w-50">
+							</div>
+							<ul className="pl-4">
+								<li className="my-1">
+									<EditWrapper stringId="USER_VERIFICATION.BASE_WITHDRAWAL">
+										{STRINGS['USER_VERIFICATION.BASE_WITHDRAWAL']}
+									</EditWrapper>
+								</li>
+								<li className="my-1">
+									<EditWrapper stringId="USER_VERIFICATION.BASE_DEPOSITS">
+										{STRINGS['USER_VERIFICATION.BASE_DEPOSITS']}
+									</EditWrapper>
+								</li>
+								<li className="my-1">
+									<EditWrapper stringId="USER_VERIFICATION.WARNING.LIST_ITEM_3">
+										{STRINGS['USER_VERIFICATION.WARNING.LIST_ITEM_3']}
+									</EditWrapper>
+								</li>
+							</ul>
+						</HeaderSection>
+						{renderFields(formFields)}
+						{error && (
+							<div className="warning_text">{getErrorLocalized(error)}</div>
+						)}
+					</div>
+					<div className="d-flex justify-content-center align-items-center mt-2">
+						<div className="f-1 d-flex justify-content-end verification-buttons-wrapper">
 							<EditWrapper stringId="USER_VERIFICATION.GO_BACK" />
 							<Button
 								label={STRINGS['USER_VERIFICATION.GO_BACK']}
@@ -161,7 +164,7 @@ class BankVerification extends Component {
 							/>
 						</div>
 						<div className="separator" />
-						<div className="w-50">
+						<div className="f-1 verification-buttons-wrapper">
 							<EditWrapper stringId="SUBMIT" />
 							<Button
 								label={STRINGS['SUBMIT']}
diff --git a/web/src/containers/Verification/BankVerificationHome.js b/web/src/containers/Verification/BankVerificationHome.js
index 2463f3b376..0eaaf481c8 100644
--- a/web/src/containers/Verification/BankVerificationHome.js
+++ b/web/src/containers/Verification/BankVerificationHome.js
@@ -20,11 +20,14 @@ const BankVerificationHome = ({
 			bank_account.filter((data) => data.status === 0).length
 	) {
 		return (
-			<div>
-				<Button
-					label={STRINGS['USER_VERIFICATION.START_BANK_VERIFICATION']}
-					onClick={() => setActivePageContent('bank')}
-				/>
+			<div className="btn-wrapper">
+				<div className="exir-verification-button">
+					<EditWrapper stringId="USER_VERIFICATION.START_BANK_VERIFICATION" />
+					<Button
+						label={STRINGS['USER_VERIFICATION.START_BANK_VERIFICATION']}
+						onClick={() => setActivePageContent('bank')}
+					/>
+				</div>
 			</div>
 		);
 	} else {
diff --git a/web/src/containers/Verification/DocumentsVerification.js b/web/src/containers/Verification/DocumentsVerification.js
index 1d8bd4fce2..c0ef228162 100644
--- a/web/src/containers/Verification/DocumentsVerification.js
+++ b/web/src/containers/Verification/DocumentsVerification.js
@@ -60,6 +60,7 @@ class DocumentsVerification extends Component {
 						),
 					],
 					fullWidth: isMobile,
+					ishorizontalfield: true,
 				},
 				issued_date: {
 					type: 'date-dropdown',
@@ -80,6 +81,7 @@ class DocumentsVerification extends Component {
 					endDate: moment().add(1, 'days'),
 					language,
 					fullWidth: isMobile,
+					ishorizontalfield: true,
 				},
 				expiration_date: {
 					type: 'date-dropdown',
@@ -102,6 +104,7 @@ class DocumentsVerification extends Component {
 					yearsBefore: 5,
 					language,
 					fullWidth: isMobile,
+					ishorizontalfield: true,
 				},
 			},
 			id: {
@@ -126,6 +129,7 @@ class DocumentsVerification extends Component {
 						),
 					],
 					fullWidth: isMobile,
+					ishorizontalfield: true,
 				},
 			},
 			proof_of_residency: {
@@ -152,6 +156,7 @@ class DocumentsVerification extends Component {
 						),
 					],
 					fullWidth: isMobile,
+					ishorizontalfield: true,
 				},
 			},
 			selfieWithNote: {
@@ -178,6 +183,7 @@ class DocumentsVerification extends Component {
 						),
 					],
 					fullWidth: isMobile,
+					ishorizontalfield: true,
 				},
 			},
 		};
@@ -232,69 +238,76 @@ class DocumentsVerification extends Component {
 					stringId="USER_VERIFICATION.DOCUMENT_VERIFICATION"
 					text={STRINGS['USER_VERIFICATION.DOCUMENT_VERIFICATION']}
 					textType="title"
+					iconPath={ICONS['VERIFICATION_DOCUMENT_NEW']}
 				/>
 				<form
 					className="d-flex flex-column w-100 verification_content-form-wrapper"
 					onSubmit={this.handleSubmit}
 				>
-					<HeaderSection
-						stringId="USER_VERIFICATION.DOCUMENT_PROOF_SUBMISSION"
-						title={STRINGS['USER_VERIFICATION.DOCUMENT_PROOF_SUBMISSION']}
-						iconId="VERIFICATION_DOCUMENT_NEW"
-						icon={ICONS['VERIFICATION_DOCUMENT_NEW']}
-						openContactForm={openContactForm}
-					>
-						<IdentificationFormSection />
-					</HeaderSection>
-					{renderFields(formFields.idDocument)}
-					{renderFields(formFields.id)}
+					<div className="verification-form-panel mt-3">
+						<HeaderSection
+							stringId="USER_VERIFICATION.DOCUMENT_PROOF_SUBMISSION"
+							title={STRINGS['USER_VERIFICATION.DOCUMENT_PROOF_SUBMISSION']}
+							openContactForm={openContactForm}
+						>
+							<IdentificationFormSection />
+						</HeaderSection>
+						{renderFields(formFields.idDocument)}
+						{renderFields(formFields.id)}
+					</div>
 					<div className="my-4"></div>
 
-					{formFields.proof_of_residency && (
-						<div>
-							<HeaderSection
-								stringId="USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.PROOF_OF_RESIDENCY"
-								title={
-									STRINGS[
-										'USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.PROOF_OF_RESIDENCY'
-									]
-								}
-							>
-								<PORSection />
-							</HeaderSection>
-							{renderFields(formFields.proof_of_residency)}
-						</div>
-					)}
+					<div className="verification-form-panel">
+						{formFields.proof_of_residency && (
+							<div>
+								<HeaderSection
+									stringId="USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.PROOF_OF_RESIDENCY"
+									title={
+										STRINGS[
+											'USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.PROOF_OF_RESIDENCY'
+										]
+									}
+								>
+									<PORSection />
+								</HeaderSection>
+								{renderFields(formFields.proof_of_residency)}
+							</div>
+						)}
+					</div>
 					<div className="my-4"></div>
-					{formFields.selfieWithNote && (
-						<div>
-							<HeaderSection
-								stringId="USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.SELFIE.TITLE"
-								title={
-									STRINGS[
-										'USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.SELFIE.TITLE'
-									]
-								}
-							>
-								<SelfieWithPhotoId />
-							</HeaderSection>
-							<div className="my-2">
-								<Image
-									alt="document-sample"
-									iconId="SELF_KYC_ID_EN"
-									icon={ICONS['SELF_KYC_ID_EN']}
-									wrapperClassName="verification_document-sample"
-								/>
+
+					<div className="verification-form-panel">
+						{formFields.selfieWithNote && (
+							<div>
+								<HeaderSection
+									stringId="USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.SELFIE.TITLE"
+									title={
+										STRINGS[
+											'USER_VERIFICATION.ID_DOCUMENTS_FORM.INFORMATION.SELFIE.TITLE'
+										]
+									}
+								>
+									<SelfieWithPhotoId />
+								</HeaderSection>
+								<div className="my-2">
+									<Image
+										alt="document-sample"
+										iconId="SELF_KYC_ID_EN"
+										icon={ICONS['SELF_KYC_ID_EN']}
+										wrapperClassName="verification_document-sample"
+									/>
+								</div>
+								{renderFields(formFields.selfieWithNote)}
 							</div>
-							{renderFields(formFields.selfieWithNote)}
-						</div>
-					)}
+						)}
+					</div>
 					{error && (
 						<div className="warning_text">{getErrorLocalized(error)}</div>
 					)}
+					<div className="my-4"></div>
 
-					<div className="d-flex verification-buttons-wrapper">
-						<div className="w-50">
+					<div className="d-flex justify-content-center">
+						<div className="d-flex justify-content-end f-1 verification-buttons-wrapper">
 							<Button
 								type="button"
 								onClick={this.onGoBack}
@@ -303,17 +316,19 @@ class DocumentsVerification extends Component {
 							/>
 						</div>
 						<div className="separator" />
-						<div className="w-50">
-							<Button
-								type="button"
-								onClick={handleSubmit(this.handleSubmit)}
-								label={
-									idData.status === 0
-										? STRINGS['SUBMIT']
-										: `${STRINGS['RESUBMIT']}*`
-								}
-								disabled={pristine || submitting || !valid || !!error}
-							/>
+						<div className="d-flex flex-column f-1 verification-buttons-wrapper">
+							<div>
+								<Button
+									type="button"
+									onClick={handleSubmit(this.handleSubmit)}
+									label={
+										idData.status === 0
+											? STRINGS['SUBMIT']
+											: `${STRINGS['RESUBMIT']}*`
+									}
+									disabled={pristine || submitting || !valid || !!error}
+								/>
+							</div>
 							{idData.status !== 0 && (
 								<span className="content-text">
 									{STRINGS['USER_VERIFICATION.SUBMISSION_PENDING_TXT']}
diff --git a/web/src/containers/Verification/DocumentsVerificationHome.js b/web/src/containers/Verification/DocumentsVerificationHome.js
index 7c2708e143..fba894b985 100644
--- a/web/src/containers/Verification/DocumentsVerificationHome.js
+++ b/web/src/containers/Verification/DocumentsVerificationHome.js
@@ -94,16 +94,20 @@ const DocumentsVerificationHome = ({
 				</div>
 			)}
 			{id_data.status !== 3 && (
-				<div className="my-2">
-					<EditWrapper stringId="USER_VERIFICATION.START_DOCUMENTATION_SUBMISSION,USER_VERIFICATION.START_DOCUMENTATION_RESUBMISSION" />
-					<Button
-						label={
-							id_data.status === 0
-								? STRINGS['USER_VERIFICATION.START_DOCUMENTATION_SUBMISSION']
-								: STRINGS['USER_VERIFICATION.START_DOCUMENTATION_RESUBMISSION']
-						}
-						onClick={() => setActivePageContent('document')}
-					/>
+				<div className="my-2 btn-wrapper">
+					<div className="exir-verification-button">
+						<EditWrapper stringId="USER_VERIFICATION.START_DOCUMENTATION_SUBMISSION,USER_VERIFICATION.START_DOCUMENTATION_RESUBMISSION" />
+						<Button
+							label={
+								id_data.status === 0
+									? STRINGS['USER_VERIFICATION.START_DOCUMENTATION_SUBMISSION']
+									: STRINGS[
+											'USER_VERIFICATION.START_DOCUMENTATION_RESUBMISSION'
+									  ]
+							}
+							onClick={() => setActivePageContent('document')}
+						/>
+					</div>
 				</div>
 			)}
 		</div>
diff --git a/web/src/containers/Verification/IdentityVerification.js b/web/src/containers/Verification/IdentityVerification.js
index a5e34d44d7..d6e1fcb75e 100644
--- a/web/src/containers/Verification/IdentityVerification.js
+++ b/web/src/containers/Verification/IdentityVerification.js
@@ -53,6 +53,7 @@ class IdentityVerification extends Component {
 				disabled: fullName.length > 0,
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			gender: {
 				type: 'select',
@@ -90,6 +91,7 @@ class IdentityVerification extends Component {
 				],
 				validate: [requiredBoolean],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			dob: {
 				type: 'date-dropdown',
@@ -104,6 +106,7 @@ class IdentityVerification extends Component {
 				endDate: moment().add(1, 'days'),
 				pattern: '[0-9]{4}-[0-9]{2}-[0-9]{2}',
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			nationality: {
 				type: 'autocomplete',
@@ -120,6 +123,7 @@ class IdentityVerification extends Component {
 				options: COUNTRIES_OPTIONS,
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			country: {
 				type: 'autocomplete',
@@ -136,6 +140,7 @@ class IdentityVerification extends Component {
 				options: COUNTRIES_OPTIONS,
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			city: {
 				type: 'text',
@@ -151,6 +156,7 @@ class IdentityVerification extends Component {
 					],
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			address: {
 				type: 'text',
@@ -166,6 +172,7 @@ class IdentityVerification extends Component {
 					],
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			postal_code: {
 				type: 'text',
@@ -181,6 +188,7 @@ class IdentityVerification extends Component {
 					],
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 		};
 
@@ -227,35 +235,36 @@ class IdentityVerification extends Component {
 					stringId="USER_VERIFICATION.IDENTITY_VERIFICATION"
 					text={STRINGS['USER_VERIFICATION.IDENTITY_VERIFICATION']}
 					textType="title"
+					iconPath={ICONS['VERIFICATION_ID_NEW']}
 				/>
 				<form className="d-flex flex-column w-100 verification_content-form-wrapper">
-					<HeaderSection
-						stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TITLE_PERSONAL_INFORMATION"
-						title={
-							STRINGS[
-								'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TITLE_PERSONAL_INFORMATION'
-							]
-						}
-						iconId="VERIFICATION_ID_NEW"
-						icon={ICONS['VERIFICATION_ID_NEW']}
-						openContactForm={openContactForm}
-					>
-						<div className="my-1 verification-info-txt">
-							<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TEXT">
-								{
-									STRINGS[
-										'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TEXT'
-									]
-								}
-							</EditWrapper>
-						</div>
-					</HeaderSection>
-					{renderFields(formFields)}
-					{error && (
-						<div className="warning_text">{getErrorLocalized(error)}</div>
-					)}
-					<div className="d-flex">
-						<div className="w-50">
+					<div className="verification-form-panel mt-3 mb-5">
+						<HeaderSection
+							stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TITLE_PERSONAL_INFORMATION"
+							title={
+								STRINGS[
+									'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TITLE_PERSONAL_INFORMATION'
+								]
+							}
+							openContactForm={openContactForm}
+						>
+							<div className="my-1 verification-info-txt">
+								<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TEXT">
+									{
+										STRINGS[
+											'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.TEXT'
+										]
+									}
+								</EditWrapper>
+							</div>
+						</HeaderSection>
+						{renderFields(formFields)}
+						{error && (
+							<div className="warning_text">{getErrorLocalized(error)}</div>
+						)}
+					</div>
+					<div className="d-flex justify-content-center align-items-center mt-2">
+						<div className="f-1 d-flex justify-content-end verification-buttons-wrapper">
 							<EditWrapper stringId="USER_VERIFICATION.GO_BACK" />
 							<Button
 								label={STRINGS['USER_VERIFICATION.GO_BACK']}
@@ -263,7 +272,7 @@ class IdentityVerification extends Component {
 							/>
 						</div>
 						<div className="separator" />
-						<div className="w-50">
+						<div className="f-1 verification-buttons-wrapper">
 							<EditWrapper stringId="SUBMIT" />
 							<Button
 								type="button"
diff --git a/web/src/containers/Verification/IdentityVerificationHome.js b/web/src/containers/Verification/IdentityVerificationHome.js
index eab61d92b0..beb083a1ed 100644
--- a/web/src/containers/Verification/IdentityVerificationHome.js
+++ b/web/src/containers/Verification/IdentityVerificationHome.js
@@ -20,12 +20,14 @@ const IdentityVerificationHome = ({
 	const { address, id_data } = user;
 	if (!address.country) {
 		return (
-			<div>
-				<EditWrapper stringId="USER_VERIFICATION.START_IDENTITY_VERIFICATION" />
-				<Button
-					label={STRINGS['USER_VERIFICATION.START_IDENTITY_VERIFICATION']}
-					onClick={() => setActivePageContent('kyc')}
-				/>
+			<div className="btn-wrapper">
+				<div className="exir-verification-button">
+					<EditWrapper stringId="USER_VERIFICATION.START_IDENTITY_VERIFICATION" />
+					<Button
+						label={STRINGS['USER_VERIFICATION.START_IDENTITY_VERIFICATION']}
+						onClick={() => setActivePageContent('kyc')}
+					/>
+				</div>
 			</div>
 		);
 	} else {
@@ -153,12 +155,16 @@ const IdentityVerificationHome = ({
 					</div>
 				</div>
 				{id_data.status === 3 ? null : (
-					<div>
-						<EditWrapper stringId="USER_VERIFICATION.REVIEW_IDENTITY_VERIFICATION" />
-						<Button
-							label={STRINGS['USER_VERIFICATION.REVIEW_IDENTITY_VERIFICATION']}
-							onClick={() => setActivePageContent('kyc')}
-						/>
+					<div className="btn-wrapper">
+						<div className="exir-verification-button">
+							<EditWrapper stringId="USER_VERIFICATION.REVIEW_IDENTITY_VERIFICATION" />
+							<Button
+								label={
+									STRINGS['USER_VERIFICATION.REVIEW_IDENTITY_VERIFICATION']
+								}
+								onClick={() => setActivePageContent('kyc')}
+							/>
+						</div>
 					</div>
 				)}
 			</div>
diff --git a/web/src/containers/Verification/MobileVerification.js b/web/src/containers/Verification/MobileVerification.js
index 94db67eeca..9c35773441 100644
--- a/web/src/containers/Verification/MobileVerification.js
+++ b/web/src/containers/Verification/MobileVerification.js
@@ -72,6 +72,7 @@ class MobileVerification extends Component {
 				options: PHONE_OPTIONS,
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			phone_number: {
 				type: 'text',
@@ -105,6 +106,7 @@ class MobileVerification extends Component {
 					onClick: loading ? () => {} : this.handleSendSmsCode,
 				},
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 			code: {
 				type: 'text',
@@ -121,6 +123,7 @@ class MobileVerification extends Component {
 				disabled: !codeRequested,
 				validate: [required],
 				fullWidth: isMobile,
+				ishorizontalfield: true,
 			},
 		};
 
@@ -236,55 +239,56 @@ class MobileVerification extends Component {
 					stringId="USER_VERIFICATION.PHONE_VERIFICATION"
 					text={STRINGS['USER_VERIFICATION.PHONE_VERIFICATION']}
 					textType="title"
+					iconPath={ICONS['VERIFICATION_PHONE_NEW']}
 				/>
 				<form className="d-flex flex-column w-100 verification_content-form-wrapper">
-					<HeaderSection
-						stringId="USER_VERIFICATION.PHONE_DETAILS"
-						title={STRINGS['USER_VERIFICATION.PHONE_DETAILS']}
-						openContactForm={openContactForm}
-						iconId="VERIFICATION_PHONE_NEW"
-						icon={ICONS['VERIFICATION_PHONE_NEW']}
-					>
-						<div>
-							<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT">
-								{
-									STRINGS[
-										'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT'
-									]
-								}
-							</EditWrapper>
-						</div>
-						<div>
-							<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_1">
-								{
-									STRINGS[
-										'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_1'
-									]
-								}
-							</EditWrapper>
-						</div>
-						<div>
-							<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_2">
-								{
-									STRINGS[
-										'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_2'
-									]
-								}
-							</EditWrapper>
-						</div>
-					</HeaderSection>
-					{renderFields(formFields)}
-					<ElapsedTimer
-						timerText={STRINGS['USER_VERIFICATION.CODE_EXPIRES_IN']}
-						isLoading={isTimer}
-						timeoutCallback={this.onClearTimer}
-					/>
-					<EditWrapper stringId="USER_VERIFICATION.CODE_EXPIRES_IN" />
-					{error && (
-						<div className="warning_text">{getErrorLocalized(error)}</div>
-					)}
-					<div className="d-flex">
-						<div className="w-50">
+					<div className="verification-form-panel mt-3 mb-5">
+						<HeaderSection
+							stringId="USER_VERIFICATION.PHONE_DETAILS"
+							title={STRINGS['USER_VERIFICATION.PHONE_DETAILS']}
+							openContactForm={openContactForm}
+						>
+							<div>
+								<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT">
+									{
+										STRINGS[
+											'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT'
+										]
+									}
+								</EditWrapper>
+							</div>
+							<div>
+								<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_1">
+									{
+										STRINGS[
+											'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_1'
+										]
+									}
+								</EditWrapper>
+							</div>
+							<div>
+								<EditWrapper stringId="USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_2">
+									{
+										STRINGS[
+											'USER_VERIFICATION.USER_DOCUMENTATION_FORM.INFORMATION.PHONE_VERIFICATION_TXT_2'
+										]
+									}
+								</EditWrapper>
+							</div>
+						</HeaderSection>
+						{renderFields(formFields)}
+						<ElapsedTimer
+							timerText={STRINGS['USER_VERIFICATION.CODE_EXPIRES_IN']}
+							isLoading={isTimer}
+							timeoutCallback={this.onClearTimer}
+						/>
+						<EditWrapper stringId="USER_VERIFICATION.CODE_EXPIRES_IN" />
+						{error && (
+							<div className="warning_text">{getErrorLocalized(error)}</div>
+						)}
+					</div>
+					<div className="d-flex justify-content-center align-items-center mt-2">
+						<div className="f-1 d-flex justify-content-end verification-buttons-wrapper">
 							<EditWrapper stringId="USER_VERIFICATION.GO_BACK" />
 							<Button
 								label={STRINGS['USER_VERIFICATION.GO_BACK']}
@@ -292,7 +296,7 @@ class MobileVerification extends Component {
 							/>
 						</div>
 						<div className="separator" />
-						<div className="w-50">
+						<div className="f-1 verification-buttons-wrapper">
 							<EditWrapper stringId="SUBMIT" />
 							<Button
 								type="button"
diff --git a/web/src/containers/Verification/MobileVerificationHome.js b/web/src/containers/Verification/MobileVerificationHome.js
index 4d3e2e8b87..7b8f5dce98 100644
--- a/web/src/containers/Verification/MobileVerificationHome.js
+++ b/web/src/containers/Verification/MobileVerificationHome.js
@@ -9,12 +9,14 @@ const MobileVerificationHome = ({ user, setActivePageContent }) => {
 	const { phone_number } = user;
 	if (!phone_number) {
 		return (
-			<div>
-				<EditWrapper stringId="USER_VERIFICATION.START_PHONE_VERIFICATION" />
-				<Button
-					label={STRINGS['USER_VERIFICATION.START_PHONE_VERIFICATION']}
-					onClick={() => setActivePageContent('sms')}
-				/>
+			<div className="btn-wrapper">
+				<div className="exir-verification-button">
+					<EditWrapper stringId="USER_VERIFICATION.START_PHONE_VERIFICATION" />
+					<Button
+						label={STRINGS['USER_VERIFICATION.START_PHONE_VERIFICATION']}
+						onClick={() => setActivePageContent('sms')}
+					/>
+				</div>
 			</div>
 		);
 	} else {
diff --git a/web/src/containers/Verification/VerificationHome.js b/web/src/containers/Verification/VerificationHome.js
index 9ec6e20240..3a1273f2c4 100644
--- a/web/src/containers/Verification/VerificationHome.js
+++ b/web/src/containers/Verification/VerificationHome.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import { isMobile } from 'react-device-detect';
 import classnames from 'classnames';
+import { connect } from 'react-redux';
 
 import {
 	IconTitle,
@@ -10,6 +11,7 @@ import {
 } from '../../components';
 import STRINGS from '../../config/localizedStrings';
 import { EditWrapper } from 'components';
+import withConfig from 'components/ConfigProvider/withConfig';
 
 const VerificationHome = ({
 	activeTab,
@@ -18,6 +20,7 @@ const VerificationHome = ({
 	openContactForm,
 	setActiveTab,
 	renderContent,
+	icons: ICONS,
 }) => {
 	// if (activeTab < tabs.length) {
 	return (
@@ -27,6 +30,8 @@ const VerificationHome = ({
 					stringId="ACCOUNTS.TAB_VERIFICATION"
 					text={STRINGS['ACCOUNTS.TAB_VERIFICATION']}
 					textType="title"
+					iconPath={ICONS['TAB_VERIFY']}
+					iconId={STRINGS['ACCOUNTS.TAB_VERIFICATION']}
 				/>
 			)}
 			<HeaderSection openContactForm={openContactForm} />
@@ -47,25 +52,27 @@ const VerificationHome = ({
 					</EditWrapper>
 				</div>
 			</div>
-			{!isMobile ? (
-				<CustomTabBar
-					activeTab={activeTab}
-					setActiveTab={setActiveTab}
-					{...tabProps}
-				/>
-			) : (
-				<MobileTabBar
-					activeTab={activeTab}
-					renderContent={renderContent}
-					setActiveTab={setActiveTab}
-					{...tabProps}
-				/>
-			)}
-			{!isMobile ? (
-				<div className="inner_container">
-					{activeTab > -1 && renderContent(tabs, activeTab)}
-				</div>
-			) : null}
+			<div className="inner-content">
+				{!isMobile ? (
+					<CustomTabBar
+						activeTab={activeTab}
+						setActiveTab={setActiveTab}
+						{...tabProps}
+					/>
+				) : (
+					<MobileTabBar
+						activeTab={activeTab}
+						renderContent={renderContent}
+						setActiveTab={setActiveTab}
+						{...tabProps}
+					/>
+				)}
+				{!isMobile ? (
+					<div className="inner_container">
+						{activeTab > -1 && renderContent(tabs, activeTab)}
+					</div>
+				) : null}
+			</div>
 		</div>
 	);
 	// } else {
@@ -78,4 +85,4 @@ const VerificationHome = ({
 	// }
 };
 
-export default VerificationHome;
+export default connect(null)(withConfig(VerificationHome));
diff --git a/web/src/containers/Verification/_Verification.scss b/web/src/containers/Verification/_Verification.scss
index 7b9a1030f3..df8011ed22 100644
--- a/web/src/containers/Verification/_Verification.scss
+++ b/web/src/containers/Verification/_Verification.scss
@@ -2,11 +2,18 @@
 	margin: 0 auto;
 	padding: 1rem;
 
+	.icon_title-wrapper {
+		flex-direction: row;
+		justify-content: flex-start;
+	}
 	.title-inactive {
 		color: $tab-inactive;
 	}
 	.verification-buttons-wrapper {
 		width: 100%;
+		.exir-button {
+			width: 300px;
+		}
 	}
 	.warning_text {
 		margin: 1rem 0;
@@ -14,14 +21,47 @@
 	}
 	.header-content {
 		color: $colors-deactivate-color2;
-		font-size: 0.8rem;
+		font-size: $font-size-main;
 	}
 	.content-text {
-		font-size: 0.8rem;
+		font-size: $font-size-main;
 	}
 	.document-note-icon {
 		width: 3.5rem;
 	}
+	.inner-content {
+		border-radius: 4px;
+		padding: 30px;
+		margin: 30px 0px 70px;
+		background-color: $app-sidebar-background;
+		padding-bottom: 20px;
+		.custom-tab-wrapper {
+			.tab_item {
+				min-width: 9rem;
+			}
+		}
+		.btn-wrapper {
+			position: relative;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.exir-verification-button {
+				position: absolute;
+				top: 60px;
+				width: 300px;
+			}
+		}
+	}
+}
+
+.verification-form-panel {
+	padding: 30px 50px;
+	background-color: $app-sidebar-background;
+	.action_notification-wrapper {
+		.notification-info {
+    		white-space: nowrap;
+		}
+	}
 }
 
 .verification_content-form-wrapper {
@@ -71,8 +111,50 @@
 			width: 100%;
 			font-size: $font-size-mobile-txt !important;
 		}
-		.exir-button {
+		.exir-verification-button {
 			font-size: $font-size-mobile-txt !important;
+			position: unset !important;
+			top: 0 !important;
+			width: 100% !important;
+		}
+		.inner-content {
+			padding: 5px 8px;
+		}
+		.icon_title-wrapper {
+			margin-top: 0;
+			.icon_title-text.title {
+				font-size: 2.6rem;
+			}
+		}
+		.verification_content-form-wrapper {
+			.verification-form-panel {
+				padding: 5px 8px;
+				.field-wrapper {
+					.field-label-wrapper {
+						flex-direction: column;
+					}
+				}
+			}
+			.content-text {
+				width: 100%;
+			}
+		}
+		.input-box-field {
+			.input_field-input {
+				&::placeholder {
+					font-size: 10px;
+				}
+			}
+		}
+		.verification-buttons-wrapper {
+			.exir-button {
+				width: 100% !important;
+				flex: 1;
+			}
+		}
+		.separator {
+			width: auto;
+			margin: 1rem;
 		}
 	}
 	.mobile-bar-tab .bartab-text-wrapper {
@@ -121,3 +203,34 @@
 		margin-left: 0.5rem;
 	}
 }
+
+@media (max-width: 1060px) {
+	.verification_container {
+		.inner-content {
+			.custom-tab-wrapper {
+				overflow-x: auto;
+			}
+		}
+		.verification-buttons-wrapper {
+			.exir-button {
+				width: 80%;
+			}
+		}
+		.verification_content-form-wrapper {
+			.verification-form-panel {
+				.field-wrapper {
+					.field-label {
+						font-size: $font-size-mobile-innertxt;
+					}
+					.input-box-field {
+						.input_field-input {
+							&::placeholder {
+								font-size: $font-size-mobile-innertxt;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/web/src/containers/Verification/index.js b/web/src/containers/Verification/index.js
index 49fbd93fc7..8b73f150c7 100644
--- a/web/src/containers/Verification/index.js
+++ b/web/src/containers/Verification/index.js
@@ -14,10 +14,12 @@ import {
 	// MobileBarTabs,
 	PanelInformationRow,
 	Button,
+	SmartTarget,
 } from '../../components';
 import withConfig from 'components/ConfigProvider/withConfig';
 import STRINGS from '../../config/localizedStrings';
 import { logout, requestVerificationEmail } from '../../actions/authAction';
+import { MAX_NUMBER_BANKS } from 'config/constants';
 
 import BankVerification from './BankVerification';
 import { isBrowser, isMobile } from 'react-device-detect';
@@ -45,6 +47,9 @@ import MobileVerificationHome from './MobileVerificationHome';
 import DocumentsVerificationHome from './DocumentsVerificationHome';
 import { EditWrapper } from 'components';
 // import MobileTabs from './MobileTabs';
+import { verifyBankData } from 'actions/verificationActions';
+import { getErrorLocalized } from 'utils/errors';
+import { required, maxLength } from 'components/Form/validations';
 
 // const CONTENT_CLASS =
 // 	'd-flex justify-content-center align-items-center f-1 flex-column verification_content-wrapper';
@@ -134,6 +139,10 @@ class Verification extends Component {
 		if (enabledPlugins.includes('kyc')) {
 			currentTabs = [...currentTabs, 'document'];
 		}
+		const sortingArray = ['email', 'sms', 'kyc', 'document', 'bank'];
+		currentTabs.sort(
+			(a, b) => sortingArray.indexOf(a) - sortingArray.indexOf(b)
+		);
 		let activeTab = 0;
 		if (!email && currentTabs.indexOf('email') !== -1) {
 			activeTab = currentTabs.indexOf('email');
@@ -267,11 +276,18 @@ class Verification extends Component {
 					/>
 				),
 				content: (
-					<BankVerificationHome
-						user={user}
+					<SmartTarget
+						id="REMOTE_COMPONENT__BANK_VERIFICATION_HOME"
 						handleBack={this.handleBack}
 						setActivePageContent={this.setActivePageContent}
-					/>
+						MAX_NUMBER_BANKS={MAX_NUMBER_BANKS}
+					>
+						<BankVerificationHome
+							user={user}
+							handleBack={this.handleBack}
+							setActivePageContent={this.setActivePageContent}
+						/>
+					</SmartTarget>
 				),
 			},
 			kyc: {
@@ -433,14 +449,28 @@ class Verification extends Component {
 				);
 			case 'bank':
 				return (
-					<BankVerification
+					<SmartTarget
+						id="REMOTE_COMPONENT__BANK_VERIFICATION"
 						iconId="VERIFICATION_BANK_NEW"
 						icon={ICONS['VERIFICATION_BANK_NEW']}
 						openContactForm={this.openContactForm}
 						setActivePageContent={this.setActivePageContent}
 						handleBack={this.handleBack}
 						moveToNextStep={this.goNextTab}
-					/>
+						verifyBankData={verifyBankData}
+						getErrorLocalized={getErrorLocalized}
+						maxLength={maxLength}
+						required={required}
+					>
+						<BankVerification
+							iconId="VERIFICATION_BANK_NEW"
+							icon={ICONS['VERIFICATION_BANK_NEW']}
+							openContactForm={this.openContactForm}
+							setActivePageContent={this.setActivePageContent}
+							handleBack={this.handleBack}
+							moveToNextStep={this.goNextTab}
+						/>
+					</SmartTarget>
 				);
 			case 'kyc':
 				return (
diff --git a/web/src/containers/Wallet/AssetsBlock.js b/web/src/containers/Wallet/AssetsBlock.js
index 8f73447ce0..880ee416ba 100644
--- a/web/src/containers/Wallet/AssetsBlock.js
+++ b/web/src/containers/Wallet/AssetsBlock.js
@@ -3,7 +3,7 @@ import { Link } from 'react-router';
 import { isMobile } from 'react-device-detect';
 
 import {
-	CurrencyBall,
+	// CurrencyBall,
 	ActionNotification,
 	SearchBox,
 	AssetsBlockForm,
@@ -17,6 +17,7 @@ import {
 	DEFAULT_COIN_DATA,
 } from 'config/constants';
 import withConfig from 'components/ConfigProvider/withConfig';
+import Image from 'components/Image';
 
 const AssetsBlock = ({
 	balance,
@@ -24,7 +25,6 @@ const AssetsBlock = ({
 	coins,
 	pairs,
 	totalAssets,
-	wallets,
 	onOpenDialog,
 	bankaccount,
 	navigate,
@@ -124,7 +124,7 @@ const AssetsBlock = ({
 						) : null}
 					</div>
 				</EditWrapper>
-				<div className="d-flex justify-content-between">
+				<div className="d-flex justify-content-between zero-balance-wrapper">
 					<EditWrapper stringId="WALLET_ASSETS_SEARCH_TXT">
 						<SearchBox
 							name="search-assets"
@@ -184,16 +184,27 @@ const AssetsBlock = ({
 							return (
 								<tr className="table-row table-bottom-border" key={key}>
 									<td className="table-icon td-fit">
-										<Link to={`/wallet/${key.toLowerCase()}`}>
+										{/* <Link to={`/wallet/${key.toLowerCase()}`}>
 											<CurrencyBall
 												name={symbol.toUpperCase()}
 												symbol={key}
 												size="s"
 											/>
-										</Link>
+										</Link> */}
 									</td>
 									<td className="td-name td-fit">
-										<Link to={`/wallet/${key.toLowerCase()}`}>{fullname}</Link>
+										<div className="d-flex align-items-center">
+											<Link to={`/wallet/${key.toLowerCase()}`}>
+												<Image
+													iconId={`${symbol.toUpperCase()}_ICON`}
+													icon={ICONS[`${symbol.toUpperCase()}_ICON`]}
+													wrapperClassName="currency-ball"
+												/>
+											</Link>
+											<Link to={`/wallet/${key.toLowerCase()}`}>
+												{fullname}
+											</Link>
+										</div>
 									</td>
 									<td className="td-amount">
 										<div className="d-flex">
@@ -215,45 +226,28 @@ const AssetsBlock = ({
 									</td>
 									<th className="td-amount" />
 									<td className="td-wallet">
-										{wallets[key] ? (
-											<div className="d-flex justify-content-between deposit-withdrawal-wrapper">
-												<ActionNotification
-													stringId="WALLET_BUTTON_BASE_DEPOSIT"
-													text={STRINGS['WALLET_BUTTON_BASE_DEPOSIT']}
-													iconId="BLUE_PLUS"
-													iconPath={ICONS['BLUE_PLUS']}
-													onClick={() => navigate(`wallet/${key}/deposit`)}
-													className="csv-action"
-													showActionText={isMobile}
-													disable={!allow_deposit}
-												/>
-												<ActionNotification
-													stringId="WALLET_BUTTON_BASE_WITHDRAW"
-													text={STRINGS['WALLET_BUTTON_BASE_WITHDRAW']}
-													iconId="BLUE_PLUS"
-													iconPath={ICONS['BLUE_PLUS']}
-													onClick={() => navigate(`wallet/${key}/withdraw`)}
-													className="csv-action"
-													showActionText={isMobile}
-													disable={!allow_withdrawal}
-												/>
-											</div>
-										) : (
-											<div className="d-flex justify-content-between deposit-withdrawal-wrapper">
-												<ActionNotification
-													stringId="GENERATE_WALLET"
-													text={STRINGS['GENERATE_WALLET']}
-													status="information"
-													iconId="BLUE_PLUS"
-													iconPath={ICONS['BLUE_PLUS']}
-													onClick={() => onOpenDialog(key)}
-													className="need-help"
-													useSvg={true}
-													showActionText={isMobile}
-													disable={!allow_deposit}
-												/>
-											</div>
-										)}
+										<div className="d-flex justify-content-between deposit-withdrawal-wrapper">
+											<ActionNotification
+												stringId="WALLET_BUTTON_BASE_DEPOSIT"
+												text={STRINGS['WALLET_BUTTON_BASE_DEPOSIT']}
+												iconId="BLUE_PLUS"
+												iconPath={ICONS['BLUE_PLUS']}
+												onClick={() => navigate(`wallet/${key}/deposit`)}
+												className="csv-action action-button-wrapper"
+												showActionText={isMobile}
+												disable={!allow_deposit}
+											/>
+											<ActionNotification
+												stringId="WALLET_BUTTON_BASE_WITHDRAW"
+												text={STRINGS['WALLET_BUTTON_BASE_WITHDRAW']}
+												iconId="BLUE_PLUS"
+												iconPath={ICONS['BLUE_PLUS']}
+												onClick={() => navigate(`wallet/${key}/withdraw`)}
+												className="csv-action action-button-wrapper"
+												showActionText={isMobile}
+												disable={!allow_withdrawal}
+											/>
+										</div>
 									</td>
 									{!isMobile && (
 										<td>
diff --git a/web/src/containers/Wallet/CurrencyWallet.js b/web/src/containers/Wallet/CurrencyWallet.js
index 8225fb93cd..e4d7205612 100644
--- a/web/src/containers/Wallet/CurrencyWallet.js
+++ b/web/src/containers/Wallet/CurrencyWallet.js
@@ -4,18 +4,21 @@ import { connect } from 'react-redux';
 import { isMobile } from 'react-device-detect';
 import {
 	IconTitle,
-	CurrencyBallWithPrice,
+	// CurrencyBallWithPrice,
 	ButtonLink,
 	ActionNotification,
 	MobileBarBack,
+	Image,
 } from '../../components';
 import { FLEX_CENTER_CLASSES, DEFAULT_COIN_DATA } from '../../config/constants';
 import {
+	formatToCurrency,
 	generateWalletActionsText,
 	getCurrencyFromName,
 } from '../../utils/currency';
 import STRINGS from '../../config/localizedStrings';
 import withConfig from 'components/ConfigProvider/withConfig';
+import { STATIC_ICONS } from 'config/icons';
 
 class Wallet extends Component {
 	state = {
@@ -44,7 +47,7 @@ class Wallet extends Component {
 	renderWalletHeaderBlock = (symbol, price, balance, coins) => {
 		const { icons: ICONS } = this.props;
 		const balanceValue = balance[`${symbol}_balance`] || 0;
-		const { fullname } = coins[symbol] || DEFAULT_COIN_DATA;
+		const { fullname, min } = coins[symbol] || DEFAULT_COIN_DATA;
 		return (
 			<div className="wallet-header_block">
 				<div className="wallet-header_block-currency_title">
@@ -53,18 +56,29 @@ class Wallet extends Component {
 						stringId="TRADE_HISTORY"
 						text={STRINGS['TRADE_HISTORY']}
 						status="information"
-						iconId="BLUE_CLIP"
-						iconPath={ICONS['BLUE_CLIP']}
+						iconId="PAPER_CLIP"
+						iconPath={STATIC_ICONS['PAPER_CLIP']}
+						className="paper-clip-icon"
 						onClick={() => {
 							this.props.router.push('/transactions');
 						}}
 					/>
 				</div>
-				<CurrencyBallWithPrice
+				{/* <CurrencyBallWithPrice
 					symbol={symbol}
 					amount={balanceValue}
 					price={price}
-				/>
+				/> */}
+				<div className="d-flex">
+					<Image
+						iconId={`${symbol.toUpperCase()}_ICON`}
+						icon={ICONS[`${symbol.toUpperCase()}_ICON`]}
+						wrapperClassName="coin-icons"
+					/>
+					<div className="with_price-block_amount-value">
+						{`${formatToCurrency(balanceValue, min)}`}
+					</div>
+				</div>
 			</div>
 		);
 	};
diff --git a/web/src/containers/Wallet/MainWallet.js b/web/src/containers/Wallet/MainWallet.js
index d0cfa0972c..6824038c4d 100644
--- a/web/src/containers/Wallet/MainWallet.js
+++ b/web/src/containers/Wallet/MainWallet.js
@@ -2,17 +2,9 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { isMobile } from 'react-device-detect';
-import {
-	IconTitle,
-	Dialog,
-	Accordion,
-	Notification,
-	MobileBarTabs,
-} from 'components';
+import { IconTitle, Accordion, MobileBarTabs } from 'components';
 import { TransactionsHistory } from 'containers';
 import { changeSymbol } from 'actions/orderbookAction';
-import { NOTIFICATIONS } from 'actions/appActions';
-import { createAddress, cleanCreateAddress } from 'actions/userAction';
 import {
 	BASE_CURRENCY,
 	CURRENCY_PRICE_FORMAT,
@@ -24,6 +16,7 @@ import withConfig from 'components/ConfigProvider/withConfig';
 
 import AssetsBlock from './AssetsBlock';
 import MobileWallet from './MobileWallet';
+import { STATIC_ICONS } from 'config/icons';
 
 class Wallet extends Component {
 	state = {
@@ -31,8 +24,6 @@ class Wallet extends Component {
 		sections: [],
 		mobileTabs: [],
 		isOpen: true,
-		dialogIsOpen: false,
-		selectedCurrency: '',
 	};
 
 	componentDidMount() {
@@ -41,7 +32,6 @@ class Wallet extends Component {
 			this.props.balance,
 			this.props.prices,
 			this.state.isOpen,
-			this.props.wallets,
 			this.props.bankaccount,
 			this.props.coins,
 			this.props.pairs,
@@ -56,20 +46,12 @@ class Wallet extends Component {
 			nextProps.balance,
 			nextProps.prices,
 			this.state.isOpen,
-			nextProps.wallets,
 			nextProps.bankaccount,
 			nextProps.coins,
 			nextProps.pairs,
 			nextProps.totalAsset,
 			nextProps.oraclePrices
 		);
-
-		if (
-			nextProps.addressRequest.success === true &&
-			nextProps.addressRequest.success !== this.props.addressRequest.success
-		) {
-			this.onCloseDialog();
-		}
 	}
 
 	componentDidUpdate(_, prevState) {
@@ -83,7 +65,6 @@ class Wallet extends Component {
 				this.props.balance,
 				this.props.prices,
 				this.state.isOpen,
-				this.props.wallets,
 				this.props.bankaccount,
 				this.props.coins,
 				this.props.pairs,
@@ -128,7 +109,6 @@ class Wallet extends Component {
 		balance,
 		prices,
 		isOpen = false,
-		wallets,
 		bankaccount,
 		coins,
 		pairs,
@@ -142,7 +122,7 @@ class Wallet extends Component {
 			formatToCurrency(total, min)
 		);
 		const searchResult = this.getSearchResult(coins, balance, oraclePrices);
-		const { icons: ICONS } = this.props;
+		// const { icons: ICONS } = this.props;
 
 		const sections = [
 			{
@@ -156,7 +136,6 @@ class Wallet extends Component {
 						pairs={pairs}
 						totalAssets={totalAssets}
 						changeSymbol={changeSymbol}
-						wallets={wallets}
 						onOpenDialog={this.onOpenDialog}
 						bankaccount={bankaccount}
 						navigate={this.goToPage}
@@ -171,10 +150,10 @@ class Wallet extends Component {
 					stringId: 'TRADE_HISTORY',
 					text: STRINGS['TRADE_HISTORY'],
 					status: 'information',
-					iconId: 'BLUE_CLIP',
-					iconPath: ICONS['BLUE_CLIP'],
+					iconId: 'PAPER_CLIP',
+					iconPath: STATIC_ICONS['PAPER_CLIP'],
 					allowClick: true,
-					className: isOpen ? '' : 'wallet-notification',
+					className: isOpen ? 'paper-clip-icon' : 'paper-clip-icon wallet-notification',
 					onClick: () => {
 						this.props.router.push('/transactions');
 					},
@@ -187,7 +166,6 @@ class Wallet extends Component {
 				content: (
 					<MobileWallet
 						sections={sections}
-						wallets={wallets}
 						balance={balance}
 						prices={prices}
 						navigate={this.goToPage}
@@ -207,34 +185,14 @@ class Wallet extends Component {
 		this.props.router.push(path);
 	};
 
-	onOpenDialog = (selectedCurrency) => {
-		this.setState({ dialogIsOpen: true, selectedCurrency });
-		this.props.cleanCreateAddress();
-	};
-
-	onCloseDialog = () => {
-		this.setState({ dialogIsOpen: false, selectedCurrency: '' });
-	};
-
-	onCreateAddress = () => {
-		if (this.state.selectedCurrency && !this.props.addressRequest.error) {
-			this.props.createAddress(this.state.selectedCurrency);
-		}
-	};
-
 	setActiveTab = (activeTab) => {
 		this.setState({ activeTab });
 	};
 
 	render() {
-		const {
-			sections,
-			dialogIsOpen,
-			selectedCurrency,
-			activeTab,
-			mobileTabs,
-		} = this.state;
-		const { activeTheme, addressRequest, coins } = this.props;
+		const { sections, activeTab, mobileTabs } = this.state;
+		const { icons: ICONS } = this.props;
+
 		if (mobileTabs.length === 0) {
 			return <div />;
 		}
@@ -252,11 +210,12 @@ class Wallet extends Component {
 						</div>
 					</div>
 				) : (
-					<div className="presentation_container apply_rtl">
+					<div className="presentation_container apply_rtl wallet-wrapper">
 						<IconTitle
 							stringId="WALLET_TITLE"
 							text={STRINGS['WALLET_TITLE']}
-							// iconPath={ICONS.BITCOIN_WALLET}
+							iconPath={ICONS['TAB_WALLET']}
+							iconId={STRINGS['WALLET_TITLE']}
 							textType="title"
 						/>
 						<div className="wallet-container">
@@ -264,27 +223,6 @@ class Wallet extends Component {
 						</div>
 					</div>
 				)}
-				<Dialog
-					isOpen={dialogIsOpen}
-					label="hollaex-modal"
-					className="app-dialog"
-					onCloseDialog={this.onCloseDialog}
-					shouldCloseOnOverlayClick={false}
-					theme={activeTheme}
-					showCloseText={true}
-					style={{ 'z-index': 100 }}
-				>
-					{dialogIsOpen && selectedCurrency && (
-						<Notification
-							type={NOTIFICATIONS.GENERATE_ADDRESS}
-							onBack={this.onCloseDialog}
-							onGenerate={this.onCreateAddress}
-							currency={selectedCurrency}
-							data={addressRequest}
-							coins={coins}
-						/>
-					)}
-				</Dialog>
 			</div>
 		);
 	}
@@ -296,18 +234,14 @@ const mapStateToProps = (store) => ({
 	pairs: store.app.pairs,
 	prices: store.orderbook.prices,
 	balance: store.user.balance,
-	addressRequest: store.user.addressRequest,
 	activeTheme: store.app.theme,
 	activeLanguage: store.app.language,
 	bankaccount: store.user.userData.bank_account,
-	wallets: store.user.crypto_wallet,
 	totalAsset: store.asset.totalAsset,
 	oraclePrices: store.asset.oraclePrices,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-	createAddress: bindActionCreators(createAddress, dispatch),
-	cleanCreateAddress: bindActionCreators(cleanCreateAddress, dispatch),
 	changeSymbol: bindActionCreators(changeSymbol, dispatch),
 });
 
diff --git a/web/src/containers/Wallet/MobileWallet.js b/web/src/containers/Wallet/MobileWallet.js
index 64f8386c19..a5a68c05f6 100644
--- a/web/src/containers/Wallet/MobileWallet.js
+++ b/web/src/containers/Wallet/MobileWallet.js
@@ -3,14 +3,7 @@ import classnames from 'classnames';
 import { Accordion } from '../../components';
 import CurrencySlider from './components/CurrencySlider';
 
-const MobileWallet = ({
-	sections,
-	wallets,
-	balance,
-	prices,
-	navigate,
-	coins,
-}) => (
+const MobileWallet = ({ sections, balance, prices, navigate, coins }) => (
 	<div
 		className={classnames(
 			'flex-column',
@@ -24,7 +17,6 @@ const MobileWallet = ({
 	>
 		<div className="d-flex f-05">
 			<CurrencySlider
-				wallets={wallets}
 				balance={balance}
 				prices={prices}
 				navigate={navigate}
diff --git a/web/src/containers/Wallet/_Wallet.scss b/web/src/containers/Wallet/_Wallet.scss
index 8463377c13..2e7161a73a 100644
--- a/web/src/containers/Wallet/_Wallet.scss
+++ b/web/src/containers/Wallet/_Wallet.scss
@@ -38,9 +38,13 @@ $header-margin: 2rem;
 						font-weight: bold;
 					}
 				}
+				.action_notification-wrapper {
+					margin: 0;
+				}
 			}
 		}
 		.wallet-assets_block {
+			padding: 6px;
 			.wallet-assets_block-table {
 				thead {
 					tr {
@@ -77,6 +81,12 @@ $header-margin: 2rem;
 					font-size: $font-size-mobile-innertxt !important;
 				}
 			}
+			.zero-balance-wrapper {
+				flex-direction: column;
+			}
+		}
+		.action-button-wrapper {
+			padding: 5px 2px;
 		}
 	}
 }
@@ -96,6 +106,28 @@ $header-margin: 2rem;
 
 		.wallet-header_block {
 		}
+		.coin-icons {
+			width: 50px;
+			padding-top: 4px;
+		}
+		.with_price-block_amount-value {
+			font-size: $font-size-headline;
+			line-height: $font-size-headline;
+		}
+	}
+	.paper-clip-icon {
+		.action_notification-svg {
+			background-color: $link;
+			width: 1.2rem;
+			height: 1.2rem;
+			border-radius: 50%;
+			display: flex;
+    		margin-left: 5px;
+			svg {
+				width: 0.8rem  !important;
+				height: 0.8rem !important;
+			}
+		}
 	}
 
 	.wallet-buttons_action {
@@ -123,9 +155,12 @@ $header-margin: 2rem;
 
 	.wallet-assets_block {
 		// border-top: $wrapper-border;
-		.action_notification-wrapper {
-			margin: 0 !important;
-		}
+		background-color: $app-sidebar-background;
+		padding: 20px;
+		overflow-y: auto;
+		// .action_notification-wrapper {
+		// 	margin: 0 !important;
+		// }
 
 		.td-wallet {
 			min-width: 225px;
@@ -163,7 +198,7 @@ $header-margin: 2rem;
 				position: relative;
 				&:not(:first-child) {
 					border-bottom: 1px solid $colors-main-border;
-					padding: 0 0.25rem;
+					padding: 1rem 0.25rem;
 				}
 			}
 
@@ -186,11 +221,29 @@ $header-margin: 2rem;
 				direction: ltr;
 			}
 		}
+		.search-field {
+			background-color: $app-sidebar-background;
+		}
+		.currency-ball {
+			width: 30px;
+			padding-top: 4px;
+		}
 	}
 
 	.accordion_wrapper .action_notification-wrapper {
 		position: relative;
 	}
+	.action-button-wrapper {
+		border: 1px solid $link;
+		padding: 5px 12px;
+
+		&:hover {
+			background-color: $link;
+			.notification-info {
+				color: white !important;
+			}
+		}
+	}
 }
 
 .show-equals:after {
diff --git a/web/src/containers/Wallet/components/CurrencySlider.js b/web/src/containers/Wallet/components/CurrencySlider.js
index b20445a168..65507d2834 100644
--- a/web/src/containers/Wallet/components/CurrencySlider.js
+++ b/web/src/containers/Wallet/components/CurrencySlider.js
@@ -56,7 +56,7 @@ class CurrencySlider extends Component {
 		);
 
 	render() {
-		const { wallets, balance, prices, navigate, coins } = this.props;
+		const { balance, prices, navigate, coins } = this.props;
 		const { currentCurrency } = this.state;
 		const balanceValue = balance[`${currentCurrency}_balance`];
 		const baseBalance =
@@ -86,29 +86,27 @@ class CurrencySlider extends Component {
 				</div>
 
 				<div className="mb-4 button-container">
-					{wallets[currentCurrency.toLowerCase()] && (
-						<div className="d-flex justify-content-between flew-row ">
-							{allow_deposit ? (
-								<Button
-									className="mr-4"
-									label={STRINGS.formatString(
-										STRINGS['RECEIVE_CURRENCY'],
-										fullname
-									).join('')}
-									onClick={() => navigate(`wallet/${currentCurrency}/deposit`)}
-								/>
-							) : null}
-							{allow_withdrawal ? (
-								<Button
-									label={STRINGS.formatString(
-										STRINGS['SEND_CURRENCY'],
-										fullname
-									).join('')}
-									onClick={() => navigate(`wallet/${currentCurrency}/withdraw`)}
-								/>
-							) : null}
-						</div>
-					)}
+					<div className="d-flex justify-content-between flew-row ">
+						{allow_deposit && (
+							<Button
+								className="mr-4"
+								label={STRINGS.formatString(
+									STRINGS['RECEIVE_CURRENCY'],
+									fullname
+								).join('')}
+								onClick={() => navigate(`wallet/${currentCurrency}/deposit`)}
+							/>
+						)}
+						{allow_withdrawal && (
+							<Button
+								label={STRINGS.formatString(
+									STRINGS['SEND_CURRENCY'],
+									fullname
+								).join('')}
+								onClick={() => navigate(`wallet/${currentCurrency}/withdraw`)}
+							/>
+						)}
+					</div>
 				</div>
 			</div>
 		);
diff --git a/web/src/containers/Withdraw/ReviewModalContent.js b/web/src/containers/Withdraw/ReviewModalContent.js
index 2c2f377084..708c16a338 100644
--- a/web/src/containers/Withdraw/ReviewModalContent.js
+++ b/web/src/containers/Withdraw/ReviewModalContent.js
@@ -10,6 +10,7 @@ import {
 } from '../../config/constants';
 import withConfig from 'components/ConfigProvider/withConfig';
 import { EditWrapper } from 'components';
+import { getNetworkLabelByKey } from 'utils/wallet';
 
 import STRINGS from '../../config/localizedStrings';
 
@@ -39,6 +40,7 @@ const ReviewModalContent = ({
 	onClickAccept,
 	onClickCancel,
 	icons: ICONS,
+	hasDestinationTag,
 }) => {
 	const { min, fullname, symbol = '' } =
 		coins[currency || BASE_CURRENCY] || DEFAULT_COIN_DATA;
@@ -65,64 +67,58 @@ const ReviewModalContent = ({
 				icon={ICONS['CHECK_SENDING_BITCOIN']}
 				wrapperClassName="review-icon"
 			/>
-			{currency === BASE_CURRENCY ? (
-				<div className="d-flex flex-column align-items-center review-info_container">
-					<div className="review-info_message">
-						<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_ABOUT_WITHDRAW">
-							{STRINGS['WITHDRAW_PAGE.MESSAGE_ABOUT_WITHDRAW']}
-						</EditWrapper>
-					</div>
-					<div className="review-crypto-amount review-crypto-address">
-						<div>{cryptoAmountText}</div>
-						<div className="review-fee_message">
-							<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_FEE_BASE">
-								{STRINGS.formatString(
-									STRINGS['WITHDRAW_PAGE.MESSAGE_FEE_BASE'],
-									STRINGS.formatString(
-										CURRENCY_PRICE_FORMAT,
-										formatToCurrency(fee, baseCoin.min),
-										baseCoin.symbol.toUpperCase()
-									)
-								)}
-							</EditWrapper>
-						</div>
-					</div>
+			<div className="d-flex flex-column align-items-center review-info_container">
+				<div className="review-info_message">
+					<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_ABOUT_SEND">
+						{STRINGS['WITHDRAW_PAGE.MESSAGE_ABOUT_SEND']}
+					</EditWrapper>
 				</div>
-			) : (
-				<div className="d-flex flex-column align-items-center review-info_container">
-					<div className="review-info_message">
-						<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_ABOUT_SEND">
-							{STRINGS['WITHDRAW_PAGE.MESSAGE_ABOUT_SEND']}
-						</EditWrapper>
-					</div>
-					<div className="review-crypto-amount review-crypto-address">
-						<div>{cryptoAmountText}</div>
-						<div className="review-fee_message">
-							<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_FEE">
-								{STRINGS.formatString(
-									STRINGS['WITHDRAW_PAGE.MESSAGE_FEE'],
-									fee,
-									STRINGS.formatString(
-										CURRENCY_PRICE_FORMAT,
-										formatToCurrency(feePrice, baseCoin.min),
-										baseCoin.symbol.toUpperCase()
-									)
-								)}
-							</EditWrapper>
-						</div>
-					</div>
-					<div className="review-warning_arrow" />
-					<div className="review-crypto-address">{data.address}</div>
-					<div className="warning_text review-info_message">
-						<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_BTC_WARNING">
+				<div className="review-crypto-amount review-crypto-address">
+					<div>{cryptoAmountText}</div>
+					<div className="review-fee_message">
+						<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_FEE">
 							{STRINGS.formatString(
-								STRINGS['WITHDRAW_PAGE.MESSAGE_BTC_WARNING'],
-								fullname
+								STRINGS['WITHDRAW_PAGE.MESSAGE_FEE'],
+								fee,
+								STRINGS.formatString(
+									CURRENCY_PRICE_FORMAT,
+									formatToCurrency(feePrice, baseCoin.min),
+									baseCoin.symbol.toUpperCase()
+								)
 							)}
 						</EditWrapper>
 					</div>
 				</div>
-			)}
+				<div className="review-warning_arrow" />
+				<div className="review-crypto-address">{data.address}</div>
+				{data.network && (
+					<div className="review-fee_message">
+						{STRINGS.formatString(
+							STRINGS['WITHDRAW_PAGE_NETWORK_TYPE_MESSAGE'],
+							fullname,
+							getNetworkLabelByKey(data.network)
+						)}
+					</div>
+				)}
+				{hasDestinationTag && (
+					<div className="review-fee_message">
+						{STRINGS.formatString(
+							STRINGS['WITHDRAW_PAGE_DESTINATION_TAG_MESSAGE'],
+							data.destination_tag
+								? data.destination_tag
+								: STRINGS['WITHDRAW_PAGE_DESTINATION_TAG_NONE']
+						)}
+					</div>
+				)}
+				<div className="warning_text review-info_message">
+					<EditWrapper stringId="WITHDRAW_PAGE.MESSAGE_BTC_WARNING">
+						{STRINGS.formatString(
+							STRINGS['WITHDRAW_PAGE.MESSAGE_BTC_WARNING'],
+							fullname
+						)}
+					</EditWrapper>
+				</div>
+			</div>
 			<ButtonSection
 				onClickAccept={onClickAccept}
 				onClickCancel={onClickCancel}
diff --git a/web/src/containers/Withdraw/_Withdraw.scss b/web/src/containers/Withdraw/_Withdraw.scss
index 8a7e64f6a4..aaacb61aea 100644
--- a/web/src/containers/Withdraw/_Withdraw.scss
+++ b/web/src/containers/Withdraw/_Withdraw.scss
@@ -64,6 +64,29 @@ $content--margin: 2rem;
 	margin: $content--margin 0;
 }
 
+.withdrawal-container {
+	.icon_title-wrapper {
+		flex-direction: row;
+		justify-content: flex-start;
+	}
+	.withdraw-form-wrapper {
+		.withdraw-form {
+			border-radius: 4px;
+			margin: 0 0 40px;
+			background-color: $app-sidebar-background;
+			padding: 30px;
+		}
+		.btn-wrapper {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			.exir-button {
+				width: 300px;
+			}
+		}
+	}
+}
+
 .layout-mobile {
 	.review-wrapper {
 		min-width: 0;
@@ -136,6 +159,18 @@ $content--margin: 2rem;
 	.review_email-wrapper {
 		margin: 0px auto !important;
 	}
+
+	.withdrawal-container {
+		.withdraw-form-wrapper {
+			.withdraw-form {
+				.field-wrapper {
+					.field-label-wrapper {
+						flex-direction: column;
+					}
+				}
+			}
+		}
+	}
 }
 
 .review_email-wrapper {
@@ -146,3 +181,29 @@ $content--margin: 2rem;
 		padding: 1rem;
 	}
 }
+
+@media screen and (max-width: 1096px) {
+	.withdrawal-container {
+		.withdraw-form-wrapper {
+			.withdraw-form {
+				.field-wrapper {
+					.field-label {
+						font-size: $font-size-mobile-innertxt;
+					}
+					.input-box-field {
+						.input_field-input {
+							&::placeholder {
+								font-size: $font-size-mobile-innertxt;
+							}
+						}
+					}
+				}
+			}
+			.btn-wrapper {
+				.exir-button {
+					width: 200px;
+				}
+			}
+		}
+	}
+}
diff --git a/web/src/containers/Withdraw/form.js b/web/src/containers/Withdraw/form.js
index f3ee7940a0..677b456dd6 100644
--- a/web/src/containers/Withdraw/form.js
+++ b/web/src/containers/Withdraw/form.js
@@ -9,8 +9,8 @@ import {
 	change,
 } from 'redux-form';
 import math from 'mathjs';
-import classnames from 'classnames';
-import { isMobile } from 'react-device-detect';
+// import classnames from 'classnames';
+// import { isMobile } from 'react-device-detect';
 import { Button, Dialog, OtpForm, Loader } from '../../components';
 import renderFields from '../../components/Form/factoryFields';
 import {
@@ -19,7 +19,8 @@ import {
 } from './notifications';
 import { BASE_CURRENCY } from '../../config/constants';
 import { calculateBaseFee } from './utils';
-
+import Fiat from 'containers/Deposit/Fiat';
+import Image from 'components/Image';
 import STRINGS from '../../config/localizedStrings';
 
 import ReviewModalContent from './ReviewModalContent';
@@ -183,7 +184,7 @@ class Form extends Component {
 			pristine,
 			error,
 			valid,
-			initialValues, // eslint-disable-line
+			// initialValues, // eslint-disable-line
 			currency,
 			data,
 			openContactForm,
@@ -191,49 +192,71 @@ class Form extends Component {
 			currentPrice,
 			activeTheme,
 			coins,
+			titleSection,
+			icons: ICONS,
+			selectedNetwork,
 		} = this.props;
 
 		const { dialogIsOpen, dialogOtpOpen } = this.state;
+		const hasDestinationTag =
+			currency === 'xrp' || currency === 'xlm' || selectedNetwork === 'stellar';
 
-		return (
-			<form autoComplete="off">
-				<div className={classnames({ 'w-50': !isMobile })}>
-					{renderFields(formValues)}
-					{error && <div className="warning_text">{error}</div>}
-				</div>
-				<Button
-					label={STRINGS['WITHDRAWALS_BUTTON_TEXT']}
-					disabled={pristine || submitting || !valid}
-					onClick={this.onOpenDialog}
-				/>
-				<Dialog
-					isOpen={dialogIsOpen}
-					label="withdraw-modal"
-					onCloseDialog={this.onCloseDialog}
-					shouldCloseOnOverlayClick={dialogOtpOpen}
-					theme={activeTheme}
-					showCloseText={false}
-				>
-					{dialogOtpOpen ? (
-						<OtpForm
-							onSubmit={this.onSubmitOtp}
-							onClickHelp={openContactForm}
+		const coinObject = coins[currency];
+		if (coinObject && !coinObject.meta.is_fiat) {
+			return (
+				<form autoComplete="off" className="withdraw-form-wrapper">
+					<div className="withdraw-form">
+						<Image
+							iconId={`${currency.toUpperCase()}_ICON`}
+							icon={ICONS[`${currency.toUpperCase()}_ICON`]}
+							wrapperClassName="form_currency-ball"
 						/>
-					) : !submitting ? (
-						<ReviewModalContent
-							coins={coins}
-							currency={currency}
-							data={data}
-							price={currentPrice}
-							onClickAccept={this.onAcceptDialog}
-							onClickCancel={this.onCloseDialog}
+						{titleSection}
+						{renderFields(formValues)}
+						{error && <div className="warning_text">{error}</div>}
+					</div>
+					<div className="btn-wrapper">
+						<Button
+							label={STRINGS['WITHDRAWALS_BUTTON_TEXT']}
+							disabled={pristine || submitting || !valid}
+							onClick={this.onOpenDialog}
+							className="mb-3"
 						/>
-					) : (
-						<Loader relative={true} background={false} />
-					)}
-				</Dialog>
-			</form>
-		);
+					</div>
+					<Dialog
+						isOpen={dialogIsOpen}
+						label="withdraw-modal"
+						onCloseDialog={this.onCloseDialog}
+						shouldCloseOnOverlayClick={dialogOtpOpen}
+						theme={activeTheme}
+						showCloseText={false}
+					>
+						{dialogOtpOpen ? (
+							<OtpForm
+								onSubmit={this.onSubmitOtp}
+								onClickHelp={openContactForm}
+							/>
+						) : !submitting ? (
+							<ReviewModalContent
+								coins={coins}
+								currency={currency}
+								data={data}
+								price={currentPrice}
+								onClickAccept={this.onAcceptDialog}
+								onClickCancel={this.onCloseDialog}
+								hasDestinationTag={hasDestinationTag}
+							/>
+						) : (
+							<Loader relative={true} background={false} />
+						)}
+					</Dialog>
+				</form>
+			);
+		} else if (coinObject && coinObject.meta.is_fiat) {
+			return <Fiat icons={ICONS} />;
+		} else {
+			return <div>{STRINGS['DEPOSIT.NO_DATA']}</div>;
+		}
 	}
 }
 
@@ -244,13 +267,14 @@ const WithdrawForm = reduxForm({
 		dispatch(reset(FORM_NAME));
 		setWithdrawEmailConfirmation(data, dispatch);
 	},
-	// enableReinitialize: true,
+	enableReinitialize: true,
 	validate,
 })(Form);
 
 const mapStateToForm = (state) => ({
 	data: selector(
 		state,
+		'network',
 		'address',
 		'destination_tag',
 		'amount',
diff --git a/web/src/containers/Withdraw/formUtils.js b/web/src/containers/Withdraw/formUtils.js
index 196debf8e9..e9fb243edf 100644
--- a/web/src/containers/Withdraw/formUtils.js
+++ b/web/src/containers/Withdraw/formUtils.js
@@ -13,12 +13,21 @@ import { getLanguage } from '../../utils/string';
 import { getTheme } from '../../utils/theme';
 import { toFixed } from '../../utils/currency';
 import { getDecimals } from '../../utils/utils';
+import { getNetworkLabelByKey } from 'utils/wallet';
 
-export const generateInitialValues = (symbol, coins = {}) => {
-	const { min, withdrawal_fee } = coins[symbol] || DEFAULT_COIN_DATA;
+export const generateInitialValues = (
+	symbol,
+	coins = {},
+	networks,
+	network
+) => {
+	const { min, withdrawal_fee, withdrawal_fees } =
+		coins[symbol] || DEFAULT_COIN_DATA;
 	const initialValues = {};
 
-	if (coins[symbol]) {
+	if (withdrawal_fees && network && withdrawal_fees[network]) {
+		initialValues.fee = withdrawal_fees[network];
+	} else if (coins[symbol]) {
 		initialValues.fee = withdrawal_fee;
 	} else {
 		initialValues.fee = 0;
@@ -26,7 +35,17 @@ export const generateInitialValues = (symbol, coins = {}) => {
 
 	if (min) {
 		initialValues.amount = min;
+	} else {
+		initialValues.amount = '';
+	}
+
+	initialValues.destination_tag = '';
+	initialValues.address = '';
+
+	if (networks && networks.length > 0) {
+		initialValues.network = network;
 	}
+
 	return initialValues;
 };
 
@@ -38,145 +57,189 @@ export const generateFormValues = (
 	verification_level,
 	theme = getTheme(),
 	icon,
-	iconId
+	iconId,
+	networks,
+	selectedNetwork
 ) => {
 	const { fullname, min, increment_unit, withdrawal_limits = {} } =
 		coins[symbol] || DEFAULT_COIN_DATA;
 	let MAX = withdrawal_limits[verification_level];
 	if (withdrawal_limits[verification_level] === 0) MAX = '';
 	if (withdrawal_limits[verification_level] === -1) MAX = 0;
+
 	const fields = {};
-	fields.address = {
-		type: 'text',
-		stringId:
-			'WITHDRAWALS_FORM_ADDRESS_LABEL,WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER',
-		label: STRINGS['WITHDRAWALS_FORM_ADDRESS_LABEL'],
-		placeholder: STRINGS['WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER'],
-		validate: [
-			required,
-			validAddress(
-				symbol,
-				STRINGS[`WITHDRAWALS_${symbol.toUpperCase()}_INVALID_ADDRESS`],
-				coins[symbol].network
-			),
-		],
-		fullWidth: true,
-	};
-	if (symbol === 'xrp') {
-		fields.destination_tag = {
-			type: 'number',
+
+	if (networks) {
+		const networkOptions = networks.map((network) => ({
+			value: network,
+			label: getNetworkLabelByKey(network),
+		}));
+
+		fields.network = {
+			type: 'select',
 			stringId:
-				'WITHDRAWALS_FORM_DESTINATION_TAG_LABEL,WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER',
-			label: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_LABEL'],
-			placeholder: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER'],
+				'WITHDRAWALS_FORM_NETWORK_LABEL,WITHDRAWALS_FORM_NETWORK_PLACEHOLDER,WITHDRAWALS_FORM_NETWORK_WARNING',
+			label: STRINGS['WITHDRAWALS_FORM_NETWORK_LABEL'],
+			placeholder: STRINGS['WITHDRAWALS_FORM_NETWORK_PLACEHOLDER'],
+			warning: STRINGS['WITHDRAWALS_FORM_NETWORK_WARNING'],
+			validate: [required],
 			fullWidth: true,
+			options: networkOptions,
+			hideCheck: true,
+			ishorizontalfield: true,
+			disabled: networks.length === 1,
 		};
-	} else if (symbol === 'xlm' || coins[symbol].network === 'stellar') {
-		fields.destination_tag = {
+	}
+
+	if (!networks || (networks && (networks.length === 1 || selectedNetwork))) {
+		fields.address = {
 			type: 'text',
 			stringId:
-				'WITHDRAWALS_FORM_MEMO_LABEL,WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER',
-			label: STRINGS['WITHDRAWALS_FORM_MEMO_LABEL'],
-			placeholder: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER'],
+				'WITHDRAWALS_FORM_ADDRESS_LABEL,WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER',
+			label: STRINGS['WITHDRAWALS_FORM_ADDRESS_LABEL'],
+			placeholder: STRINGS['WITHDRAWALS_FORM_ADDRESS_PLACEHOLDER'],
+			validate: [
+				required,
+				validAddress(
+					symbol,
+					STRINGS[`WITHDRAWALS_${symbol.toUpperCase()}_INVALID_ADDRESS`],
+					selectedNetwork
+				),
+			],
 			fullWidth: true,
+			ishorizontalfield: true,
 		};
-	}
+		if (symbol === 'xrp') {
+			fields.destination_tag = {
+				type: 'number',
+				stringId:
+					'WITHDRAWALS_FORM_DESTINATION_TAG_LABEL,WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER,WITHDRAWALS_FORM_DESTINATION_TAG_WARNING',
+				label: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_LABEL'],
+				warning: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_WARNING'],
+				placeholder: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER'],
+				fullWidth: true,
+				ishorizontalfield: true,
+			};
+		} else if (symbol === 'xlm' || selectedNetwork === 'stellar') {
+			fields.destination_tag = {
+				type: 'text',
+				stringId:
+					'WITHDRAWALS_FORM_MEMO_LABEL,WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER,WITHDRAWALS_FORM_DESTINATION_TAG_WARNING',
+				label: STRINGS['WITHDRAWALS_FORM_MEMO_LABEL'],
+				warning: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_WARNING'],
+				placeholder: STRINGS['WITHDRAWALS_FORM_DESTINATION_TAG_PLACEHOLDER'],
+				fullWidth: true,
+				ishorizontalfield: true,
+			};
+		}
 
-	const amountValidate = [required];
-	if (min) {
-		amountValidate.push(minValue(min, STRINGS['WITHDRAWALS_MIN_VALUE_ERROR']));
-	}
-	if (MAX) {
-		amountValidate.push(maxValue(MAX, STRINGS['WITHDRAWALS_MAX_VALUE_ERROR']));
-	}
-	// FIX add according fee
-	// amountValidate.push(checkBalance(available, STRINGS.formatString(STRINGS["WITHDRAWALS_LOWER_BALANCE"], fullname), fee));
-	amountValidate.push(
-		checkBalance(
-			available,
-			STRINGS.formatString(STRINGS['WITHDRAWALS_LOWER_BALANCE'], fullname),
-			0
-		)
-	);
-
-	fields.amount = {
-		type: 'number',
-		stringId:
-			'WITHDRAWALS_FORM_AMOUNT_LABEL,WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER',
-		label: STRINGS.formatString(
-			STRINGS['WITHDRAWALS_FORM_AMOUNT_LABEL'],
-			fullname
-		),
-		placeholder: STRINGS.formatString(
-			STRINGS['WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER'],
-			fullname
-		).join(''),
-		min: min,
-		max: MAX,
-		step: increment_unit,
-		validate: amountValidate,
-		normalize: normalizeBTC,
-		fullWidth: true,
-		notification: {
-			stringId: 'CALCULATE_MAX',
-			text: STRINGS['CALCULATE_MAX'],
-			status: 'information',
-			iconPath: icon,
-			iconId,
-			className: 'file_upload_icon',
-			useSvg: true,
-			onClick: calculateMax,
-		},
-		parse: (value = '') => {
-			let decimal = getDecimals(increment_unit);
-			let decValue = toFixed(value);
-			let valueDecimal = getDecimals(decValue);
-
-			let result = value;
-			if (decimal < valueDecimal) {
-				result = decValue
-					.toString()
-					.substring(0, decValue.toString().length - (valueDecimal - decimal));
-			}
-			return result;
-		},
-	};
+		const amountValidate = [required];
+		if (min) {
+			amountValidate.push(
+				minValue(min, STRINGS['WITHDRAWALS_MIN_VALUE_ERROR'])
+			);
+		}
+		if (MAX) {
+			amountValidate.push(
+				maxValue(MAX, STRINGS['WITHDRAWALS_MAX_VALUE_ERROR'])
+			);
+		}
+		// FIX add according fee
+		// amountValidate.push(checkBalance(available, STRINGS.formatString(STRINGS["WITHDRAWALS_LOWER_BALANCE"], fullname), fee));
+		amountValidate.push(
+			checkBalance(
+				available,
+				STRINGS.formatString(STRINGS['WITHDRAWALS_LOWER_BALANCE'], fullname),
+				0
+			)
+		);
 
-	if (coins[symbol]) {
-		fields.fee = {
+		fields.amount = {
 			type: 'number',
 			stringId:
-				'WITHDRAWALS_FORM_FEE_COMMON_LABEL,WITHDRAWALS_FORM_FEE_PLACEHOLDER',
-			// label: STRINGS[`WITHDRAWALS_FORM_FEE_${symbol.toUpperCase()}_LABEL`],
+				'WITHDRAWALS_FORM_AMOUNT_LABEL,WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER',
 			label: STRINGS.formatString(
-				STRINGS['WITHDRAWALS_FORM_FEE_COMMON_LABEL'],
+				STRINGS['WITHDRAWALS_FORM_AMOUNT_LABEL'],
 				fullname
 			),
 			placeholder: STRINGS.formatString(
-				STRINGS['WITHDRAWALS_FORM_FEE_PLACEHOLDER'],
-				fullname
-			).join(''),
-			disabled: true,
-			fullWidth: true,
-		};
-	} else {
-		fields.fee = {
-			type: 'editable',
-			stringId: `WITHDRAWALS_FORM_FEE_${symbol.toUpperCase()}_LABEL,WITHDRAWALS_FORM_FEE_PLACEHOLDER`,
-			inputType: 'number',
-			label: STRINGS[`WITHDRAWALS_FORM_FEE_${symbol.toUpperCase()}_LABEL`],
-			placeholder: STRINGS.formatString(
-				STRINGS['WITHDRAWALS_FORM_FEE_PLACEHOLDER'],
+				STRINGS['WITHDRAWALS_FORM_AMOUNT_PLACEHOLDER'],
 				fullname
 			).join(''),
 			min: min,
 			max: MAX,
-			step: min,
-			validate: [required, minValue(min), MAX ? maxValue(MAX) : ''],
-			normalize: normalizeBTCFee,
+			step: increment_unit,
+			validate: amountValidate,
+			normalize: normalizeBTC,
 			fullWidth: true,
+			ishorizontalfield: true,
+			notification: {
+				stringId: 'CALCULATE_MAX',
+				text: STRINGS['CALCULATE_MAX'],
+				status: 'information',
+				iconPath: icon,
+				iconId,
+				className: 'file_upload_icon',
+				useSvg: true,
+				onClick: calculateMax,
+			},
+			parse: (value = '') => {
+				let decimal = getDecimals(increment_unit);
+				let decValue = toFixed(value);
+				let valueDecimal = getDecimals(decValue);
+
+				let result = value;
+				if (decimal < valueDecimal) {
+					result = decValue
+						.toString()
+						.substring(
+							0,
+							decValue.toString().length - (valueDecimal - decimal)
+						);
+				}
+				return result;
+			},
 		};
+
+		if (coins[symbol]) {
+			fields.fee = {
+				type: 'number',
+				stringId:
+					'WITHDRAWALS_FORM_FEE_COMMON_LABEL,WITHDRAWALS_FORM_FEE_PLACEHOLDER',
+				// label: STRINGS[`WITHDRAWALS_FORM_FEE_${symbol.toUpperCase()}_LABEL`],
+				label: STRINGS.formatString(
+					STRINGS['WITHDRAWALS_FORM_FEE_COMMON_LABEL'],
+					fullname
+				),
+				placeholder: STRINGS.formatString(
+					STRINGS['WITHDRAWALS_FORM_FEE_PLACEHOLDER'],
+					fullname
+				).join(''),
+				disabled: true,
+				fullWidth: true,
+				ishorizontalfield: true,
+			};
+		} else {
+			fields.fee = {
+				type: 'editable',
+				stringId: `WITHDRAWALS_FORM_FEE_${symbol.toUpperCase()}_LABEL,WITHDRAWALS_FORM_FEE_PLACEHOLDER`,
+				inputType: 'number',
+				label: STRINGS[`WITHDRAWALS_FORM_FEE_${symbol.toUpperCase()}_LABEL`],
+				placeholder: STRINGS.formatString(
+					STRINGS['WITHDRAWALS_FORM_FEE_PLACEHOLDER'],
+					fullname
+				).join(''),
+				min: min,
+				max: MAX,
+				step: min,
+				validate: [required, minValue(min), MAX ? maxValue(MAX) : ''],
+				normalize: normalizeBTCFee,
+				fullWidth: true,
+				ishorizontalfield: true,
+			};
+		}
 	}
+
 	fields.captcha = {
 		type: 'captcha',
 		language: getLanguage(),
diff --git a/web/src/containers/Withdraw/index.js b/web/src/containers/Withdraw/index.js
index 4d9200d5a8..3ee4ab112b 100644
--- a/web/src/containers/Withdraw/index.js
+++ b/web/src/containers/Withdraw/index.js
@@ -8,11 +8,7 @@ import { isMobile } from 'react-device-detect';
 
 import { Loader, MobileBarBack } from '../../components';
 import withConfig from 'components/ConfigProvider/withConfig';
-import {
-	MIN_VERIFICATION_LEVEL_TO_WITHDRAW,
-	MAX_VERIFICATION_LEVEL_TO_WITHDRAW,
-	DEFAULT_COIN_DATA,
-} from '../../config/constants';
+import { DEFAULT_COIN_DATA } from '../../config/constants';
 import { getCurrencyFromName, roundNumber } from '../../utils/currency';
 import { getDecimals } from '../../utils/utils';
 import {
@@ -27,7 +23,11 @@ import WithdrawCryptocurrency from './form';
 import { generateFormValues, generateInitialValues } from './formUtils';
 import { generateBaseInformation } from './utils';
 
-import { renderInformation, renderTitleSection } from '../Wallet/components';
+import {
+	renderInformation,
+	renderTitleSection,
+	renderNeedHelpAction,
+} from '../Wallet/components';
 
 import { FORM_NAME } from './form';
 
@@ -40,24 +40,8 @@ class Withdraw extends Component {
 	};
 
 	componentWillMount() {
-		// if (
-		// 	this.props.verification_level >= MIN_VERIFICATION_LEVEL_TO_WITHDRAW &&
-		// 	this.props.verification_level <= MAX_VERIFICATION_LEVEL_TO_WITHDRAW
-		// ) {
-		// 	this.props.requestBtcWithdrawFee();
-		// 	this.generateFormValues(
-		// 		getCurrencyFromName(this.props.routeParams.currency),
-		// 		this.props.balance,
-		// 		this.props.btcFee
-		// 	);
-		// }
 		if (this.props.verification_level) {
-			this.validateRoute(
-				this.props.routeParams.currency,
-				this.props.bank_account,
-				this.props.crypto_wallet,
-				this.props.coins
-			);
+			this.validateRoute(this.props.routeParams.currency, this.props.coins);
 		}
 		this.setCurrency(this.props.routeParams.currency);
 	}
@@ -65,24 +49,19 @@ class Withdraw extends Component {
 	UNSAFE_componentWillReceiveProps(nextProps) {
 		if (!this.state.checked) {
 			if (nextProps.verification_level) {
-				this.validateRoute(
-					nextProps.routeParams.currency,
-					nextProps.bank_account,
-					nextProps.crypto_wallet,
-					nextProps.coins
-				);
+				this.validateRoute(nextProps.routeParams.currency, nextProps.coins);
 			}
 		} else if (
-			nextProps.verification_level >= MIN_VERIFICATION_LEVEL_TO_WITHDRAW &&
-			nextProps.verification_level <= MAX_VERIFICATION_LEVEL_TO_WITHDRAW &&
-			(nextProps.activeLanguage !== this.props.activeLanguage ||
-				nextProps.routeParams.currency !== this.props.routeParams.currency)
+			nextProps.activeLanguage !== this.props.activeLanguage ||
+			nextProps.selectedNetwork !== this.props.selectedNetwork
 		) {
 			this.generateFormValues(
 				getCurrencyFromName(nextProps.routeParams.currency, nextProps.coins),
 				nextProps.balance,
 				nextProps.coins,
-				nextProps.verification_level
+				nextProps.verification_level,
+				this.state.networks,
+				nextProps.selectedNetwork
 			);
 		}
 		if (nextProps.routeParams.currency !== this.props.routeParams.currency) {
@@ -90,8 +69,8 @@ class Withdraw extends Component {
 		}
 	}
 
-	validateRoute = (currency, bank_account, crypto_wallet, coins) => {
-		if (coins[currency] && !crypto_wallet[currency]) {
+	validateRoute = (currency, coins) => {
+		if (!coins[currency]) {
 			this.props.router.push('/wallet');
 		} else if (currency) {
 			this.setState({ checked: true });
@@ -101,30 +80,48 @@ class Withdraw extends Component {
 	setCurrency = (currencyName) => {
 		const currency = getCurrencyFromName(currencyName, this.props.coins);
 		if (currency) {
-			this.setState({ currency, checked: false }, () => {
-				this.validateRoute(
-					this.props.routeParams.currency,
-					this.props.bank_account,
-					this.props.crypto_wallet,
-					this.props.coins
-				);
-			});
+			const { coins } = this.props;
+			const coin = coins[currency];
+			const networks = coin.network && coin.network.split(',');
+			let initialNetwork;
+			if (networks && networks.length === 1) {
+				initialNetwork = networks[0];
+			}
+
+			this.setState(
+				{
+					currency,
+					checked: false,
+					networks,
+				},
+				() => {
+					this.validateRoute(this.props.routeParams.currency, this.props.coins);
+					this.generateFormValues(
+						currency,
+						this.props.balance,
+						this.props.coins,
+						this.props.verification_level,
+						networks,
+						initialNetwork
+					);
+				}
+			);
 			// if (currency === 'btc' || currency === 'bch' || currency === 'eth') {
 			// 	this.props.requestWithdrawFee(currency);
 			// }
-
-			this.generateFormValues(
-				currency,
-				this.props.balance,
-				this.props.coins,
-				this.props.verification_level
-			);
 		} else {
 			this.props.router.push('/wallet');
 		}
 	};
 
-	generateFormValues = (currency, balance, coins, verification_level) => {
+	generateFormValues = (
+		currency,
+		balance,
+		coins,
+		verification_level,
+		networks,
+		network
+	) => {
 		const { icons: ICONS } = this.props;
 		const balanceAvailable = balance[`${currency}_available`];
 		const formValues = generateFormValues(
@@ -135,18 +132,28 @@ class Withdraw extends Component {
 			verification_level,
 			this.props.activeTheme,
 			ICONS['BLUE_PLUS'],
-			'BLUE_PLUS'
+			'BLUE_PLUS',
+			networks,
+			network
+		);
+		const initialValues = generateInitialValues(
+			currency,
+			coins,
+			networks,
+			network
 		);
-		const initialValues = generateInitialValues(currency, coins);
 
 		this.setState({ formValues, initialValues });
 	};
 
 	onSubmitWithdraw = (currency) => (values) => {
-		const { destination_tag, ...rest } = values;
+		const { destination_tag, network, ...rest } = values;
+
 		let address = rest.address;
 		if (destination_tag) address = `${rest.address}:${destination_tag}`;
+
 		return performWithdraw(currency, {
+			...(network ? { network } : {}),
 			...rest,
 			address,
 			amount: math.eval(values.amount),
@@ -213,7 +220,6 @@ class Withdraw extends Component {
 	render() {
 		const {
 			balance,
-			verification_level,
 			prices,
 			otp_enabled,
 			openContactForm,
@@ -221,6 +227,7 @@ class Withdraw extends Component {
 			router,
 			coins,
 			icons: ICONS,
+			selectedNetwork,
 		} = this.props;
 		const { links = {} } = this.props.constants;
 		const { formValues, initialValues, currency, checked } = this.state;
@@ -230,11 +237,7 @@ class Withdraw extends Component {
 
 		const balanceAvailable = balance[`${currency}_available`];
 
-		if (
-			verification_level >= MIN_VERIFICATION_LEVEL_TO_WITHDRAW &&
-			verification_level <= MAX_VERIFICATION_LEVEL_TO_WITHDRAW &&
-			balanceAvailable === undefined
-		) {
+		if (balanceAvailable === undefined) {
 			return <Loader />;
 		}
 
@@ -250,6 +253,8 @@ class Withdraw extends Component {
 			balanceAvailable,
 			currentPrice: prices[currency],
 			router,
+			icons: ICONS,
+			selectedNetwork,
 		};
 
 		return (
@@ -257,7 +262,7 @@ class Withdraw extends Component {
 				{isMobile && (
 					<MobileBarBack onBackClick={this.onGoBack}></MobileBarBack>
 				)}
-				<div className="presentation_container apply_rtl">
+				<div className="presentation_container apply_rtl withdrawal-container">
 					{!isMobile &&
 						renderTitleSection(
 							currency,
@@ -269,19 +274,34 @@ class Withdraw extends Component {
 					{/* // This commented code can be used if you want to enforce user to have a verified bank account before doing the withdrawal
 					{verification_level >= MIN_VERIFICATION_LEVEL_TO_WITHDRAW &&
 					verification_level <= MAX_VERIFICATION_LEVEL_TO_WITHDRAW ? ( */}
-					<div className={classnames('inner_container', 'with_border_top')}>
-						{renderInformation(
-							currency,
-							balance,
-							openContactForm,
-							generateBaseInformation,
-							coins,
-							'withdraw',
-							links,
-							ICONS['BLUE_QUESTION'],
-							'BLUE_QUESTION'
-						)}
-						<WithdrawCryptocurrency {...formProps} />
+					<div className={classnames('inner_container')}>
+						<div className="information_block">
+							<div
+								className="information_block-text_wrapper"
+								style={{ height: '1.5rem' }}
+							/>
+							{openContactForm &&
+								renderNeedHelpAction(
+									openContactForm,
+									links,
+									ICONS['BLUE_QUESTION'],
+									'BLUE_QUESTION'
+								)}
+						</div>
+						<WithdrawCryptocurrency
+							titleSection={renderInformation(
+								currency,
+								balance,
+								false,
+								generateBaseInformation,
+								coins,
+								'withdraw',
+								links,
+								ICONS['BLUE_QUESTION'],
+								'BLUE_QUESTION'
+							)}
+							{...formProps}
+						/>
 						{/* {renderExtraInformation(currency, bank_account, ICONS["BLUE_QUESTION"])} */}
 					</div>
 					{/* // This commented code can be used if you want to enforce user to have a verified bank account before doing the withdrawal
@@ -303,10 +323,10 @@ const mapStateToProps = (store) => ({
 	verification_level: store.user.verification_level,
 	otp_enabled: store.user.otp_enabled,
 	bank_account: store.user.userData.bank_account,
-	crypto_wallet: store.user.crypto_wallet,
 	activeLanguage: store.app.language,
 	// btcFee: store.wallet.btcFee,
 	selectedFee: formValueSelector(FORM_NAME)(store, 'fee'),
+	selectedNetwork: formValueSelector(FORM_NAME)(store, 'network'),
 	coins: store.app.coins,
 	activeTheme: store.app.theme,
 	constants: store.app.constants,
diff --git a/web/src/helpers/vanilla.js b/web/src/helpers/vanilla.js
new file mode 100644
index 0000000000..3ec701470a
--- /dev/null
+++ b/web/src/helpers/vanilla.js
@@ -0,0 +1,17 @@
+const clearFileInput = (controlledInputNode) => {
+	try {
+		controlledInputNode.value = null;
+	} catch (e) {
+		console.error(e);
+	}
+	if (controlledInputNode.value) {
+		controlledInputNode.parentNode.replaceChild(
+			controlledInputNode.cloneNode(true),
+			controlledInputNode
+		);
+	}
+};
+
+export const clearFileInputById = (id) => {
+	clearFileInput(document.getElementById(id));
+};
diff --git a/web/src/index.css b/web/src/index.css
index 533548e6fd..9278ef1602 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -136,10 +136,10 @@
   background: var(--labels_important-active-labels-text-graphics); }
 
 .font-small {
-  font-size: 0.9rem; }
+  font-size: 1rem; }
 
 .font-title {
-  font-size: 1.75rem; }
+  font-size: 1.8rem; }
 
 .b {
   border: 1px solid red; }
@@ -221,8 +221,11 @@ table th {
 .align-start {
   align-items: flex-start; }
 
+.align-end {
+  align-items: flex-end; }
+
 .underline-text {
-  text-decoration: underline; }
+  text-decoration: underline !important; }
 
 .disabled-link {
   pointer-events: none; }
@@ -287,9 +290,6 @@ table th {
 .custom-select-input-style.elevated {
   z-index: 1; }
 
-.custom-select-input-style.order-entry.ant-select {
-  width: 100% !important; }
-
 .custom-select-input-style .ant-select-arrow {
   z-index: -1; }
 
@@ -302,6 +302,15 @@ table th {
 .border-pale {
   border-color: var(--calculated_super-pale_label-text-graphics) !important; }
 
+.text-align-center {
+  text-align: center; }
+
+.align-items-baseline {
+  align-items: baseline; }
+
+.no-border {
+  border: none !important; }
+
 .app_container {
   min-height: 100vh;
   background-color: var(--base_background);
@@ -330,13 +339,22 @@ table th {
     height: auto;
     flex: 1; }
   .app_container.layout-mobile .app_container-content {
-    min-height: calc( 100vh - 10rem);
-    max-height: calc( 100vh - 10rem);
+    min-height: calc(
 100vh - 10rem);
+    max-height: calc(
 100vh - 10rem);
     max-width: 100vw;
     overflow-y: scroll; }
+    .app_container.layout-mobile .app_container-content.no_bottom_navigation {
+      height: auto;
+      flex: 1;
+      min-height: calc(100vh);
+      max-height: calc(100vh);
+      max-width: 100vw;
+      overflow-y: scroll; }
+    .app_container.layout-mobile .app_container-content .app_container-main.no_bottom_navigation {
+      height: 100%; }
   .app_container.layout-mobile .content-with-bar {
-    min-height: calc( 100vh - 17rem);
-    max-height: calc( 100vh - 17rem);
+    min-height: calc(
 100vh - 17rem);
+    max-height: calc(
 100vh - 17rem);
     max-width: 100vw;
     padding: 1rem;
     margin: 0;
@@ -401,9 +419,9 @@ table th {
       position: relative;
       margin-bottom: 1rem; }
       .presentation_container .inner_container .information_block .information_block-text_wrapper .title {
-        font-size: 1rem; }
+        font-size: 1.1rem; }
       .presentation_container .inner_container .information_block .information_block-text_wrapper .text {
-        font-size: 0.9rem;
+        font-size: 1rem;
         color: var(--labels_secondary-inactive-label-text-graphics); }
         .presentation_container .inner_container .information_block .information_block-text_wrapper .text > p {
           margin: 0.5rem 0; }
@@ -662,7 +680,7 @@ table th {
     -webkit-transform-origin: 0 0; } }
 
 .information_section {
-  font-size: 0.9rem;
+  font-size: 1rem;
   color: var(--labels_secondary-inactive-label-text-graphics);
   padding: 0 0 0.5rem; }
   .information_section .information_svg {
@@ -684,13 +702,13 @@ table th {
 
 .user-limits .user-limits-table {
   width: 100%;
-  font-size: 0.9rem; }
+  font-size: 1rem; }
   .user-limits .user-limits-table thead tr,
   .user-limits .user-limits-table tfoot tr {
     height: 3.5rem;
     vertical-align: bottom; }
   .user-limits .user-limits-table tfoot {
-    font-size: 1rem; }
+    font-size: 1.1rem; }
     .user-limits .user-limits-table tfoot td {
       white-space: nowrap; }
   .user-limits .user-limits-table .table-row {
@@ -750,8 +768,16 @@ table th {
 .direction_rtl .user-limits .user-limits-table .table-icon {
   padding-left: 0.5rem; }
 
-.user_security-wrapper > *:not(:last-child) {
-  margin-bottom: 2rem; }
+.user_security-wrapper {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-top: 30px;
+  padding: 30px;
+  background-color: var(--base_wallet-sidebar-and-popup); }
+  .user_security-wrapper > *:not(:last-child) {
+    margin-bottom: 2rem; }
 
 .otp_form-wrapper {
   display: flex;
@@ -772,18 +798,18 @@ table th {
           width: 9rem !important;
           height: 9rem !important; }
     .otp_form-wrapper .otp_form-section-wrapper .otp_form-section-title {
-      font-size: 1rem;
+      font-size: 1.1rem;
       font-weight: bold; }
     .otp_form-wrapper .otp_form-section-wrapper .otp_form-section-text {
-      font-size: 0.9rem; }
+      font-size: 1rem; }
     .otp_form-wrapper .otp_form-section-wrapper .otp_secret {
-      font-size: 0.9rem;
+      font-size: 1rem;
       background-color: var(--calculated_specials_highlight-box);
       padding: 0.25rem 0.5rem; }
   .otp_form-wrapper .otp_form-fields-wrapper {
     margin-bottom: 1rem; }
   .otp_form-wrapper .icon_title-wrapper .icon_title-text.title {
-    font-size: 1.75rem; }
+    font-size: 1.8rem; }
   .otp_form-wrapper .icon_title-wrapper .icon_title-svg {
     width: 6.5rem;
     height: 6.5rem; }
@@ -800,9 +826,6 @@ table th {
 .tokens-tokenkey {
   max-width: 5rem; }
 
-.tokens-tokenkey {
-  min-width: 15rem; }
-
 .tokens-date {
   min-width: 5rem;
   max-width: 5rem; }
@@ -833,11 +856,11 @@ table th {
 
 .popup_info-wrapper .popup_info-title {
   font-family: "Raleway";
-  font-size: 1.25rem;
+  font-size: 1.3rem;
   border-bottom: 1px solid var(--calculated_secondary-border); }
 
 .popup_info-wrapper .popup_info-text {
-  font-size: 0.9rem; }
+  font-size: 1rem; }
 
 .token-no-otp {
   color: var(--labels_inactive-button);
@@ -863,20 +886,65 @@ table th {
   .logout-menu-wrapper .logout-icon {
     width: 1.5rem; }
 
+.change-password-form,
+.dev-section-wrapper {
+  border-radius: 4px;
+  margin: 30px 0px 40px;
+  background-color: var(--base_wallet-sidebar-and-popup); }
+
+.dev-section-wrapper {
+  padding: 30px; }
+
+.change-password-form-wrapper .change-password-form {
+  padding: 20px 60px 20px; }
+  .change-password-form-wrapper .change-password-form .field-content {
+    border-bottom: 1px solid; }
+
+.change-password-form-wrapper .password-btn {
+  width: 300px; }
+
+.user-security-container .icon_title-wrapper {
+  display: flex;
+  justify-content: flex-start !important;
+  flex-direction: row;
+  align-items: center; }
+
 .layout-mobile .user_security-wrapper .warning_text {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
-.layout-mobile .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--label {
-  font-size: 12px;
-  color: var(--specials_buttons-links-and-highlights); }
+.layout-mobile .user_security-wrapper .checkbutton-wrapper .checkbutton-input-wrapper {
+  width: 240px !important; }
+  .layout-mobile .user_security-wrapper .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--label {
+    font-size: 13px;
+    color: var(--specials_buttons-links-and-highlights); }
+
+.layout-mobile .dev-section-wrapper {
+  padding: 5px; }
+  .layout-mobile .dev-section-wrapper .table-wrapper th,
+  .layout-mobile .dev-section-wrapper .table-wrapper td {
+    padding: 0; }
+  .layout-mobile .dev-section-wrapper .field-error-content .field-error-text {
+    margin-top: 10px; }
+
+.layout-mobile .change-password-form-wrapper .change-password-form .field-label-wrapper {
+  flex-direction: column; }
+  .layout-mobile .change-password-form-wrapper .change-password-form .field-label-wrapper .field-label {
+    font-size: 10px; }
+  .layout-mobile .change-password-form-wrapper .change-password-form .field-label-wrapper .input-box-field {
+    padding: 4px;
+    height: 30px;
+    margin-top: 5px; }
+
+.layout-mobile .change-password-form-wrapper .change-password-form .input_field-input::placeholder {
+  font-size: 10px; }
 
 .layout-mobile .otp_form-wrapper {
   min-width: auto;
   width: auto; }
   .layout-mobile .otp_form-wrapper .otp_form-section-wrapper .otp_form-section-title {
-    font-size: 14px; }
+    font-size: 15px; }
   .layout-mobile .otp_form-wrapper .otp_form-section-wrapper .otp_form-section-text {
-    font-size: 12px !important; }
+    font-size: 13px !important; }
   .layout-mobile .otp_form-wrapper .otp_form-section-content .qr-code-wrapper {
     width: 15rem;
     height: 15rem; }
@@ -885,7 +953,17 @@ table th {
       height: 14rem !important; }
 
 .layout-mobile .accordion_section_content .warning_text {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
+
+@media (max-width: 1060px) {
+  .change-password-form-wrapper .change-password-form {
+    padding: 10px; }
+    .change-password-form-wrapper .change-password-form .field-label-wrapper .field-label {
+      font-size: 12px; }
+    .change-password-form-wrapper .change-password-form .input_field-input::placeholder {
+      font-size: 12px; }
+  .user-security-wrapper .tab_controller-tabs .tab_item {
+    font-size: 12px !important; } }
 
 .signup_success-wrapper {
   text-align: center; }
@@ -916,13 +994,139 @@ table th {
 .layout-mobile .signup_success-wrapper {
   height: calc(100% - 4rem) !important; }
 
-.layout-mobile.home_container .app_container-content {
-  min-height: calc( 100vh - 4rem);
-  max-height: calc( 100vh - 4rem); }
+.home-page__market-wrapper {
+  background-color: var(--calculated_landing_markets_table); }
+  .home-page__market-wrapper .table-row {
+    color: var(--labels_important-active-labels-text-graphics) !important; }
+  .home-page__market-wrapper thead {
+    color: var(--labels_important-active-labels-text-graphics) !important;
+    background-color: var(--base_wallet-sidebar-and-popup); }
+    .home-page__market-wrapper thead tr {
+      height: 5rem !important; }
+  .home-page__market-wrapper th:nth-child(1) {
+    padding-left: 2rem !important; }
+  .home-page__market-wrapper td:nth-child(1) {
+    padding-left: 1rem !important; }
+  .home-page__market-wrapper th:last-child {
+    padding-right: 2rem !important; }
+  .home-page__market-wrapper td:last-child {
+    padding-right: 1rem !important; }
+  .home-page__market-wrapper .market-list__footer {
+    height: 4.5rem !important; }
+  .home-page__market-wrapper .market-list__block-table {
+    margin-bottom: 0 !important; }
+  .home-page__market-wrapper .price-diff-down {
+    color: var(--trading_selling-related-elements);
+    padding: 0 5px;
+    border-radius: 2px;
+    transition: all 0.2s ease-out 0s; }
+    .home-page__market-wrapper .price-diff-down.entering, .home-page__market-wrapper .price-diff-down.exiting {
+      color: var(--calculated_trading_selling-related-text);
+      background-color: var(--trading_selling-related-elements); }
+  .home-page__market-wrapper .price-diff-up {
+    color: var(--trading_buying-related-elements);
+    padding: 0 5px;
+    border-radius: 2px;
+    transition: all 0.2s ease-out 0s; }
+    .home-page__market-wrapper .price-diff-up.entering, .home-page__market-wrapper .price-diff-up.exiting {
+      color: var(--calculated_trading_buying-related-text);
+      background-color: var(--trading_buying-related-elements); }
+  .home-page__market-wrapper .trade-tab-price_diff_up {
+    margin: auto 0; }
+  .home-page__market-wrapper .entering.trade-tab-price_diff_up:before,
+  .home-page__market-wrapper .exiting.trade-tab-price_diff_up:before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-left: 0.4rem solid transparent;
+    border-right: 0.4rem solid transparent;
+    border-bottom: 0.4rem solid var(--calculated_trading_buying-related-text);
+    margin-bottom: 0rem;
+    display: inline-block;
+    margin-bottom: 0.2rem;
+    margin-right: 0.5rem;
+    position: relative;
+    top: calc(50% - 0.6rem); }
+  .home-page__market-wrapper .trade-tab-price_diff_up:before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-left: 0.4rem solid transparent;
+    border-right: 0.4rem solid transparent;
+    border-bottom: 0.4rem solid var(--trading_buying-related-elements);
+    margin-bottom: 0rem;
+    display: inline-block;
+    margin-bottom: 0.2rem;
+    margin-right: 0.5rem;
+    position: relative;
+    top: calc(50% - 0.6rem); }
+  .home-page__market-wrapper .trade-tab-price_diff_down {
+    margin: auto 0; }
+  .home-page__market-wrapper .entering.trade-tab-price_diff_down:before,
+  .home-page__market-wrapper .exiting.trade-tab-price_diff_down:before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-left: 0.4rem solid transparent;
+    border-right: 0.4rem solid transparent;
+    border-top: 0.4rem solid var(--calculated_trading_selling-related-text);
+    margin-top: 0rem;
+    display: inline-block;
+    margin-right: 0.5rem;
+    position: relative;
+    top: calc(50% - 0.6rem); }
+  .home-page__market-wrapper .trade-tab-price_diff_down:before {
+    content: "";
+    display: block;
+    position: absolute;
+    width: 0;
+    height: 0;
+    border-left: 0.4rem solid transparent;
+    border-right: 0.4rem solid transparent;
+    border-top: 0.4rem solid var(--trading_selling-related-elements);
+    margin-top: 0rem;
+    display: inline-block;
+    margin-right: 0.5rem;
+    position: relative;
+    top: calc(50% - 0.6rem); }
+
+.home_header_button {
+  height: 28px;
+  font-weight: bold; }
+
+.layout-mobile .home_header_button {
+  height: 24px; }
+
+.layout-mobile .home-page__market-wrapper th:nth-child(1) {
+  padding-left: 1rem !important; }
+
+.layout-mobile .home-page__market-wrapper td:nth-child(1) {
+  padding-left: 0.5rem !important; }
+
+.layout-mobile .home-page__market-wrapper th:last-child {
+  padding-right: 0.1rem !important; }
+
+.layout-mobile .home-page__market-wrapper td:last-child {
+  padding-right: 0.5rem !important; }
 
 .home_container {
   background-repeat: no-repeat;
   background-size: cover; }
+  .home_container .main-section_button_invert {
+    color: var(--specials_buttons-links-and-highlights) !important;
+    background-color: var(--labels_important-active-labels-text-graphics) !important; }
+  .home_container .main-section_button {
+    color: var(--labels_important-active-labels-text-graphics) !important;
+    background-color: var(--specials_buttons-links-and-highlights) !important; }
+  .home_container .quick_trade-wrapper {
+    min-width: 30rem;
+    max-width: 40rem; }
   .home_container .exchange-expired {
     background-color: #ed1c24 !important;
     color: #ffffff !important; }
@@ -937,10 +1141,12 @@ table th {
   .home_container .quick_trade-section,
   .home_container .features-container {
     padding: 2rem; }
+  .home_container .home-page_overlay {
+    width: 100% !important;
+    height: 100% !important;
+    background: linear-gradient(to bottom, var(--calculated_landing_background), var(--calculated_landing_background)); }
   .home_container .section_1-content {
-    background: linear-gradient(to bottom, transparent, white);
-    position: relative;
-    min-height: 500px; }
+    position: relative; }
     .home_container .section_1-content .scroll-button {
       position: absolute;
       bottom: 1rem;
@@ -971,7 +1177,7 @@ table th {
       width: 4rem;
       height: 4rem; }
     .home_container .home-card-container .home-card-text-container {
-      font-size: 0.9rem;
+      font-size: 1rem;
       color: var(--labels_secondary-inactive-label-text-graphics); }
       .home_container .home-card-container .home-card-text-container .home-card-title {
         margin: 0.5rem 0 0.25rem;
@@ -979,18 +1185,20 @@ table th {
         text-transform: uppercase; }
   .home_container .home-title,
   .home_container .features-title {
-    font-size: 4rem;
-    margin-bottom: 1rem;
+    font-size: 3.5rem;
+    line-height: normal;
+    font-weight: bold;
     text-align: center; }
-  .home_container .home-title {
-    margin-bottom: 0.5rem; }
   .home_container .text-section,
   .home_container .buttons-section {
-    margin: 1rem; }
+    margin: 0.5rem; }
+  .home_container .text-section {
+    font-size: 1.3rem;
+    font-weight: bold; }
   .home_container .buttons-section--button {
     width: 15rem;
     height: 36px;
-    font-size: 0.9rem;
+    font-size: 1rem;
     border: 1px solid var(--calculated_important-border);
     margin: 0 1rem;
     text-align: center;
@@ -999,18 +1207,75 @@ table th {
     .home_container .buttons-section--button.contrast {
       background-color: var(--labels_important-active-labels-text-graphics); }
 
+.home-page_content {
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 5rem;
+  max-width: 100rem; }
+
+.live-markets_header {
+  font-size: 1.3rem;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding-bottom: 0.5rem;
+  color: var(--labels_important-active-labels-text-graphics);
+  font-weight: bold; }
+
+.buttons-section-header {
+  margin: 0 0.5rem; }
+
+.home-page_section-wrapper:not(.main-section-wrapper) {
+  padding-top: 5rem;
+  padding-bottom: 5rem; }
+
+.home-page_section-wrapper.main-section-wrapper {
+  padding-bottom: 5rem; }
+
 .direction_ltr .home-card-text-container {
   margin-left: 0.75rem; }
 
 .direction_rtl .home-card-text-container {
   margin-right: 0.75rem; }
 
+.home_app_bar {
+  height: 45px;
+  min-height: 45px; }
+  .home_app_bar .app_bar-icon-logo {
+    height: 4rem;
+    width: 5rem;
+    background-size: contain;
+    background-position: left center;
+    background-repeat: no-repeat; }
+  .home_app_bar .app_bar-icon {
+    flex: 0;
+    margin: 0 0.5rem;
+    padding-right: 8px;
+    width: 100%; }
+
 @media (max-width: 767px) {
   .home_container .home-card-container {
     margin: 0 2rem 3rem; }
+  .home_container .buttons-section .exir-button,
+  .home_container .buttons-section-header .exir-button {
+    font-size: 1.2rem !important; }
+  .home_container .text-section {
+    font-size: 1.5rem !important; }
+  .home_container .live-markets_header {
+    font-size: 1.5rem !important; }
   .home_container .features-container .features-card_container {
     max-width: 45rem; } }
 
+@media (min-width: 1920px) {
+  .home_app_bar .app_bar-icon-logo {
+    height: 3rem;
+    width: 5rem; }
+  .home_app_bar .app_bar-icon {
+    margin: 1rem 0 1rem; } }
+
+.wide-logo {
+  width: 10rem !important; }
+
 .layout-mobile .button-container {
   min-height: 4.5rem; }
 
@@ -1024,7 +1289,7 @@ table th {
   font-size: 1.5rem; }
 
 .layout-mobile .currency-list-container .button-container .exir-button {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .wallet-container .action_notification-wrapper .action_notification-text {
   font-size: 1.2rem !important; }
@@ -1035,39 +1300,59 @@ table th {
     font-size: 1.75rem;
     text-transform: uppercase;
     font-weight: bold; }
+  .layout-mobile .wallet-container .accordion_wrapper .accordion_section .action_notification-wrapper {
+    margin: 0; }
 
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table thead tr th:nth-child(3) {
-  text-align: center; }
-
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-wallet,
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-amount,
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-name {
-  min-width: unset !important; }
-
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-wallet .deposit-withdrawal-wrapper {
-  margin: 0 auto;
-  width: 18rem; }
-  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-wallet .deposit-withdrawal-wrapper .action_notification-wrapper .action_notification-text {
-    font-size: 1.2rem; }
-
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .currency_ball-wrapper.s {
-  width: 2.5rem;
-  height: 2.5rem;
-  font-size: 0.8rem; }
-
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .table-bottom-border {
-  font-size: 12px !important; }
+.layout-mobile .wallet-container .wallet-assets_block {
+  padding: 6px; }
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table thead tr th:nth-child(3) {
+    text-align: center; }
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-wallet,
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-amount,
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-name {
+    min-width: unset !important; }
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-wallet .deposit-withdrawal-wrapper {
+    margin: 0 auto;
+    width: 18rem; }
+    .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .td-wallet .deposit-withdrawal-wrapper .action_notification-wrapper .action_notification-text {
+      font-size: 1.2rem; }
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .currency_ball-wrapper.s {
+    width: 2.5rem;
+    height: 2.5rem;
+    font-size: 0.8rem; }
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table .table-bottom-border {
+    font-size: 13px !important; }
+  .layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot {
+    font-size: 11px !important; }
+  .layout-mobile .wallet-container .wallet-assets_block .zero-balance-wrapper {
+    flex-direction: column; }
 
-.layout-mobile .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot {
-  font-size: 10px !important; }
+.layout-mobile .wallet-container .action-button-wrapper {
+  padding: 5px 2px; }
 
 .wallet-container {
   border-top: 1px solid var(--labels_important-active-labels-text-graphics); }
   .wallet-container .wallet-header_block > * {
     margin-bottom: 2rem; }
   .wallet-container .wallet-header_block .wallet-header_block-currency_title {
-    font-size: 1.25rem;
+    font-size: 1.3rem;
     position: relative; }
+  .wallet-container .wallet-header_block .coin-icons {
+    width: 50px;
+    padding-top: 4px; }
+  .wallet-container .wallet-header_block .with_price-block_amount-value {
+    font-size: 4rem;
+    line-height: 4rem; }
+  .wallet-container .paper-clip-icon .action_notification-svg {
+    background-color: var(--specials_buttons-links-and-highlights);
+    width: 1.2rem;
+    height: 1.2rem;
+    border-radius: 50%;
+    display: flex;
+    margin-left: 5px; }
+    .wallet-container .paper-clip-icon .action_notification-svg svg {
+      width: 0.8rem  !important;
+      height: 0.8rem !important; }
   .wallet-container .wallet-buttons_action {
     margin: 2.5rem 0 3.75rem; }
     .wallet-container .wallet-buttons_action > *:first-child {
@@ -1080,47 +1365,61 @@ table th {
     color: var(--labels_important-active-labels-text-graphics) !important; }
     .wallet-container .accordion_wrapper .accordion_section_content_text:after {
       border-left-color: var(--calculated_important-border) !important; }
-  .wallet-container .wallet-assets_block .action_notification-wrapper {
-    margin: 0 !important; }
-  .wallet-container .wallet-assets_block .td-wallet {
-    min-width: 225px; }
-    .wallet-container .wallet-assets_block .td-wallet .deposit-withdrawal-wrapper {
-      margin-left: -3rem;
-      width: 14rem; }
-  .wallet-container .wallet-assets_block .wallet-assets_block-table {
-    width: 100%;
-    font-size: 0.9rem;
-    margin-bottom: 3rem; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table thead tr,
-    .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot tr {
-      height: 3.5rem;
-      vertical-align: bottom; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot {
-      font-size: 1rem; }
-      .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot td {
+  .wallet-container .wallet-assets_block {
+    background-color: var(--base_wallet-sidebar-and-popup);
+    padding: 20px;
+    overflow-y: auto; }
+    .wallet-container .wallet-assets_block .td-wallet {
+      min-width: 225px; }
+      .wallet-container .wallet-assets_block .td-wallet .deposit-withdrawal-wrapper {
+        margin-left: -3rem;
+        width: 14rem; }
+    .wallet-container .wallet-assets_block .wallet-assets_block-table {
+      width: 100%;
+      font-size: 1rem;
+      margin-bottom: 3rem; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table thead tr,
+      .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot tr {
+        height: 3.5rem;
+        vertical-align: bottom; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot {
+        font-size: 1.1rem; }
+        .wallet-container .wallet-assets_block .wallet-assets_block-table tfoot td {
+          white-space: nowrap; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table .table-row {
+        height: 2.5rem; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table .table-bottom-border td,
+      .wallet-container .wallet-assets_block .wallet-assets_block-table th {
+        position: relative; }
+        .wallet-container .wallet-assets_block .wallet-assets_block-table .table-bottom-border td:not(:first-child),
+        .wallet-container .wallet-assets_block .wallet-assets_block-table th:not(:first-child) {
+          border-bottom: 1px solid var(--calculated_important-border);
+          padding: 1rem 0.25rem; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table .td-fit {
+        width: 1%;
         white-space: nowrap; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table .table-row {
-      height: 2.5rem; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table .table-bottom-border td,
-    .wallet-container .wallet-assets_block .wallet-assets_block-table th {
-      position: relative; }
-      .wallet-container .wallet-assets_block .wallet-assets_block-table .table-bottom-border td:not(:first-child),
-      .wallet-container .wallet-assets_block .wallet-assets_block-table th:not(:first-child) {
-        border-bottom: 1px solid var(--calculated_important-border);
-        padding: 0 0.25rem; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table .td-fit {
-      width: 1%;
-      white-space: nowrap; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table .td-name {
-      min-width: 200px !important; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table .table-icon > div {
-      vertical-align: middle;
-      margin: auto; }
-    .wallet-container .wallet-assets_block .wallet-assets_block-table .td-amount {
-      min-width: 150px !important;
-      direction: ltr; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table .td-name {
+        min-width: 200px !important; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table .table-icon > div {
+        vertical-align: middle;
+        margin: auto; }
+      .wallet-container .wallet-assets_block .wallet-assets_block-table .td-amount {
+        min-width: 150px !important;
+        direction: ltr; }
+    .wallet-container .wallet-assets_block .search-field {
+      background-color: var(--base_wallet-sidebar-and-popup); }
+    .wallet-container .wallet-assets_block .currency-ball {
+      width: 30px;
+      padding-top: 4px; }
   .wallet-container .accordion_wrapper .action_notification-wrapper {
     position: relative; }
+  .wallet-container .action-button-wrapper {
+    border: 1px solid var(--specials_buttons-links-and-highlights);
+    padding: 5px 12px; }
+    .wallet-container .action-button-wrapper:hover {
+      background-color: var(--specials_buttons-links-and-highlights); }
+      .wallet-container .action-button-wrapper:hover .notification-info {
+        color: white !important; }
 
 .show-equals:after {
   content: '=';
@@ -1128,7 +1427,7 @@ table th {
   position: absolute; }
 
 .wallet-notification .action_notification-text {
-  font-size: 1rem !important; }
+  font-size: 1.1rem !important; }
 
 .direction_ltr .wallet-container .wallet-header_block {
   font-family: "Raleway"; }
@@ -1182,11 +1481,11 @@ table th {
   margin: 2rem; }
 
 .review-wrapper .review-crypto-amount {
-  font-size: 1.75rem;
+  font-size: 1.8rem;
   border-bottom: 1px solid var(--labels_important-active-labels-text-graphics);
   text-align: center; }
   .review-wrapper .review-crypto-amount .review-fee_message {
-    font-size: 1rem; }
+    font-size: 1.1rem; }
 
 .review-wrapper .review-warning_arrow {
   position: relative;
@@ -1205,13 +1504,13 @@ table th {
     border-top: 8px solid var(--labels_secondary-inactive-label-text-graphics); }
 
 .review-wrapper .review-crypto-address {
-  font-size: 1.75rem;
+  font-size: 1.8rem;
   border: 1px solid var(--labels_secondary-inactive-label-text-graphics);
   padding: 0.25rem 1rem; }
 
 .review-wrapper .review-info_message {
   padding: 0.5rem;
-  font-size: 0.9rem;
+  font-size: 1rem;
   font-weight: bold; }
 
 .review-wrapper .button-separator {
@@ -1220,6 +1519,23 @@ table th {
 .bank_account-information-wrapper {
   margin: 2rem 0; }
 
+.withdrawal-container .icon_title-wrapper {
+  flex-direction: row;
+  justify-content: flex-start; }
+
+.withdrawal-container .withdraw-form-wrapper .withdraw-form {
+  border-radius: 4px;
+  margin: 0 0 40px;
+  background-color: var(--base_wallet-sidebar-and-popup);
+  padding: 30px; }
+
+.withdrawal-container .withdraw-form-wrapper .btn-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center; }
+  .withdrawal-container .withdraw-form-wrapper .btn-wrapper .exir-button {
+    width: 300px; }
+
 .layout-mobile .review-wrapper {
   min-width: 0;
   margin: auto; }
@@ -1245,18 +1561,18 @@ table th {
     width: 24rem !important;
     height: 24rem !important; }
   .layout-mobile .presentation_container .inner_container .qr_code-wrapper .qr-text {
-    font-size: 10px !important; }
+    font-size: 11px !important; }
 
 .layout-mobile .presentation_container .inner_container .information_block .information_block-text_wrapper .title {
-  font-size: 14px; }
+  font-size: 15px; }
 
 .layout-mobile .presentation_container .inner_container .information_block .information_block-text_wrapper .text {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .presentation_container .inner_container .field-label,
 .layout-mobile .presentation_container .inner_container .field-children,
 .layout-mobile .presentation_container .inner_container .input_field-input {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .presentation_container .inner_container .field-error-content {
   font-size: 1.2rem; }
@@ -1265,21 +1581,32 @@ table th {
   font-size: 1.2rem; }
 
 .layout-mobile .presentation_container .inner_container .exir-button {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .review_email-wrapper {
   margin: 0px auto !important; }
 
+.layout-mobile .withdrawal-container .withdraw-form-wrapper .withdraw-form .field-wrapper .field-label-wrapper {
+  flex-direction: column; }
+
 .review_email-wrapper {
   margin: auto; }
   .review_email-wrapper .review_email-content {
     border-top: 1px solid;
     padding: 1rem; }
 
+@media screen and (max-width: 1096px) {
+  .withdrawal-container .withdraw-form-wrapper .withdraw-form .field-wrapper .field-label {
+    font-size: 11px; }
+  .withdrawal-container .withdraw-form-wrapper .withdraw-form .field-wrapper .input-box-field .input_field-input::placeholder {
+    font-size: 11px; }
+  .withdrawal-container .withdraw-form-wrapper .btn-wrapper .exir-button {
+    width: 200px; } }
+
 .extra_information-wrapper {
   margin-top: 1rem;
   padding: 0.5rem;
-  font-size: 0.9rem; }
+  font-size: 1rem; }
   .extra_information-wrapper .link {
     color: var(--specials_buttons-links-and-highlights);
     padding: 0 0.25rem; }
@@ -1299,7 +1626,7 @@ table th {
       height: 11rem !important; }
   .qr_code-wrapper .qr-text {
     display: flex;
-    font-size: 0.9rem;
+    font-size: 1rem;
     padding-top: 0.25rem;
     margin-left: 1rem; }
     .qr_code-wrapper .qr-text:before {
@@ -1318,9 +1645,9 @@ table th {
 .review-wrapper {
   min-width: 575px; }
   .review-wrapper .review-section {
-    font-size: 0.9rem; }
+    font-size: 1rem; }
   .review-wrapper .review-title {
-    font-size: 1.75rem;
+    font-size: 1.8rem;
     margin-bottom: 0.5rem; }
   .review-wrapper .separator {
     margin: 1rem 0;
@@ -1332,11 +1659,15 @@ table th {
   position: relative; }
 
 .verification-wrapper .error {
-  font-size: 1.75rem; }
+  font-size: 1.8rem; }
 
 .verification-wrapper .block-wrapper {
   margin: 1rem; }
 
+.form_currency-ball {
+  width: 30px;
+  height: 30px; }
+
 .transaction-history-wrapper .ant-row {
   margin-left: 0 !important;
   margin-right: 0 !important;
@@ -1403,6 +1734,24 @@ table th {
   .transaction-history-wrapper .ant-btn-ghost :active {
     color: var(--labels_important-active-labels-text-graphics);
     border-color: var(--labels_important-active-labels-text-graphics); }
+  .transaction-history-wrapper .ant-btn-ghost.active_search_button {
+    animation: shine 2s linear infinite alternate;
+    animation-fill-mode: both;
+    color: var(--labels_secondary-inactive-label-text-graphics);
+    box-shadow: 0 0 8px 0.1px var(--base_wallet-sidebar-and-popup);
+    position: relative; }
+
+@keyframes shine {
+  10% {
+    color: var(--labels_secondary-inactive-label-text-graphics);
+    box-shadow: 0 0 8px 0.1px var(--base_wallet-sidebar-and-popup);
+    transition-property: color, box-shadow;
+    transition-duration: 0.7s, 0.7s;
+    transition-timing-function: ease; }
+  100% {
+    color: var(--labels_important-active-labels-text-graphics);
+    box-shadow: 0 0 8px 0.1px var(--labels_secondary-inactive-label-text-graphics);
+    transition-property: color, box-shadow; } }
 
 .layout-mobile .tab_controller-wrapper {
   height: auto; }
@@ -1410,7 +1759,8 @@ table th {
 .layout-mobile .inner_container {
   height: calc(100% - 4.5rem); }
   .layout-mobile .inner_container .history_block-wrapper {
-    max-height: calc(100% - 1rem); }
+    max-height: calc(100% - 1rem);
+    overflow-x: scroll; }
     .layout-mobile .inner_container .history_block-wrapper .table-content {
       overflow-x: scroll;
       white-space: nowrap;
@@ -1424,6 +1774,29 @@ table th {
 .layout-mobile .display_table-wrapper .display_table-cell {
   min-height: 2rem !important; }
 
+.layout-mobile .table_container .table-content.transactions-history-table {
+  overflow-x: auto;
+  position: relative; }
+  .layout-mobile .table_container .table-content.transactions-history-table thead,
+  .layout-mobile .table_container .table-content.transactions-history-table td {
+    font-size: 1.2rem !important; }
+  .layout-mobile .table_container .table-content.transactions-history-table td {
+    padding: 0.5rem;
+    min-width: 9rem; }
+  .layout-mobile .table_container .table-content.transactions-history-table .sticky-col {
+    position: -webkit-sticky;
+    position: sticky;
+    background-color: var(--base_wallet-sidebar-and-popup);
+    left: 0;
+    width: 10rem !important;
+    min-width: 10rem !important;
+    max-width: 10rem !important;
+    z-index: 1; }
+    .layout-mobile .table_container .table-content.transactions-history-table .sticky-col.coin-cell {
+      width: 12rem !important;
+      min-width: 12rem !important;
+      max-width: 12rem !important; }
+
 .icon-cell {
   width: 3rem; }
   .icon-cell > div {
@@ -1469,7 +1842,10 @@ table th {
   color: var(--specials_notifications-alerts-warnings); }
 
 .history_block-wrapper {
-  position: relative; }
+  position: relative;
+  background-color: var(--base_wallet-sidebar-and-popup);
+  padding: 20px;
+  margin: 20px 0; }
   .history_block-wrapper .action_notification-svg svg {
     width: 1.2rem !important;
     height: 1.2rem !important; }
@@ -1493,6 +1869,15 @@ table th {
       margin-right: 10px; }
   .history_block-wrapper .check-deposit-txt {
     right: 100px !important; }
+  .history_block-wrapper .loader_wrapper {
+    top: 0;
+    left: 0; }
+  .history_block-wrapper .table-wrapper .table_body-wrapper.with_icon tr td:first-child {
+    border-top: 1px solid var(--calculated_secondary-border) !important;
+    border-bottom: 1px solid var(--calculated_secondary-border) !important; }
+  .history_block-wrapper .table-wrapper .table_body-wrapper.with_icon .coin-icons {
+    width: 30px;
+    padding-top: 4px; }
 
 .action_notification-svg svg {
   width: 2rem;
@@ -1509,6 +1894,13 @@ table th {
 .transaction-history-wrapper svg .transaction-history-5 {
   fill: var(--labels_secondary-inactive-label-text-graphics); }
 
+.transaction-history-wrapper .icon_title-wrapper {
+  flex-direction: row;
+  justify-content: flex-start; }
+
+.transaction-history-wrapper .with_border_top {
+  border-top: none !important; }
+
 .display_table-wrapper .display_table-cell {
   min-height: 1.2rem !important;
   padding: 0 0.1rem !important; }
@@ -1533,7 +1925,7 @@ table th {
   .trade-container .trade-col_main_wrapper .trade-main_content {
     flex: 6;
     min-height: 25vh;
-    max-height: 78vh; }
+    max-height: 60vh; }
   .trade-container .trade-col_main_wrapper .trade-tabs_content {
     flex: 3;
     height: 30vh; }
@@ -1544,8 +1936,8 @@ table th {
       height: 3rem; }
   .trade-container .trade-col_side_wrapper {
     flex: 0;
-    min-width: 17.5rem;
-    max-width: 17.5rem; }
+    min-width: 23rem;
+    max-width: 23rem; }
     .trade-container .trade-col_side_wrapper > div {
       flex: 1; }
   .trade-container .trade-col_action_wrapper {
@@ -1598,7 +1990,7 @@ table th {
   font-size: 1.2rem !important; }
 
 .layout-mobile .trade_orderbook-spread {
-  height: 2rem;
+  min-height: 3rem !important;
   margin: 1rem 0; }
 
 .layout-mobile .trade_orderbook-asks,
@@ -1630,23 +2022,28 @@ table th {
 
 @media (min-width: 1920px) {
   .trade-container .trade-col_side_wrapper {
-    min-width: 20rem;
-    max-width: 20rem; }
+    min-width: 24rem;
+    max-width: 24rem; }
   .trade-container .trade-col_action_wrapper {
     min-width: 20rem;
     max-width: 20rem; } }
 
 @media screen and (max-width: 1096px) {
   .trade-container .trade-col_side_wrapper {
-    min-width: 16rem;
-    max-width: 16rem; }
+    min-width: 23rem;
+    max-width: 23rem; }
   .trade-container .trade-col_action_wrapper {
     min-width: 20rem;
     max-width: 20rem; } }
 
 .trade__active-orders_cancel-All {
+  position: relative;
+  min-height: 2rem;
   min-width: 6rem; }
 
+.trade__active-orders-header_cancel-All {
+  position: relative; }
+
 .trade_cancel-All-confirmation .ant-modal-header,
 .trade_cancel-All-confirmation .ant-modal-content,
 .trade_cancel-All-confirmation .ant-modal-confirm-body .ant-modal-confirm-content {
@@ -1666,18 +2063,18 @@ table th {
     font-size: 1.2rem; }
 
 .layout-mobile .trade_block-wrapper .trade_block-title .action_notification-wrapper .action_notification-text {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .trade_history-wrapper {
   height: 38vh; }
   .layout-mobile .trade_history-wrapper .display_table-wrapper .display_table-body {
-    font-size: 12px; }
+    font-size: 13px; }
 
 .trade_block-wrapper {
   padding: 1rem;
-  flex: 1; }
+  margin: 6px 3px 3px 3px;
+  background-color: var(--base_wallet-sidebar-and-popup); }
   .trade_block-wrapper .trade_block-title {
-    border-top: 0.2rem solid var(--calculated_important-border);
     text-transform: uppercase;
     font-weight: bold;
     margin-bottom: 1rem;
@@ -1694,10 +2091,13 @@ table th {
       margin-top: 0.1rem; }
   .trade_block-wrapper .trade_block-content {
     flex: auto;
-    font-size: 0.9rem;
+    font-size: 1rem;
     overflow-y: scroll;
-    height: 100%;
-    transform: translateY(-1rem); }
+    height: 100%; }
+    .trade_block-wrapper .trade_block-content .sidebar_hub-content {
+      min-height: 42vh;
+      max-height: 56vh;
+      overflow-y: auto; }
 
 .trade_block_tabs-wrapper .trade_block-title {
   position: relative; }
@@ -1732,9 +2132,11 @@ table th {
   margin-left: 2rem; }
 
 .trade_history-wrapper {
-  height: 84vh; }
+  height: 49vh; }
   .trade_history-wrapper .display_table-wrapper .display_table-header :nth-child(2) {
     text-align: center; }
+  .trade_history-wrapper .display_table-wrapper .display_table-header .ant-select-arrow {
+    z-index: 1; }
   .trade_history-wrapper .display_table-wrapper .display_table-body .display_table-cell :nth-child(2),
   .trade_history-wrapper .display_table-wrapper .display_table-body .display_table-cell :nth-child(3) {
     text-align: right; }
@@ -1756,9 +2158,7 @@ table th {
     margin-bottom: 0.5rem; }
   .trade_order_entry-wrapper.order_side-selector-sell .trade_order_entry-selector {
     border-top: 1px solid var(--calculated_important-border);
-    position: relative;
-    width: 60% !important;
-    margin-left: 40% !important; }
+    position: relative; }
     .trade_order_entry-wrapper.order_side-selector-sell .trade_order_entry-selector > div {
       line-height: 2rem; }
     .trade_order_entry-wrapper.order_side-selector-sell .trade_order_entry-selector .active {
@@ -1813,9 +2213,11 @@ table th {
       text-align: right;
       color: var(--labels_secondary-inactive-label-text-graphics);
       padding: 0;
-      font-size: 12px; }
+      font-size: 13px; }
     .trade_order_entry-wrapper.order_side-selector-sell .trade_order_entry-form_fields-wrapper .ant-collapse-content-box {
       padding: 0; }
+    .trade_order_entry-wrapper.order_side-selector-sell .trade_order_entry-form_fields-wrapper .underline-text {
+      font-size: 11px; }
 
 .trade_order_entry-wrapper.order_side-selector-buy {
   flex: 1;
@@ -1824,9 +2226,7 @@ table th {
     margin-bottom: 0.5rem; }
   .trade_order_entry-wrapper.order_side-selector-buy .trade_order_entry-selector {
     border-top: 1px solid var(--calculated_important-border);
-    position: relative;
-    width: 60% !important;
-    margin-left: 40% !important; }
+    position: relative; }
     .trade_order_entry-wrapper.order_side-selector-buy .trade_order_entry-selector > div {
       line-height: 2rem; }
     .trade_order_entry-wrapper.order_side-selector-buy .trade_order_entry-selector .active {
@@ -1881,9 +2281,16 @@ table th {
       text-align: right;
       color: var(--labels_secondary-inactive-label-text-graphics);
       padding: 0;
-      font-size: 12px; }
+      font-size: 13px; }
     .trade_order_entry-wrapper.order_side-selector-buy .trade_order_entry-form_fields-wrapper .ant-collapse-content-box {
       padding: 0; }
+    .trade_order_entry-wrapper.order_side-selector-buy .trade_order_entry-form_fields-wrapper .underline-text {
+      font-size: 11px; }
+
+.trade_order_entry-wrapper .post-only-txt {
+  font-size: 1rem;
+  color: var(--labels_secondary-inactive-label-text-graphics);
+  cursor: pointer; }
 
 .risky-trade-wrapper {
   width: 32rem; }
@@ -1903,47 +2310,74 @@ table th {
     color: var(--specials_notifications-alerts-warnings); }
 
 .layout-mobile .trade_order_entry-selector {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .trade_orderbook-bids .trade_orderbook-cell {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .trade_input-wrapper .trade_input-label {
-  font-size: 10px !important; }
+  font-size: 11px !important; }
 
 .layout-mobile .trade_input-wrapper .trade_input-input-wrapper > input {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .trade_order_entry-review > div {
-  font-size: 10px !important; }
+  font-size: 11px !important; }
 
 .layout-mobile .exir-button {
-  font-size: 12px !important; }
-
-.layout-mobile .trade_orderbook-wrapper .trade_orderbook-headers .trade_orderbook-cell {
-  font-size: 10px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .trade_orderbook-wrapper .trade_asks-limit_bar .orderbook-limit_bar-wrapper .orderbook-limit_bar-text {
-  font-size: 10px !important; }
+  font-size: 11px !important; }
 
 .layout-mobile .risky-trade-wrapper {
   margin: auto; }
 
 .trade_orderbook-wrapper {
-  height: 84vh; }
+  height: 49vh; }
+  .trade_orderbook-wrapper .trade_orderbook-headers .trade_orderbook-cell {
+    font-size: 1rem !important;
+    flex-direction: column; }
+    .trade_orderbook-wrapper .trade_orderbook-headers .trade_orderbook-cell .custom-select-input-style {
+      font-size: 1rem !important;
+      max-width: 8rem; }
+      .trade_orderbook-wrapper .trade_orderbook-headers .trade_orderbook-cell .custom-select-input-style .ant-select-selector {
+        height: 1.5rem !important;
+        line-height: 1.5rem !important;
+        padding: 0;
+        font-size: 1rem !important; }
+      .trade_orderbook-wrapper .trade_orderbook-headers .trade_orderbook-cell .custom-select-input-style .ant-select-selection-item {
+        height: 1.5rem !important;
+        line-height: 1.5rem !important;
+        font-weight: bold; }
+      .trade_orderbook-wrapper .trade_orderbook-headers .trade_orderbook-cell .custom-select-input-style .ant-select-arrow {
+        right: 2px; }
   .trade_orderbook-wrapper .trade_orderbook-cell {
     padding: 0 0.25rem; }
     .trade_orderbook-wrapper .trade_orderbook-cell .ant-select-arrow {
-      color: var(--labels_important-active-labels-text-graphics); }
-    .trade_orderbook-wrapper .trade_orderbook-cell:not(.trade_orderbook-cell_total):hover {
-      color: var(--labels_important-active-labels-text-graphics); }
+      color: var(--labels_important-active-labels-text-graphics);
+      z-index: 1; }
+    .trade_orderbook-wrapper .trade_orderbook-cell .ant-select-single.ant-select-sm:not(.ant-select-customize-input) .ant-select-selector {
+      padding-right: 0; }
   .trade_orderbook-wrapper .price-row-wrapper {
     margin: 1px 0;
     text-align: right; }
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell-price {
+      text-align: left; }
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell-amount {
+      text-align: right; }
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell-amount {
+      color: var(--calculated_trading-orderbook-text); }
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell_total {
+      color: var(--calculated_trading-orderbook-secondary-text); }
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell-price:hover,
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell-amount:hover,
+    .trade_orderbook-wrapper .price-row-wrapper .trade_orderbook-cell_total:hover {
+      color: var(--labels_important-active-labels-text-graphics) !important; }
   .trade_orderbook-wrapper .fill {
     background-repeat: no-repeat;
-    background-position: 0 0;
-    background-size: 0; }
+    background-size: 0;
+    background-position: right; }
   .trade_orderbook-wrapper .fill-bid {
     background-image: linear-gradient(var(--calculated_trading_buying-orderbook-bar), var(--calculated_trading_buying-orderbook-bar)); }
   .trade_orderbook-wrapper .fill-ask {
@@ -1953,13 +2387,14 @@ table th {
   .trade_orderbook-wrapper .trade_orderbook-headers {
     font-weight: bold;
     border-bottom: 1px solid var(--calculated_secondary-border);
-    text-transform: uppercase;
-    min-height: 1.5rem; }
+    text-transform: capitalize;
+    min-height: 1.5rem;
+    font-size: 0.85rem; }
     .trade_orderbook-wrapper .trade_orderbook-headers .waves-icon {
       width: 3rem; }
   .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-spread {
     flex: 0;
-    min-height: 6rem;
+    min-height: 4rem;
     color: var(--labels_secondary-inactive-label-text-graphics);
     padding: 0 0.25rem; }
     .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-spread .trade_orderbook-spread-text {
@@ -1967,12 +2402,20 @@ table th {
       margin-left: 0.25rem; }
     .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-spread .trade_orderbook-market-price {
       margin-left: 0.25rem;
-      font-size: 1.25rem;
+      font-size: 1.3rem;
       font-weight: bold;
       color: var(--labels_important-active-labels-text-graphics); }
   .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-asks .value-row,
   .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-bids .value-row {
     min-height: 1.5rem; }
+  .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-bids .trade_orderbook-cell-price {
+    color: var(--trading_buying-related-elements); }
+  .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-bids .price-row-wrapper:hover {
+    background-color: var(--calculated_trading_buying-orderbook-hover); }
+  .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-asks .trade_orderbook-cell-price {
+    color: var(--trading_selling-related-elements); }
+  .trade_orderbook-wrapper .trade_orderbook-content .trade_orderbook-asks .price-row-wrapper:hover {
+    background-color: var(--calculated_trading_selling-orderbook-hover); }
   .trade_orderbook-wrapper .trade_asks-limit_bar .orderbook-limit_bar-wrapper {
     color: var(--trading_selling-related-elements); }
     .trade_orderbook-wrapper .trade_asks-limit_bar .orderbook-limit_bar-wrapper .orderbook-limit_bar-line {
@@ -1980,11 +2423,15 @@ table th {
   .trade_orderbook-wrapper .trade_orderbook-asks {
     color: var(--trading_selling-related-elements); }
   .trade_orderbook-wrapper .trade_orderbook-asks > .price-row-wrapper:first-child {
-    color: var(--labels_important-active-labels-text-graphics);
+    background-color: var(--calculated_trading_selling-orderbook-best-bar);
     font-weight: bold; }
+    .trade_orderbook-wrapper .trade_orderbook-asks > .price-row-wrapper:first-child .trade_orderbook-cell-price {
+      color: var(--calculated_trading-orderbook-text); }
   .trade_orderbook-wrapper .trade_orderbook-bids > .price-row-wrapper:first-child {
-    color: var(--labels_important-active-labels-text-graphics);
+    background-color: var(--calculated_trading_buying-orderbook-best-bar);
     font-weight: bold; }
+    .trade_orderbook-wrapper .trade_orderbook-bids > .price-row-wrapper:first-child .trade_orderbook-cell-price {
+      color: var(--calculated_trading-orderbook-text); }
   .trade_orderbook-wrapper .trade_orderbook-bids {
     color: var(--trading_buying-related-elements); }
   .trade_orderbook-wrapper .trade_bids-limit_bar .orderbook-limit_bar-wrapper {
@@ -1994,7 +2441,15 @@ table th {
   .trade_orderbook-wrapper .orderbook-limit_bar-wrapper .orderbook-limit_bar-line {
     height: 2px; }
   .trade_orderbook-wrapper .orderbook-limit_bar-wrapper .orderbook-limit_bar-text {
-    font-size: 1rem; }
+    font-size: 1.1rem; }
+
+.trade-select-option-wrapper .ant-select-item,
+.trade-select-option-wrapper .ant-select-item-option-content {
+  font-size: 11px; }
+
+.order-book-select-coin .ant-select-item,
+.order-book-select-coin .ant-select-item-option {
+  font-size: 0.8rem; }
 
 .trade_orderbook-depth-selector {
   padding: 4px; }
@@ -2098,6 +2553,16 @@ table th {
           bottom: 0;
           background-color: var(--calculated_specials_highlight-box);
           z-index: -1; }
+  .trade_active_orders-wrapper .recent-trades.cell_box-type {
+    display: flex; }
+    .trade_active_orders-wrapper .recent-trades.cell_box-type .buy {
+      min-width: 3rem;
+      padding-left: 0.5rem;
+      padding-right: 0.5rem; }
+    .trade_active_orders-wrapper .recent-trades.cell_box-type .sell {
+      min-width: 3rem;
+      padding-left: 0.5rem;
+      padding-right: 0.5rem; }
 
 .quick-trade-tab {
   border: 1px solid var(--calculated_secondary-border);
@@ -2132,6 +2597,56 @@ table th {
   min-height: 3rem;
   max-height: 3rem; }
 
+.public-history__header {
+  font-size: 1rem !important; }
+  .public-history__header .custom-select-input-style {
+    font-size: 1rem !important;
+    max-width: 8rem; }
+    .public-history__header .custom-select-input-style .ant-select-selector {
+      height: 1.5rem !important;
+      line-height: 1.5rem !important;
+      padding: 0;
+      font-size: 1rem !important; }
+    .public-history__header .custom-select-input-style .ant-select-selection-item {
+      height: 1.5rem !important;
+      line-height: 1.5rem !important;
+      font-weight: bold; }
+    .public-history__header .custom-select-input-style .ant-select-arrow {
+      right: 2px; }
+
+.mobile-tab_market-indicator {
+  width: 2.5rem !important;
+  margin: 0.3rem 0.3rem 0 0.3rem; }
+  .mobile-tab_market-indicator svg .btc0,
+  .mobile-tab_market-indicator svg .btc1,
+  .mobile-tab_market-indicator svg .eth0,
+  .mobile-tab_market-indicator svg .eth1,
+  .mobile-tab_market-indicator svg .bch-icon,
+  .mobile-tab_market-indicator svg .xrp-icon,
+  .mobile-tab_market-indicator svg .xht-icon,
+  .mobile-tab_market-indicator svg .xmr-icon,
+  .mobile-tab_market-indicator svg .xlm-icon,
+  .mobile-tab_market-indicator svg .eos-icon,
+  .mobile-tab_market-indicator svg .trx-icon,
+  .mobile-tab_market-indicator svg .ada-icon,
+  .mobile-tab_market-indicator svg .bnb-icon,
+  .mobile-tab_market-indicator svg .tusd-icon,
+  .mobile-tab_market-indicator svg .dai-icon,
+  .mobile-tab_market-indicator svg .ltc-icon,
+  .mobile-tab_market-indicator svg .default-icon {
+    fill: var(--labels_secondary-inactive-label-text-graphics) !important; }
+  .mobile-tab_market-indicator svg .plus,
+  .mobile-tab_market-indicator svg .minus {
+    stroke: var(--labels_secondary-inactive-label-text-graphics) !important;
+    stroke-width: 0.2rem; }
+  .mobile-tab_market-indicator svg .st0 {
+    fill: var(--calculated_base_top-bar-navigation_text);
+    stroke-width: 0rem; }
+  .mobile-tab_market-indicator svg .icon-check-1 {
+    stroke: var(--calculated_base_top-bar-navigation_text); }
+  .mobile-tab_market-indicator svg .xht-icon-1 {
+    fill: var(--base_background) !important; }
+
 .quote-container {
   background-color: var(--base_background);
   overflow-y: scroll; }
@@ -2148,11 +2663,11 @@ table th {
   flex-direction: column;
   align-items: center; }
   .quote-countdown-wrapper .counter {
-    font-size: 2.5rem; }
+    font-size: 2.6rem; }
 
 .quote-success-review-text {
   margin: 1rem 0 2rem;
-  font-size: 1rem;
+  font-size: 1.1rem;
   text-align: center; }
 
 .quote-success__title {
@@ -2172,12 +2687,14 @@ table th {
 .layout-mobile .quote-container {
   background-color: transparent;
   overflow-y: scroll;
-  min-height: calc( 100vh - 17rem);
-  max-height: calc( 100vh - 17rem); }
+  min-height: calc(
 100vh - 17rem);
+  max-height: calc(
 100vh - 17rem); }
   .layout-mobile .quote-container .quick_trade-wrapper {
-    flex: 1;
-    min-width: 100vw;
-    max-width: 100vw; }
+    flex: 1 1;
+    min-width: 95vw;
+    max-width: 100vw;
+    margin: 1rem;
+    padding: 1rem; }
 
 .layout-mobile .base_negative_balance,
 .layout-mobile .success-review,
@@ -2204,20 +2721,48 @@ table th {
 .verification_container {
   margin: 0 auto;
   padding: 1rem; }
+  .verification_container .icon_title-wrapper {
+    flex-direction: row;
+    justify-content: flex-start; }
   .verification_container .title-inactive {
     color: var(--labels_secondary-inactive-label-text-graphics); }
   .verification_container .verification-buttons-wrapper {
     width: 100%; }
+    .verification_container .verification-buttons-wrapper .exir-button {
+      width: 300px; }
   .verification_container .warning_text {
     margin: 1rem 0;
     padding: 0; }
   .verification_container .header-content {
     color: var(--labels_secondary-inactive-label-text-graphics);
-    font-size: 0.8rem; }
+    font-size: 1.1rem; }
   .verification_container .content-text {
-    font-size: 0.8rem; }
+    font-size: 1.1rem; }
   .verification_container .document-note-icon {
     width: 3.5rem; }
+  .verification_container .inner-content {
+    border-radius: 4px;
+    padding: 30px;
+    margin: 30px 0px 70px;
+    background-color: var(--base_wallet-sidebar-and-popup);
+    padding-bottom: 20px; }
+    .verification_container .inner-content .custom-tab-wrapper .tab_item {
+      min-width: 9rem; }
+    .verification_container .inner-content .btn-wrapper {
+      position: relative;
+      display: flex;
+      justify-content: center;
+      align-items: center; }
+      .verification_container .inner-content .btn-wrapper .exir-verification-button {
+        position: absolute;
+        top: 60px;
+        width: 300px; }
+
+.verification-form-panel {
+  padding: 30px 50px;
+  background-color: var(--base_wallet-sidebar-and-popup); }
+  .verification-form-panel .action_notification-wrapper .notification-info {
+    white-space: nowrap; }
 
 .verification_content-form-wrapper {
   padding: 0.25rem; }
@@ -2249,10 +2794,40 @@ table th {
 
 .layout-mobile .verification_container .verification-info-txt {
   width: 100%;
-  font-size: 12px !important; }
+  font-size: 13px !important; }
+
+.layout-mobile .verification_container .exir-verification-button {
+  font-size: 13px !important;
+  position: unset !important;
+  top: 0 !important;
+  width: 100% !important; }
+
+.layout-mobile .verification_container .inner-content {
+  padding: 5px 8px; }
+
+.layout-mobile .verification_container .icon_title-wrapper {
+  margin-top: 0; }
+  .layout-mobile .verification_container .icon_title-wrapper .icon_title-text.title {
+    font-size: 2.6rem; }
+
+.layout-mobile .verification_container .verification_content-form-wrapper .verification-form-panel {
+  padding: 5px 8px; }
+  .layout-mobile .verification_container .verification_content-form-wrapper .verification-form-panel .field-wrapper .field-label-wrapper {
+    flex-direction: column; }
+
+.layout-mobile .verification_container .verification_content-form-wrapper .content-text {
+  width: 100%; }
+
+.layout-mobile .verification_container .input-box-field .input_field-input::placeholder {
+  font-size: 10px; }
 
-.layout-mobile .verification_container .exir-button {
-  font-size: 12px !important; }
+.layout-mobile .verification_container .verification-buttons-wrapper .exir-button {
+  width: 100% !important;
+  flex: 1; }
+
+.layout-mobile .verification_container .separator {
+  width: auto;
+  margin: 1rem; }
 
 .layout-mobile .mobile-bar-tab .bartab-text-wrapper {
   font-size: 1.5rem;
@@ -2260,25 +2835,25 @@ table th {
 
 .layout-mobile .presentation_container.verification_container {
   padding-top: 0 !important;
-  max-height: calc( 100vh - 10rem); }
+  max-height: calc(
 100vh - 10rem); }
   .layout-mobile .presentation_container.verification_container .header-content {
-    font-size: 12px !important; }
+    font-size: 13px !important; }
 
 .layout-mobile .header_title-wrapper .header_title-text {
-  font-size: 14px; }
+  font-size: 15px; }
 
 .layout-mobile .header_title-wrapper .header_title-children {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .field-wrapper .field-content .field-label,
 .layout-mobile .field-wrapper .field-content .field-children,
 .layout-mobile .field-wrapper .field-content .inner_container,
 .layout-mobile .field-wrapper .field-content .input_field-input,
 .layout-mobile .field-wrapper .field-content .placeholder {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .content-text {
-  font-size: 12px; }
+  font-size: 13px; }
 
 .direction_ltr .divider {
   margin-right: 0.5rem; }
@@ -2286,6 +2861,16 @@ table th {
 .direction_rtl .divider {
   margin-left: 0.5rem; }
 
+@media (max-width: 1060px) {
+  .verification_container .inner-content .custom-tab-wrapper {
+    overflow-x: auto; }
+  .verification_container .verification-buttons-wrapper .exir-button {
+    width: 80%; }
+  .verification_container .verification_content-form-wrapper .verification-form-panel .field-wrapper .field-label {
+    font-size: 11px; }
+  .verification_container .verification_content-form-wrapper .verification-form-panel .field-wrapper .input-box-field .input_field-input::placeholder {
+    font-size: 11px; } }
+
 .help-wrapper {
   min-width: 30rem;
   max-width: 38rem; }
@@ -2300,7 +2885,7 @@ table th {
   .help-wrapper .buttons-wrapper {
     margin-top: 1.5rem; }
   .help-wrapper .text {
-    font-size: 0.8rem;
+    font-size: 12px;
     flex: 6;
     margin-left: 1rem; }
   .help-wrapper .separator {
@@ -2347,26 +2932,25 @@ table th {
 .layout-mobile .summary-container .trader-account-wrapper .summary-block_wrapper .trade-account-secondary-txt {
   width: 100%; }
   .layout-mobile .summary-container .trader-account-wrapper .summary-block_wrapper .trade-account-secondary-txt .account-details-content {
-    font-size: 12px; }
+    font-size: 13px; }
   .layout-mobile .summary-container .trader-account-wrapper .summary-block_wrapper .trade-account-secondary-txt .trade-account-link {
-    font-size: 12px; }
+    font-size: 13px; }
 
 .layout-mobile .summary-container .account-details-wrapper .requirement-content {
-  font-size: 12px; }
+  font-size: 13px; }
 
 .layout-mobile .summary-container .summary-section_1,
 .layout-mobile .summary-container .summary-section_2 {
   height: auto !important; }
 
 .layout-mobile .summary-container .summary-content-txt {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
-.layout-mobile .summary-container .assets-wrapper {
-  margin-top: 40px; }
-  .layout-mobile .summary-container .assets-wrapper .price-text {
-    font-size: 12px !important; }
-  .layout-mobile .summary-container .assets-wrapper .donut-container {
-    height: 30rem; }
+.layout-mobile .summary-container .assets-wrapper .price-text {
+  font-size: 13px !important; }
+
+.layout-mobile .summary-container .assets-wrapper .donut-container {
+  height: 30rem; }
 
 .layout-mobile .summary-container .account-details-wrapper .account-type-menu {
   height: auto !important; }
@@ -2376,18 +2960,27 @@ table th {
   max-width: 100%;
   margin: 1rem auto;
   width: 75rem; }
+  .summary-container .icon_title-wrapper {
+    justify-content: flex-start;
+    flex-direction: row; }
+  .summary-container .account-details-text {
+    padding-top: 1rem;
+    padding-bottom: 2rem; }
   .summary-container .summary-block_wrapper {
-    border-top: 0.2rem solid var(--calculated_secondary-border);
     color: var(--labels_secondary-inactive-label-text-graphics);
-    padding: 0.5rem; }
+    margin: 11px 0;
+    padding: 1.5rem 1rem 1rem 1.5rem;
+    background-color: var(--base_wallet-sidebar-and-popup);
+    border-radius: 3px;
+    border: 1px solid var(--calculated_super-pale_label-text-graphics); }
     .summary-container .summary-block_wrapper .summary-block-title {
       color: var(--labels_secondary-inactive-label-text-graphics);
-      font-size: 1rem;
+      font-size: 1.2rem;
       font-weight: bold; }
     .summary-container .summary-block_wrapper .summary-title-icon {
       width: 2rem; }
   .summary-container .summary-content-txt {
-    font-size: 0.9rem; }
+    font-size: 1.1rem; }
   .summary-container .trader-account-wrapper {
     margin-right: 1.5rem;
     width: 25rem; }
@@ -2412,11 +3005,9 @@ table th {
   .summary-container .trade-account-link {
     color: var(--specials_buttons-links-and-highlights);
     font-weight: bold; }
-  .summary-container .summary-section_1 {
-    height: 30rem; }
-    .summary-container .summary-section_1 .assets-wrapper .donut-container {
-      height: 16rem;
-      width: 100%; }
+  .summary-container .summary-section_1 .assets-wrapper .donut-container {
+    height: 16rem;
+    width: 100%; }
   .summary-container .summary-section_2 {
     height: 40rem; }
   .summary-container .requirements-content-text {
@@ -2484,12 +3075,11 @@ table th {
     justify-content: center;
     -ms-flex-align: center;
     align-items: center;
-    font-size: 0.9rem;
+    font-size: 1rem;
     line-height: 1;
     font-weight: bold; }
   .summary-container .assets-wrapper {
-    font-size: 0.8rem;
-    margin-right: 1.5rem; }
+    font-size: 0.8rem; }
     .summary-container .assets-wrapper .assets-description {
       width: 86%; }
     .summary-container .assets-wrapper .donut-container {
@@ -2676,7 +3266,7 @@ table th {
     position: relative;
     top: calc(50% - 0.6rem); }
   .summary-container .trade_tabs-search-field {
-    background-color: var(--base_background);
+    background-color: var(--base_wallet-sidebar-and-popup);
     color: var(--labels_inactive-button);
     margin: 0;
     padding-right: 0.5rem; }
@@ -2694,9 +3284,9 @@ table th {
     cursor: pointer;
     font-weight: bold; }
   .fee-limits-wrapper .content-txt {
-    font-size: 0.9rem; }
+    font-size: 1rem; }
   .fee-limits-wrapper .content-title {
-    font-size: 1rem;
+    font-size: 1.1rem;
     font-weight: bold;
     margin: 1.5rem 0; }
   .fee-limits-wrapper .icon_title-wrapper {
@@ -2830,8 +3420,6 @@ table th {
   .summary-container .assets-wrapper,
   .summary-container .trader-account-wrapper {
     font-size: 0.9rem; }
-  .summary-container .summary-section_1 {
-    height: 31rem !important; }
   .summary-container .summary-section_2 {
     height: 44rem !important; }
   .fee-limits-wrapper .content-txt {
@@ -2902,7 +3490,7 @@ table th {
 
 .market-list__container .market-list__block .market-list__block-table {
   width: 100%;
-  font-size: 0.9rem;
+  font-size: 1rem;
   margin-bottom: 3rem; }
   .market-list__container .market-list__block .market-list__block-table thead {
     color: var(--labels_secondary-inactive-label-text-graphics); }
@@ -2916,6 +3504,9 @@ table th {
     .market-list__container .market-list__block .market-list__block-table .table-row:hover {
       background-color: var(--base_secondary-navigation-bar);
       color: var(--labels_secondary-inactive-label-text-graphics); }
+    .market-list__container .market-list__block .market-list__block-table .table-row .td-chart {
+      width: 150px;
+      height: 50px; }
   .market-list__container .market-list__block .market-list__block-table .table-bottom-border td,
   .market-list__container .market-list__block .market-list__block-table th {
     position: relative;
@@ -2934,7 +3525,9 @@ table th {
     direction: ltr; }
 
 .direction_ltr .market-list__container .market-list__block .market-list__block-table th {
-  font-family: "Raleway"; }
+  font-family: "Raleway";
+  vertical-align: middle;
+  padding: 0.5rem; }
 
 .direction_ltr .market-list__container .market-list__block .market-list__block-table th,
 .direction_ltr .market-list__container .market-list__block .market-list__block-table td {
@@ -2956,6 +3549,29 @@ table th {
 .direction_rtl .market-list__container .market-list__block .market-list__block-table .table-icon {
   padding-left: 0.5rem; }
 
+.layout-mobile .market-list__container .market-list__block {
+  overflow-x: auto;
+  position: relative; }
+  .layout-mobile .market-list__container .market-list__block .market-list__block-table thead {
+    font-size: 1.3rem !important; }
+  .layout-mobile .market-list__container .market-list__block .market-list__block-table .table-row {
+    font-size: 1.3rem !important; }
+    .layout-mobile .market-list__container .market-list__block .market-list__block-table .table-row td {
+      padding: 0.5rem;
+      min-width: 10rem; }
+    .layout-mobile .market-list__container .market-list__block .market-list__block-table .table-row .td-chart {
+      min-width: 15rem;
+      padding: 0 !important; }
+  .layout-mobile .market-list__container .market-list__block .market-list__block-table .sticky-col {
+    position: -webkit-sticky;
+    position: sticky;
+    background-color: var(--base_wallet-sidebar-and-popup);
+    left: 0;
+    width: 12rem !important;
+    min-width: 12rem !important;
+    max-width: 12rem !important;
+    z-index: 1; }
+
 .trade_tabs-container {
   color: var(--labels_secondary-inactive-label-text-graphics);
   height: inherit;
@@ -3029,17 +3645,17 @@ table th {
       fill: var(--labels_secondary-inactive-label-text-graphics) !important; }
   .trade_tabs-container .trade_tab-pair-title {
     color: var(--labels_important-active-labels-text-graphics);
-    font-size: 1rem;
+    font-size: 1.1rem;
     font-weight: bold; }
   .trade_tabs-container .trade_tab-pair-sub-title {
-    font-size: 0.9rem; }
+    font-size: 1rem; }
   .trade_tabs-container .trade_tab-pair-volume {
-    font-size: 0.9rem;
+    font-size: 1rem;
     text-align: right;
     padding-right: 0.3rem; }
   .trade_tabs-container .trade_tab-pair-price {
     color: var(--labels_important-active-labels-text-graphics);
-    font-size: 1.75rem;
+    font-size: 1.8rem;
     font-weight: bold; }
   .trade_tabs-container .trade_tab-ticker-container {
     flex-direction: column;
@@ -3249,9 +3865,54 @@ table th {
 .deactive_risk_data {
   color: var(--labels_secondary-inactive-label-text-graphics); }
 
+.settings_container .icon_title-wrapper {
+  flex-direction: row;
+  justify-content: flex-start; }
+
+.settings_container .header_title-wrapper .action_notification-wrapper {
+  top: 30px; }
+
+.settings_container .settings-form-wrapper .settings-form {
+  padding: 10px 30px 30px 30px;
+  border-radius: 4px;
+  margin: 30px 0px;
+  background-color: var(--base_wallet-sidebar-and-popup); }
+  .settings_container .settings-form-wrapper .settings-form .notification-icon {
+    width: 50px; }
+  .settings_container .settings-form-wrapper .settings-form .icon_title-wrapper {
+    margin: 0;
+    flex-direction: row;
+    justify-content: flex-start; }
+    .settings_container .settings-form-wrapper .settings-form .icon_title-wrapper .icon_title-svg svg {
+      width: 50px; }
+    .settings_container .settings-form-wrapper .settings-form .icon_title-wrapper .icon_title-text {
+      font-size: 15px;
+      margin: 0; }
+
+.settings_container .settings-form-wrapper .exir-button {
+  width: 300px; }
+
 .layout-mobile .portfolio-wrapper {
   margin: 25% auto; }
 
+.layout-mobile .settings_container .header_title-wrapper .action_notification-wrapper {
+  top: 0; }
+
+.layout-mobile .settings_container .settings-form-wrapper .settings-form {
+  margin: 15px 0 25px !important;
+  padding: 10px; }
+  .layout-mobile .settings_container .settings-form-wrapper .settings-form .field-wrapper .field-label-wrapper {
+    flex-direction: column; }
+
+@media (max-width: 1060px) {
+  .settings_container .settings-form-wrapper .settings-form .icon_title-wrapper .icon_title-text {
+    margin: 1rem;
+    margin-bottom: 0; }
+  .settings_container .settings-form-wrapper .settings-form .field-wrapper .field-label {
+    font-size: 12px; }
+  .settings_container .tab_controller-wrapper .tab_item {
+    font-size: 13px; } }
+
 .expired_exchange_wrapper {
   padding: 2rem; }
   .expired_exchange_wrapper .flex-cloumn {
@@ -3441,6 +4102,29 @@ table th {
   width: 100%;
   border-top: solid #a7a7a7 1px;
   background-color: #0000ff; }
+  .operator-controls__panel.deep {
+    height: 306px; }
+  .operator-controls__panel .ant-tabs {
+    transform: translateY(-36px); }
+  .operator-controls__panel .ant-tabs-content {
+    height: 100% !important; }
+  .operator-controls__panel textarea {
+    border: none;
+    padding: 0 46px; }
+    .operator-controls__panel textarea.ant-input {
+      font-weight: 600; }
+  .operator-controls__panel .ant-tabs-nav-wrap {
+    padding-left: 46px; }
+  .operator-controls__panel .ant-tabs-tab {
+    color: #ffffffcc; }
+  .operator-controls__panel .ant-tabs-tab-active {
+    color: #ffffff; }
+    .operator-controls__panel .ant-tabs-tab-active .ant-tabs-tab-btn {
+      font-weight: bold; }
+  .operator-controls__panel .ant-tabs-ink-bar {
+    background: #ffffff; }
+  .operator-controls__panel .ant-tabs-top > .ant-tabs-nav::before {
+    border-color: #ffffffcc; }
 
 .operator-controls__panel-list {
   display: flex;
@@ -3464,6 +4148,12 @@ table th {
   width: 145px;
   margin-right: 37px;
   text-transform: uppercase; }
+  .operator-controls__publish-button.small {
+    height: 37px;
+    width: 99px;
+    margin-top: 8px;
+    margin-right: 12px;
+    font-size: 1rem; }
 
 .operator-controls__save-button {
   color: #ffffff;
@@ -3646,6 +4336,15 @@ table th {
   padding: 4px 8px;
   color: white; }
 
+.sortable_section {
+  cursor: grab; }
+  .sortable_section td {
+    cursor: grab; }
+    .sortable_section td:active {
+      cursor: grabbing; }
+  .sortable_section:active {
+    cursor: grabbing; }
+
 .init-container {
   flex: 1;
   height: 100%; }
@@ -3866,7 +4565,7 @@ table th {
     flex: 1;
     overflow-y: scroll; }
     .sidebar-container .sidebar-notifications .sidebar-title {
-      font-size: 1.25rem;
+      font-size: 1.3rem;
       font-weight: bold; }
 
 .sidebar-notifications-wrapper {
@@ -3921,21 +4620,23 @@ table th {
     align-items: center;
     width: 20%; }
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .post-icon,
-    .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .wallet-selected-2,
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .chat-0,
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .account-svg-1,
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .quick-trade-tab-active {
       fill: var(--calculated_base_top-bar-navigation_text-inactive); }
+    .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .tab-wallet0,
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .trade-active-2,
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .chat-0,
     .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .quick-trade-tab-active {
       stroke: var(--calculated_base_top-bar-navigation_text-inactive); }
+    .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .tab-wallet0,
+    .sidebar-bottom-wrapper .sidebar-bottom-button .sidebar-bottom-icon svg .quick-trade-tab-active {
+      fill: transparent; }
     .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .post-icon,
-    .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .wallet-selected-2,
     .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .chat-0,
-    .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .account-svg-1,
-    .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .quick-trade-tab-active {
+    .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .account-svg-1 {
       fill: var(--calculated_base_top-bar-navigation_text); }
+    .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .tab-wallet0,
     .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .trade-active-2,
     .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .chat-0,
     .sidebar-bottom-wrapper .sidebar-bottom-button.active .sidebar-bottom-icon svg .quick-trade-tab-active {
@@ -3978,7 +4679,9 @@ table th {
   .sidebar-container .sidebar_hub-wrapper {
     max-height: 35rem !important; }
   .sidebar-container .sidebar-notifications {
-    min-height: 20rem; } }
+    min-height: 20rem; }
+  .sidebar-bottom-icon svg {
+    stroke: none !important; } }
 
 .tab_controller-title {
   display: flex;
@@ -3991,30 +4694,31 @@ table th {
   .tab_controller-title .tab_controller-title-text {
     font-size: 4rem; }
 
-.layout-mobile .tab_controller-tabs {
-  font-size: 1.5rem; }
+.layout-mobile .tab_controller-tabs,
+.layout-mobile .tab_item {
+  font-size: 1.5rem !important; }
 
 .tab_controller-tabs {
   width: 100%;
   display: flex;
-  justify-content: space-between;
   align-content: center;
-  border-top: 2px solid var(--calculated_secondary-border);
+  border-bottom: 2px solid var(--calculated_secondary-border);
   margin-bottom: 1rem; }
   .tab_controller-tabs .tab_item {
-    border-top: 4px solid transparent;
+    border-bottom: var(--labels_important-active-labels-text-graphics) solid transparent;
     padding: 0 8px 8px;
     display: flex;
     align-items: center;
-    min-width: 10rem;
+    min-width: 8rem;
     justify-content: center;
-    color: var(--labels_secondary-inactive-label-text-graphics); }
+    color: var(--labels_secondary-inactive-label-text-graphics);
+    font-size: 14px; }
     .tab_controller-tabs .tab_item svg path {
       opacity: 0.7; }
   .tab_controller-tabs .tab-trade {
     padding: 0 1px 12px !important; }
   .tab_controller-tabs .tab_item-active {
-    border-top: 4px solid var(--calculated_secondary-border);
+    border-bottom: 4px solid var(--labels_important-active-labels-text-graphics);
     color: var(--labels_important-active-labels-text-graphics); }
     .tab_controller-tabs .tab_item-active svg path {
       opacity: 1; }
@@ -4033,7 +4737,7 @@ table th {
   width: 100%;
   min-height: 36px;
   height: 36px;
-  font-size: 0.9rem;
+  font-size: 1rem;
   font-weight: bold;
   background: var(--base_top-bar-navigation);
   border-bottom: 1px solid var(--calculated_super-pale_label-text-graphics); }
@@ -4049,7 +4753,7 @@ table th {
     height: 4rem;
     width: 5rem;
     background-size: contain;
-    background-position: center;
+    background-position: left center;
     background-repeat: no-repeat; }
   .app_bar .app_bar-icon {
     flex: 0;
@@ -4103,8 +4807,7 @@ table th {
   .app_bar .app-bar-account {
     color: var(--calculated_base_top-bar-navigation_text);
     cursor: pointer;
-    margin-right: 0.8rem;
-    width: 15rem; }
+    margin-right: 0.8rem; }
     .app_bar .app-bar-account svg .account-inactive {
       fill: var(--calculated_base_top-bar-navigation_text-inactive);
       stroke: var(--calculated_base_top-bar-navigation_text-inactive); }
@@ -4113,7 +4816,7 @@ table th {
     color: var(--calculated_base_top-bar-navigation_text-inactive);
     cursor: pointer;
     display: flex;
-    font-size: 1rem;
+    font-size: 1.1rem;
     font-weight: 400;
     height: 100%;
     padding: 0 0.5rem;
@@ -4129,7 +4832,6 @@ table th {
     margin: 0.5rem 0.3rem 0 0.3rem;
     width: 1.5rem; }
   .app_bar .app-bar-account-icon {
-    margin: 0.5rem 0.3rem 0 0.3rem;
     width: 1.5rem; }
   .app_bar .app-bar-account-moon-icon {
     margin: 0.2rem 0.3rem 0 0.3rem;
@@ -4285,13 +4987,16 @@ table th {
     top: calc(50% - 0.6rem); }
   .app_bar .app-bar-account-content {
     align-items: center;
-    flex-direction: column;
     justify-content: center;
-    position: relative; }
+    position: relative;
+    color: var(--calculated_base_top-bar-navigation_text-inactive); }
+  .app_bar .app-announcement-list {
+    height: 335px;
+    width: 280px; }
   .app_bar .app-bar-account-notification {
     position: absolute;
-    right: -6px;
-    top: 0;
+    left: 15px;
+    bottom: 12px;
     height: 1.2rem;
     width: 1.2rem;
     border-radius: 1.2rem;
@@ -4306,13 +5011,13 @@ table th {
   .app_bar .app-bar-account-menu {
     display: block;
     position: absolute;
-    right: 0;
     top: 36px;
     min-width: 10rem;
     min-height: 8rem;
     background-color: var(--base_background);
-    z-index: 20;
+    z-index: 1052;
     padding: 1rem;
+    border-top: 2px solid var(--specials_buttons-links-and-highlights);
     -webkit-box-shadow: 0px 4px 6px 1px rgba(0, 0, 0, 0.4);
     -moz-box-shadow: 0px 4px 6px 1px rgba(0, 0, 0, 0.4);
     box-shadow: 0px 4px 6px 1px rgba(0, 0, 0, 0.4); }
@@ -4434,6 +5139,16 @@ table th {
       font-size: 0.8rem;
       line-height: 1;
       font-weight: bold; }
+  .app_bar .login-container {
+    background-color: var(--specials_buttons-links-and-highlights);
+    padding: 2px 20px;
+    border-radius: 3px;
+    cursor: pointer;
+    font-size: 11px; }
+
+.select-option-wrapper .ant-select-item,
+.select-option-wrapper .ant-select-item-option {
+  font-size: 12px; }
 
 .app-bar-tab-menu {
   background-color: var(--base_top-bar-navigation) !important; }
@@ -4482,18 +5197,19 @@ table th {
 
 .app-menu-bar {
   display: flex;
-  font-size: 0.9rem;
-  height: 36px;
-  min-height: 36px;
+  font-size: 1rem;
   position: relative;
   width: 100%; }
   .app-menu-bar .app-menu-bar-content {
     color: var(--calculated_base_top-bar-navigation_text-inactive);
     cursor: pointer;
-    height: 2.5rem;
-    position: relative;
-    top: 1px;
-    width: 10rem; }
+    margin: 0 20px;
+    height: 100%;
+    padding: 8px 0;
+    opacity: 0.8;
+    display: flex;
+    align-items: center;
+    border-top: 3px solid transparent; }
   .app-menu-bar .app-menu-bar-content-item {
     margin: auto;
     position: relative; }
@@ -4513,10 +5229,10 @@ table th {
     .app-menu-bar .app-menu-bar-icon svg .tab-api0 {
       fill: var(--calculated_base_top-bar-navigation_text-inactive); }
   .app-menu-bar .active-menu {
-    border-bottom: 1px solid var(--calculated_super-pale_label-text-graphics);
     color: var(--calculated_base_top-bar-navigation_text);
-    height: 2.5rem;
-    position: relative; }
+    border-top: 3px solid var(--calculated_base_top-bar-navigation_text);
+    height: 100%;
+    opacity: 1; }
     .app-menu-bar .active-menu svg .trade-active-2 {
       stroke: var(--calculated_base_top-bar-navigation_text); }
     .app-menu-bar .active-menu svg .trade-active-2,
@@ -4610,7 +5326,7 @@ table th {
 .market-bar {
   background: var(--base_secondary-navigation-bar);
   display: flex;
-  font-size: 0.9rem;
+  font-size: 1rem;
   height: 36px;
   min-height: 36px;
   position: relative;
@@ -4622,6 +5338,9 @@ table th {
   .market-bar .selector-trigger .app_bar-pair-tab {
     min-width: 17rem;
     max-width: 17rem; }
+  .market-bar .selector-trigger:hover {
+    background-color: var(--base_secondary-navigation-bar);
+    border-radius: 0.2rem; }
   .market-bar .app_bar-currency-txt {
     font-weight: 600; }
   .market-bar .app-price-diff-down {
@@ -4742,7 +5461,7 @@ table th {
     fill: var(--calculated_base_top-bar-navigation_text) !important;
     stroke-width: 0rem; }
   .market-bar .app_bar-pair-font {
-    font-size: 0.8rem; }
+    font-size: 0.9rem; }
   .market-bar .app-bar-tab-close {
     margin: 0.2rem 0.4rem 0 0.4rem;
     width: 0.9rem; }
@@ -4751,14 +5470,14 @@ table th {
     color: var(--labels_secondary-inactive-label-text-graphics);
     cursor: pointer;
     display: flex;
-    font-size: 1rem;
+    font-size: 1.2rem;
     font-weight: 400;
     height: 100%;
     position: relative; }
   .market-bar .app_bar-pair-tab {
     padding: 0 0.5rem;
-    min-width: 13rem;
-    max-width: 13rem; }
+    min-width: 14rem;
+    max-width: 14rem; }
     .market-bar .app_bar-pair-tab.selector-trigger {
       min-width: 17rem;
       max-width: 17rem; }
@@ -4829,7 +5548,6 @@ table th {
   margin-bottom: 0.5rem; }
 
 .search-field {
-  width: 100%;
   color: var(--labels_secondary-inactive-label-text-graphics);
   background-color: var(--base_background); }
   .search-field ::placeholder {
@@ -4856,7 +5574,7 @@ table th {
   .app-bar-add-tab-menu .app-bar-tab-menu-list {
     background-color: var(--base_top-bar-navigation);
     color: var(--labels_secondary-inactive-label-text-graphics);
-    font-size: 0.8rem;
+    font-size: 0.9rem;
     height: 2.5rem;
     padding: 0.5rem 0.8rem;
     width: 3.2rem;
@@ -4867,13 +5585,16 @@ table th {
     color: var(--labels_secondary-inactive-label-text-graphics);
     font-weight: bold; }
   .app-bar-add-tab-menu .app-bar-add-tab-content {
-    font-size: 0.8rem;
+    font-size: 0.9rem;
     overflow-y: scroll;
     padding: 0.3rem 0; }
+    .app-bar-add-tab-menu .app-bar-add-tab-content .scroll-view {
+      overflow-y: auto;
+      height: 22rem; }
   .app-bar-add-tab-menu .app-bar-tab-overflow-content {
     background-color: var(--base_background);
     color: var(--labels_secondary-inactive-label-text-graphics);
-    font-size: 0.8rem;
+    font-size: 0.9rem;
     overflow-y: scroll;
     padding: 0.3rem 0; }
   .app-bar-add-tab-menu .app-bar-add-tab-content-list {
@@ -4966,6 +5687,10 @@ table th {
   .app-bar-add-tab-menu .app-bar-tab-setting .app-price-diff-up,
   .app-bar-add-tab-menu .app-bar-add-tab-icons .app-price-diff-up {
     color: var(--trading_buying-related-elements); }
+  .app-bar-add-tab-menu .app-price-diff-down {
+    color: var(--trading_selling-related-elements); }
+  .app-bar-add-tab-menu .app-price-diff-up {
+    color: var(--trading_buying-related-elements); }
 
 .app_bar-link {
   margin: 0.5rem 0;
@@ -4997,9 +5722,6 @@ table th {
     font-size: 1rem !important;
     height: 45px;
     min-height: 45px; }
-    .app-menu-bar .active-menu,
-    .app-menu-bar .app-menu-bar-content {
-      height: 3rem; }
     .app-menu-bar .app-menu-bar-content {
       width: 12rem; }
   .app-bar-add-tab-menu {
@@ -5072,7 +5794,8 @@ table th {
 .app-menu-bar-wrapper {
   flex-grow: 1;
   flex-shrink: 1;
-  overflow-y: auto; }
+  overflow-y: auto;
+  align-items: flex-start !important; }
 
 .stared-market svg {
   fill: var(--specials_my-username-in-chat); }
@@ -5084,18 +5807,26 @@ table th {
 .market-trigger {
   background-color: var(--base_background); }
 
+.landing-page-bar {
+  background: linear-gradient(to bottom, var(--calculated_landing_background), var(--calculated_landing_background)) !important; }
+
+@media (max-width: 768px) {
+  .select-option-wrapper .ant-select-item,
+  .select-option-wrapper .ant-select-item-option {
+    font-size: 0.9rem !important; } }
+
 .check_title-container {
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center; }
   .check_title-container .check_title-label {
-    font-size: 1.75rem;
-    line-height: 1.75rem;
+    font-size: 1.8rem;
+    line-height: 1.8rem;
     padding: 0.25rem 0; }
   .check_title-container .custom_title-label {
-    font-size: 1.25rem;
-    line-height: 1.25rem;
+    font-size: 1.3rem;
+    line-height: 1.3rem;
     padding: 0.25rem 0;
     text-align: center; }
   .check_title-container .check_title-icon {
@@ -5219,12 +5950,11 @@ table th {
   height: 1.5rem; }
 
 .header_title-wrapper {
-  border-top: 1px solid var(--calculated_important-border);
   margin-bottom: 1rem;
   padding-top: 0.5rem;
   position: relative; }
   .header_title-wrapper .header_title-children {
-    font-size: 0.9rem;
+    font-size: 1.1rem;
     color: var(--labels_secondary-inactive-label-text-graphics);
     padding: 0.5rem 0; }
   .header_title-wrapper .header_title-icon {
@@ -5316,10 +6046,10 @@ table th {
   font-family: "Raleway"; }
 
 .layout-mobile .mobile_tab-wrapper .status_txt {
-  font-size: 12px; }
+  font-size: 13px; }
 
 .wallet_section-wrapper {
-  font-size: 0.9rem;
+  font-size: 1rem;
   padding: 0.25rem 0; }
   .wallet_section-wrapper .wallet_section-content > * {
     margin-bottom: 0.5rem; }
@@ -5328,6 +6058,10 @@ table th {
   .wallet_section-wrapper.wallet_section-total_asset > * {
     margin: 0.5rem 0; }
 
+.wallet-wrapper .icon_title-wrapper {
+  flex-direction: row;
+  justify-content: flex-start; }
+
 .wallet-wrapper .donut-container {
   height: 18rem; }
   .wallet-wrapper .donut-container .donut-label-pair {
@@ -5336,19 +6070,19 @@ table th {
 .wallet_section-title {
   text-transform: uppercase;
   color: var(--labels_secondary-inactive-label-text-graphics);
-  font-size: 0.9rem; }
+  font-size: 1rem; }
   .wallet_section-title > * {
     margin: 0.5rem; }
 
 .wallet_section-title-amount {
   color: var(--labels_secondary-inactive-label-text-graphics);
-  font-size: 0.9rem; }
+  font-size: 1rem; }
 
 .wallet_section-total_asset {
   font-size: 1rem;
   color: var(--labels_secondary-inactive-label-text-graphics); }
   .wallet_section-total_asset > span {
-    font-size: 1.75rem;
+    font-size: 1.8rem;
     line-height: 1; }
   .wallet_section-total_asset:first-child {
     margin-bottom: 0; }
@@ -5378,6 +6112,10 @@ table th {
   .direction_ltr .sidebar_section-container .wallet-wrapper .accordion_section--open .accordion_section_title .wallet_section-title:after {
     border-left-color: var(--labels_important-active-labels-text-graphics); }
 
+.wallet-wrapper .icon-title-wrapper {
+  flex-direction: row;
+  justify-content: flex-start; }
+
 .direction_rtl .sidebar_section-container .wallet-wrapper .accordion_section_title .wallet_section-title:after {
   content: "";
   display: block;
@@ -5459,40 +6197,38 @@ table th {
           width: 100%;
           height: 3px;
           background-color: var(--coin-eur); }
-  .sidebar_hub-wrapper .sidebar_hub-content {
-    margin: 1.5rem 2rem; }
-    .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section {
-      border-top: 1px solid var(--calculated_super-pale_label-text-graphics); }
-      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section:not(:last-child) {
-        margin-bottom: 1.5rem; }
-      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section > div:nth-child(n + 2) {
-        margin-top: 1rem; }
-      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header {
-        padding: 0.5rem 0.25rem; }
-        .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header .sidebar_hub-section-icon {
-          width: 2rem;
-          height: 2rem; }
-          .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header .sidebar_hub-section-icon svg path {
-            fill: transparent;
-            stroke: var(--labels_secondary-inactive-label-text-graphics); }
-        .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header .sidebar_hub-section-title {
-          font-size: 1.25rem;
-          margin: 0 0.5rem;
-          color: var(--labels_secondary-inactive-label-text-graphics); }
-      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-content .accordion_wrapper .accordion_section {
-        border-color: var(--labels_secondary-inactive-label-text-graphics); }
-      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section.section-active {
-        border-top-width: 2px;
-        border-color: var(--labels_important-active-labels-text-graphics); }
-        .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section.section-active .sidebar_hub-section-header .sidebar_hub-section-icon svg path {
-          fill: var(--labels_important-active-labels-text-graphics);
-          stroke: var(--labels_important-active-labels-text-graphics); }
-        .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section.section-active .sidebar_hub-section-header .sidebar_hub-section-title {
-          color: var(--labels_important-active-labels-text-graphics);
-          font-weight: bold; }
+  .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section {
+    border-top: 1px solid var(--calculated_super-pale_label-text-graphics); }
+    .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section:not(:last-child) {
+      margin-bottom: 1.5rem; }
+    .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section > div:nth-child(n + 2) {
+      margin-top: 1rem; }
+    .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header {
+      padding: 0.5rem 0.25rem; }
+      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header .sidebar_hub-section-icon {
+        width: 2rem;
+        height: 2rem; }
+        .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header .sidebar_hub-section-icon svg path {
+          fill: transparent;
+          stroke: var(--labels_secondary-inactive-label-text-graphics); }
+      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-header .sidebar_hub-section-title {
+        font-size: 1.3rem;
+        margin: 0 0.5rem;
+        color: var(--labels_secondary-inactive-label-text-graphics); }
+    .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section .sidebar_hub-section-content .accordion_wrapper .accordion_section {
+      border-color: var(--labels_secondary-inactive-label-text-graphics); }
+    .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section.section-active {
+      border-top-width: 2px;
+      border-color: var(--labels_important-active-labels-text-graphics); }
+      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section.section-active .sidebar_hub-section-header .sidebar_hub-section-icon svg path {
+        fill: var(--labels_important-active-labels-text-graphics);
+        stroke: var(--labels_important-active-labels-text-graphics); }
+      .sidebar_hub-wrapper .sidebar_hub-content .sidebar_hub-section.section-active .sidebar_hub-section-header .sidebar_hub-section-title {
+        color: var(--labels_important-active-labels-text-graphics);
+        font-weight: bold; }
   .sidebar_hub-wrapper .sign_up-btn,
   .sidebar_hub-wrapper .log_in-btn {
-    background: var(--base_background) !important;
+    background: var(--specials_buttons-links-and-highlights) !important;
     color: var(--labels_important-active-labels-text-graphics) !important;
     border: 1px solid var(--calculated_super-pale_label-text-graphics); }
   .sidebar_hub-wrapper .sidebar_hub-trade .sidebar_hub-button.not-active {
@@ -5544,11 +6280,11 @@ table th {
     .notification-wrapper .notification-title-wrapper .notification-title-text {
       flex: 0;
       text-align: center;
-      font-size: 1.25rem;
+      font-size: 1.3rem;
       color: var(--labels_important-active-labels-text-graphics); }
   .notification-wrapper .notification-content-wrapper {
     position: relative;
-    font-size: 1rem;
+    font-size: 1.1rem;
     display: flex;
     flex-direction: column;
     flex: 1;
@@ -5584,13 +6320,13 @@ table th {
         color: var(--labels_secondary-inactive-label-text-graphics); }
     .notification-wrapper .notification-content-wrapper .notification-content-header {
       position: relative;
-      font-size: 1.25rem;
+      font-size: 1.3rem;
       color: var(--labels_important-active-labels-text-graphics); }
   .notification-wrapper .notification-buttons-wrapper .button-eur {
     background-color: var(--coin-eur); }
   .notification-wrapper .notification-information {
     padding: 1rem 0;
-    font-size: 0.9rem; }
+    font-size: 1rem; }
   .notification-wrapper .trade-notification,
   .notification-wrapper .new-order-notification,
   .notification-wrapper .order-notification {
@@ -5605,7 +6341,7 @@ table th {
     .notification-wrapper .order-notification .notification-content-title {
       margin: 1rem 0; }
   .notification-wrapper .notification-buttons-wrapper .exir-button {
-    font-size: 1rem;
+    font-size: 1.1rem;
     font-weight: bold; }
   .notification-wrapper .with_price-block_amount {
     margin: 3rem 0 4rem;
@@ -5679,7 +6415,7 @@ table th {
   width: 80% !important; }
 
 .notification-wrapper .notification-content-wrapper.notification-withdrawal .notification-link-wrapper {
-  font-size: 0.9rem; }
+  font-size: 1rem; }
 
 .direction_ltr .notification-title-text,
 .direction_ltr .notification-withdrawal .notification-content-title {
@@ -5724,6 +6460,10 @@ table th {
 .trade_announcement {
   font-size: 1.5rem; }
 
+.announcement-notification-list-item {
+  color: var(--labels_important-active-labels-text-graphics);
+  border-bottom: 1px solid var(--calculated_secondary-border); }
+
 .post-content .notifications_list-item-text a {
   color: var(--specials_buttons-links-and-highlights); }
 
@@ -5731,6 +6471,9 @@ table th {
 .post-content .notifications_list-item-text p {
   background-color: var(--base_wallet-sidebar-and-popup) !important; }
 
+.post-content .notifications_list-item-timestamp {
+  color: var(--labels_secondary-inactive-label-text-graphics); }
+
 .dropdown-content .dropdown-option {
   padding: 0; }
 
@@ -5759,7 +6502,7 @@ table th {
     max-height: 15rem; }
 
 .dropdown-option {
-  padding: 0.25rem;
+  padding: 0.25rem 1rem;
   display: flex;
   align-items: center; }
   .dropdown-option > .icon {
@@ -5779,14 +6522,20 @@ table th {
 .direction_rtl .dropdown-option > .icon {
   margin-left: 0.25rem; }
 
+.layout-mobile .dropdown-option > .icon {
+  max-height: 1.8rem; }
+
+.layout-mobile .dropdown-option .option-icon {
+  width: 1.8rem; }
+
 .field-wrapper {
   position: relative;
   width: 100%;
-  font-size: 0.9rem;
-  font-weight: bold;
+  font-size: 1rem;
   margin: 1rem 0; }
   .field-wrapper.error {
-    color: var(--specials_notifications-alerts-warnings); }
+    color: var(--specials_notifications-alerts-warnings);
+    margin-bottom: 15px; }
   .field-wrapper.inline {
     display: flex;
     align-items: flex-end; }
@@ -5794,20 +6543,28 @@ table th {
       flex: 1; }
       .field-wrapper.inline > div.field-error-content {
         padding-bottom: 0.5rem; }
+  .field-wrapper .checkfield-input-wrapper {
+    align-items: center; }
+
+.field-label-wrapper {
+  display: flex;
+  align-items: center; }
+  .field-label-wrapper > div {
+    flex: 1; }
+  .field-label-wrapper .field_warning_wrapper {
+    width: 80%; }
 
 .field-label {
-  margin-bottom: 0.25rem;
   color: var(--labels_important-active-labels-text-graphics);
-  font-weight: normal; }
+  font-size: 14px; }
 
 .field-content {
   position: relative;
   display: flex;
-  flex-direction: column;
-  margin-bottom: 0.25rem; }
+  flex-direction: column; }
 
 .field-children {
-  padding: 0.4rem 0 0.2rem;
+  padding: 0.4rem 1rem 0.2rem;
   position: relative; }
   .field-children.custom {
     padding: 0; }
@@ -5820,6 +6577,17 @@ table th {
       width: 1.25rem;
       height: 1.25rem; }
 
+.input-box-field {
+  width: 100%;
+  height: 38px;
+  padding: 10px 10px;
+  border-radius: 2px;
+  border: 1px solid var(--calculated_important-border);
+  background-color: var(--base_wallet-sidebar-and-popup); }
+  .input-box-field .input_field-input::placeholder {
+    color: var(--labels_secondary-inactive-label-text-graphics);
+    font-size: 14px; }
+
 .field-content-outline:before {
   content: '';
   height: 1.5px;
@@ -5873,9 +6641,16 @@ table th {
   width: 1rem;
   height: 1rem; }
 
+.field_warning_wrapper {
+  font-size: 1rem;
+  color: var(--specials_notifications-alerts-warnings); }
+
 .direction_ltr .field-error-text {
   padding-left: 0.25rem; }
 
+.direction_ltr .field_warning_text {
+  padding-left: 0.25rem; }
+
 .direction_ltr .field-children.valid > *:not(:last-child) {
   padding-right: 1.25rem; }
 
@@ -5883,7 +6658,7 @@ table th {
   right: 0; }
 
 .direction_ltr .field-wrapper.inline .field-error-content {
-  margin-left: 0.5rem; }
+  margin: 0.5rem 0 0 0; }
 
 .direction_ltr .field-wrapper.inline input {
   padding-right: 0; }
@@ -5897,6 +6672,9 @@ table th {
 .direction_rtl .field-error-text {
   padding-right: 0.25rem; }
 
+.direction_rtl .field_warning_text {
+  padding-right: 0.25rem; }
+
 .direction_rtl .field-children.valid > *:not(:last-child) {
   padding-left: 1.25rem; }
 
@@ -5921,6 +6699,16 @@ table th {
 .layout-mobile.direction_rtl .field-wrapper.field-valid.with-notification .action_notification-wrapper {
   left: 1.5rem; }
 
+.layout-mobile .field-label-wrapper > div {
+  flex: 1;
+  width: 100%; }
+
+.layout-mobile .field-label-wrapper .field_warning_wrapper {
+  width: 100%; }
+
+.layout-mobile .field_warning_wrapper {
+  padding-bottom: 1rem; }
+
 .input_icon {
   margin-right: 0.25rem;
   width: 1.2rem; }
@@ -5955,6 +6743,12 @@ table th {
 
 .datefield-wrapper {
   position: relative; }
+  .datefield-wrapper .field-children:last-child .year .field-content,
+  .datefield-wrapper .field-children:last-child .month .field-content,
+  .datefield-wrapper .field-children:last-child .day .field-content {
+    border: 1px solid var(--calculated_important-border);
+    background-color: var(--base_wallet-sidebar-and-popup);
+    padding: 6px 0; }
   .datefield-wrapper .datefield-values-wrapper {
     display: flex; }
     .datefield-wrapper .datefield-values-wrapper > * {
@@ -5975,6 +6769,8 @@ table th {
   padding-right: 0.25rem !important; }
   .direction_ltr .datefield-wrapper .datefield-values-wrapper > *:not(:last-child) {
     margin-right: 1rem; }
+  .direction_ltr .datefield-wrapper .datefield-values-wrapper .dropdown-triangle::after {
+    bottom: 0 !important; }
 
 .direction_rtl .datefield-wrapper .datefield-values-wrapper {
   padding-left: 0.25rem !important; }
@@ -5998,6 +6794,18 @@ table th {
   .multiple_file_wrapper > .action_notification-wrapper {
     position: relative;
     top: 0 !important; }
+  .file_wrapper .paper-clip-icon .action_notification-svg,
+  .multiple_file_wrapper .paper-clip-icon .action_notification-svg {
+    background-color: var(--specials_buttons-links-and-highlights);
+    width: 1.2rem;
+    height: 1.2rem;
+    border-radius: 50%;
+    display: flex;
+    margin-left: 5px; }
+    .file_wrapper .paper-clip-icon .action_notification-svg svg,
+    .multiple_file_wrapper .paper-clip-icon .action_notification-svg svg {
+      width: 0.8rem !important;
+      height: 0.8rem !important; }
 
 .multiple_file_wrapper {
   display: unset; }
@@ -6019,7 +6827,7 @@ table th {
   padding: 0 1rem;
   text-transform: uppercase;
   padding: 0 0.5rem;
-  font-size: 0.9rem;
+  font-size: 1rem;
   color: var(--labels_secondary-inactive-label-text-graphics);
   height: 22px;
   font-family: "Raleway Medium"; }
@@ -6066,7 +6874,7 @@ table th {
 .direction_ltr .dropdown-triangle:after {
   border-right: 0.25rem solid var(--labels_important-active-labels-text-graphics);
   border-left: 0.25rem solid transparent;
-  right: 0px; }
+  right: 3px; }
 
 .direction_ltr .placeholder {
   padding-right: 0.5rem; }
@@ -6109,7 +6917,7 @@ table th {
       color: var(--labels_important-active-labels-text-graphics); }
       .trade_input-wrapper .trade_input-input-wrapper > input:focus {
         outline: none;
-        border: 1.5px solid var(--calculated_secondary-border); }
+        border: 1.5px solid var(--specials_buttons-links-and-highlights); }
   .trade_input-wrapper .trade_input-input-currency {
     width: 2.5rem;
     height: 2.5rem;
@@ -6168,8 +6976,8 @@ table th {
   border-color: var(--specials_buttons-links-and-highlights); }
 
 .trade-form-select {
-  width: 35% !important;
-  transform: translateY(1.4rem); }
+  padding-bottom: 1.5rem;
+  font-size: 11px !important; }
 
 .ant-slider-mark-text {
   color: var(--labels_secondary-inactive-label-text-graphics);
@@ -6182,7 +6990,7 @@ table th {
 
 .exir-button {
   width: 100%;
-  font-size: 0.9rem;
+  font-size: 1rem;
   padding: 0 4px;
   background-color: var(--specials_buttons-links-and-highlights) !important; }
   .exir-button.button-success {
@@ -6196,17 +7004,26 @@ table th {
     border: none; }
 
 .checkbutton-wrapper {
-  font-size: 1rem;
-  margin-top: 1rem; }
-  .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--label {
-    margin: 0;
-    padding-left: 0.5rem; }
-  .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--image,
-  .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--loader {
-    width: 2rem; }
-  .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--image svg {
-    width: 2rem;
-    height: 2rem; }
+  font-size: 1.1rem;
+  display: flex;
+  justify-content: center;
+  align-items: center; }
+  .checkbutton-wrapper .checkbutton-input-wrapper {
+    width: 300px;
+    padding: 10px;
+    margin-top: 35px;
+    justify-content: center;
+    background-color: var(--specials_buttons-links-and-highlights); }
+    .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--label {
+      margin: 0;
+      padding-left: 0.5rem; }
+    .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--image,
+    .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--loader {
+      width: 2rem; }
+    .checkbutton-wrapper .checkbutton-input-wrapper .checkbutton-input-wrapper--image svg {
+      width: 2rem;
+      height: 2rem;
+      stroke: var(--calculated_base_footer_text); }
   .checkbutton-wrapper .checkbutton-content-wrapper {
     margin-left: 2rem; }
 
@@ -6274,6 +7091,9 @@ table th {
 .app-dialog .ReactModal__Overlay {
   z-index: 110 !important; }
 
+.app-dialog.full .ReactModal__Overlay {
+  background-color: var(--base_wallet-sidebar-and-popup) !important; }
+
 .app-dialog-flex .ReactModal__Overlay {
   z-index: 10000 !important; }
 
@@ -6289,14 +7109,14 @@ table th {
   right: 0 !important;
   min-width: 100vw;
   max-width: 100vw;
-  min-height: calc( 100vh - 4rem);
-  max-height: calc( 100vh - 4rem);
+  min-height: calc(
 100vh - 4rem);
+  max-height: calc(
 100vh - 4rem);
   border-radius: 0 !important;
   padding: 0 !important; }
   .layout-mobile .ReactModal__Content .dialog-mobile-content {
     padding: 2.5rem !important;
-    min-height: calc( 100vh - 8rem);
-    max-height: calc( 100vh - 8rem);
+    min-height: calc(
 100vh - 8rem);
+    max-height: calc(
 100vh - 8rem);
     display: flex; }
 
 .layout-mobile.LogoutModal .ReactModal__Content {
@@ -6339,7 +7159,7 @@ table th {
   font-size: 1.75rem; }
 
 .layout-mobile .accordion_wrapper .accordion_section .accordion_section_content {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .accordion_wrapper .action_notification-svg svg {
   width: 1.75rem !important;
@@ -6382,7 +7202,7 @@ table th {
 
 .accordion_wrapper .accordion_section {
   border-top: 1px solid var(--calculated_important-border);
-  font-size: 1.25rem;
+  font-size: 1.3rem;
   padding: 0; }
   .accordion_wrapper .accordion_section .action_notification-svg svg {
     width: 1rem;
@@ -6419,10 +7239,10 @@ table th {
   .accordion_wrapper .accordion_section:last-child {
     border-bottom: 1px solid var(--calculated_important-border); }
   .accordion_wrapper .accordion_section .accordion_section_content {
-    font-size: 0.9rem;
+    font-size: 1.1rem;
     padding: 0; }
   .accordion_wrapper .accordion_section .action_notification-wrapper {
-    top: calc(50% - 0.625rem);
+    top: calc(50% - 0.65rem);
     margin: 0 0.5rem; }
 
 .direction_ltr .accordion_wrapper .accordion_section .accordion_section_content_text.with_arrow:after {
@@ -6483,7 +7303,7 @@ table th {
   .action_notification-wrapper .relative {
     position: relative; }
   .action_notification-wrapper .action_notification-text {
-    font-size: 0.9rem;
+    font-size: 1rem;
     text-transform: uppercase; }
   .action_notification-wrapper .action_notification-image {
     width: 1rem;
@@ -6666,7 +7486,7 @@ table th {
     width: 5rem;
     height: 5rem; }
   .icon_title-wrapper .icon_title-text {
-    font-size: 1.25rem;
+    font-size: 1.3rem;
     margin: 1rem; }
     .icon_title-wrapper .icon_title-text.title {
       font-size: 3.5rem;
@@ -6698,7 +7518,7 @@ table th {
   position: relative; }
   .otp_form-title-wrapper .otp_form-title-text {
     font-weight: bold;
-    font-size: 1rem; }
+    font-size: 1.1rem; }
 
 .otp_form-fields {
   margin-bottom: 1rem; }
@@ -6945,6 +7765,26 @@ table th {
     background-color: var(--coin-dai);
     border: none !important;
     color: var(--coin-dai-text) !important; }
+  .currency_ball-wrapper.ama {
+    background-color: var(--coin-ama);
+    border: none !important;
+    color: var(--coin-ama-text) !important; }
+  .currency_ball-wrapper.xtz {
+    background-color: var(--coin-xtz);
+    border: none !important;
+    color: var(--coin-xtz-text) !important; }
+  .currency_ball-wrapper.doge {
+    background-color: var(--coin-doge);
+    border: none !important;
+    color: var(--coin-doge-text) !important; }
+  .currency_ball-wrapper.uni {
+    background-color: var(--coin-uni);
+    border: none !important;
+    color: var(--coin-uni-text) !important; }
+  .currency_ball-wrapper.dot {
+    background-color: var(--coin-dot);
+    border: none !important;
+    color: var(--coin-dot-text) !important; }
   .currency_ball-wrapper.s {
     font-size: 0.6rem;
     width: 1.8rem;
@@ -6966,8 +7806,8 @@ table th {
     margin-left: 0.5rem; }
   .with_price-block_amount .with_price-block_amount-value-eur {
     color: var(--labels_secondary-inactive-label-text-graphics);
-    font-size: 1.75rem;
-    line-height: 1.75rem; }
+    font-size: 1.8rem;
+    line-height: 1.8rem; }
 
 .direction_ltr .with_price-block_amount {
   justify-content: flex-start; }
@@ -6987,8 +7827,10 @@ table th {
     font-weight: bold; }
   .table-wrapper .table_header-wrapper {
     color: var(--labels_secondary-inactive-label-text-graphics); }
+    .table-wrapper .table_header-wrapper .action_notification-text {
+      white-space: nowrap; }
   .table-wrapper .table_body-wrapper {
-    font-size: 0.9rem; }
+    font-size: 1rem; }
     .table-wrapper .table_body-wrapper.with_icon tr td:first-child {
       border: none !important; }
     .table-wrapper .table_body-wrapper tr.table_body-row td {
@@ -7069,6 +7911,8 @@ table th {
   .display_table-wrapper .display_table-cell {
     min-height: 1.5rem;
     padding: 0.1rem; }
+  .display_table-wrapper .ant-select-arrow {
+    z-index: 1; }
 
 .f-1 {
   flex: 1; }
@@ -7077,9 +7921,9 @@ table th {
   x: 0;
   y: 0; }
   .ohlc_wrapper .ohlc_data_wrapper .ohlc_label {
-    font-size: 0.9rem; }
+    font-size: 1rem; }
   .ohlc_wrapper .ohlc_data_wrapper .ohlc_value {
-    font-size: 0.9rem;
+    font-size: 1rem;
     font-weight: bold;
     padding-left: 0.25rem; }
 
@@ -7458,19 +8302,43 @@ table th {
 foreignObject {
   overflow: visible; }
 
+.layout-mobile .donut-label-pair {
+  font-size: 1.4rem; }
+
+.layout-mobile .donut-label-percentage {
+  font-size: 1.2rem; }
+
+.layout-mobile .donut-label-link {
+  font-size: 1rem; }
+
 .input-group__container {
   border-radius: 4px;
-  border: var(--calculated_important-border) solid 1px; }
+  border: var(--labels_secondary-inactive-label-text-graphics) solid 1.5px; }
   .input-group__container .ant-select-selection,
   .input-group__container .ant-input,
   .input-group__container .ant-select-arrow,
   .input-group__container .ant-select-selector {
     text-align: right;
     background-color: var(--base_wallet-sidebar-and-popup) !important;
+    color: var(--labels_secondary-inactive-label-text-graphics) !important; }
+  .input-group__container .input-group__coin-icons-wrap {
+    width: 2.5rem; }
+  .input-group__container:focus-within {
+    border-color: var(--specials_buttons-links-and-highlights) !important; }
+  .input-group__container .input-group__select:hover {
     color: var(--labels_important-active-labels-text-graphics) !important; }
+    .input-group__container .input-group__select:hover .ant-select-selection,
+    .input-group__container .input-group__select:hover .ant-input,
+    .input-group__container .input-group__select:hover .ant-select-arrow,
+    .input-group__container .input-group__select:hover .ant-select-selector {
+      color: var(--labels_important-active-labels-text-graphics) !important; }
+    .input-group__container .input-group__select:hover .input-group__coin-icons {
+      width: 2.2rem; }
+  .input-group__container:hover {
+    border-color: var(--labels_important-active-labels-text-graphics); }
 
 .input-group__coin-icons {
-  width: 2rem;
+  width: 1.8rem;
   height: 100%; }
   .input-group__coin-icons svg {
     margin: 0 auto;
@@ -7551,7 +8419,7 @@ foreignObject {
     padding: 0 1rem;
     text-transform: uppercase;
     padding: 0 0.5rem;
-    font-size: 0.9rem;
+    font-size: 1rem;
     color: var(--labels_secondary-inactive-label-text-graphics);
     height: 22px;
     font-family: "Raleway Medium"; }
@@ -7608,7 +8476,7 @@ foreignObject {
   .quick_trade-wrapper .input_block-wrapper {
     margin-bottom: 0; }
   .quick_trade-wrapper .input_block-title {
-    font-size: 1.25rem;
+    font-size: 1.3rem;
     font-family: "Raleway Medium"; }
   .quick_trade-wrapper .input_block-content {
     border-bottom: 2px solid var(--calculated_important-border);
@@ -7619,7 +8487,7 @@ foreignObject {
       width: auto;
       position: relative; }
       .quick_trade-wrapper .input_block-content .input_block-input-wrapper .input_block-inputbox {
-        font-size: 1.75rem;
+        font-size: 1.8rem;
         margin: 0.5rem 1.5rem;
         border: none !important;
         border-radius: 0 !important;
@@ -7668,22 +8536,18 @@ foreignObject {
     width: 0;
     left: 100%; } }
 
-.layout-mobile .quick_trade-wrapper {
-  margin-top: 0;
-  margin-bottom: 0; }
-
 .layout-mobile .quick_trade-section_wrapper .toogle_button-wrapper .toogle-content {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .quick_trade-section_wrapper .input_block-wrapper .input_block-content .input_block-title {
-  font-size: 12px !important; }
+  font-size: 13px !important; }
 
 .layout-mobile .quick_trade-section_wrapper .input_block-wrapper .field-error-content {
   width: auto;
-  font-size: 10px; }
+  font-size: 11px; }
 
 .layout-mobile .quick_trade-section_wrapper .review-block-wrapper .input_block-title {
-  font-size: 12px; }
+  font-size: 13px; }
 
 .mobile_dropdown-section {
   border-top: solid; }
@@ -7722,7 +8586,7 @@ foreignObject {
     width: 100%; }
   .legal-content-wrapper .legal-subtitle,
   .legal-content-wrapper .legal-content {
-    font-size: 0.9rem; }
+    font-size: 1rem; }
 
 @media screen and (max-width: 767px) {
   .legal-container .legal-content-wrapper {
@@ -7876,7 +8740,7 @@ foreignObject {
     width: 2.5rem;
     height: 2.5rem; }
     .close-dialog svg .arrow-down {
-      stroke: white; }
+      stroke: var(--calculated_base_top-bar-navigation_text); }
 
 .dialog-compressed-close .close-dialog {
   margin-left: 0;
@@ -8198,14 +9062,14 @@ foreignObject {
   .layout-mobile .chat-wrapper .nondraggable {
     height: 100%; }
   .layout-mobile .chat-wrapper .timestamp {
-    font-size: 10px; }
+    font-size: 11px; }
   .layout-mobile .chat-wrapper .chat-message-list {
     width: 100% !important; }
     .layout-mobile .chat-wrapper .chat-message-list .chat-message .message-content .username {
       font-size: 1.5rem;
       width: 100%; }
     .layout-mobile .chat-wrapper .chat-message-list .chat-message .message-content .message {
-      font-size: 12px;
+      font-size: 13px;
       line-height: unset !important; }
     .layout-mobile .chat-wrapper .chat-message-list .chat-message .item-options .item-options-wrapper {
       min-width: 5rem;
@@ -8213,7 +9077,8 @@ foreignObject {
       right: 1.5rem;
       top: -0.5rem; }
   .layout-mobile .chat-wrapper .chat-footer {
-    padding: 0.5rem; }
+    padding: 0.5rem;
+    background-color: var(--labels_fields); }
     .layout-mobile .chat-wrapper .chat-footer .chat-message-box {
       min-height: 4rem;
       font-size: 1.5rem;
@@ -8223,9 +9088,9 @@ foreignObject {
       .layout-mobile .chat-wrapper .chat-footer .emoji-container .chat-category .emoji-close .cross-icon-back {
         width: 3rem; }
     .layout-mobile .chat-wrapper .chat-footer .chat-emoji-wrapper {
-      background-color: white; }
+      background-color: var(--labels_fields); }
       .layout-mobile .chat-wrapper .chat-footer .chat-emoji-wrapper .chat-emoji-icon svg .emoji-face-icon {
-        fill: #b6b4cc; }
+        fill: var(--labels_secondary-inactive-label-text-graphics); }
 
 .chat-wrapper {
   position: fixed;
@@ -8239,7 +9104,8 @@ foreignObject {
   -moz-box-shadow: 1px 0px 3px 0px rgba(0, 0, 0, 0.29);
   box-shadow: 1px 0px 3px 0px rgba(0, 0, 0, 0.29);
   font-family: 'Open Sans' !important;
-  border: 1px solid var(--calculated_important-border) !important; }
+  border: 1px solid var(--calculated_important-border) !important;
+  border-top: 2px solid var(--specials_buttons-links-and-highlights) !important; }
   .chat-wrapper .timestamp {
     color: #808080;
     font-size: 0.65rem;
@@ -8412,7 +9278,8 @@ foreignObject {
   .chat-wrapper .chat-footer {
     min-height: 3rem;
     width: 100%;
-    padding: 0; }
+    padding: 0;
+    background-color: var(--base_secondary-navigation-bar); }
     .chat-wrapper .chat-footer button {
       width: 100%; }
     .chat-wrapper .chat-footer .chat-message-box {
@@ -8638,6 +9505,10 @@ foreignObject {
 .trade_announcement {
   font-size: 1.5rem; }
 
+.announcement-notification-list-item {
+  color: var(--labels_important-active-labels-text-graphics);
+  border-bottom: 1px solid var(--calculated_secondary-border); }
+
 .post-content .notifications_list-item-text a {
   color: var(--specials_buttons-links-and-highlights); }
 
@@ -8645,9 +9516,12 @@ foreignObject {
 .post-content .notifications_list-item-text p {
   background-color: var(--base_wallet-sidebar-and-popup) !important; }
 
+.post-content .notifications_list-item-timestamp {
+  color: var(--labels_secondary-inactive-label-text-graphics); }
+
 .app_footer-container {
   border-top: 1px solid var(--calculated_footer_border);
-  font-size: 0.9rem;
+  font-size: 1rem;
   background-color: var(--base_footer);
   color: var(--calculated_base_footer_text); }
   .app_footer-container.deep-footer {
@@ -8656,42 +9530,41 @@ foreignObject {
     margin-bottom: 2rem;
     padding: 4rem 1rem 0;
     width: 100%; }
-    .app_footer-container .footer-row-content .footer-links-section {
-      width: 60%; }
-      .app_footer-container .footer-row-content .footer-links-section .footer-links-group {
-        margin: 0 1rem;
-        font-size: 1rem; }
-        .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--title {
-          font-weight: bold;
-          margin-bottom: 0.25rem;
-          text-transform: uppercase; }
-        .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list {
-          min-width: 8rem; }
-          .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list .social_icon {
-            width: 1rem;
-            margin-right: 0.25rem; }
-          .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list .link-section {
-            margin-top: 0.25rem; }
-            .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list .link-section:hover {
-              color: grey; }
+    .app_footer-container .footer-row-content .footer-links-section .footer-links-group {
+      margin: 1rem;
+      font-size: 1.1rem; }
+      .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--title {
+        font-weight: bold;
+        margin-bottom: 0.25rem;
+        text-transform: uppercase; }
+      .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list {
+        min-width: 8rem;
+        text-transform: capitalize; }
+        .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list .social_icon {
+          width: 1rem;
+          margin-right: 0.25rem; }
+        .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list .link-section {
+          margin-top: 0.25rem; }
+          .app_footer-container .footer-row-content .footer-links-section .footer-links-group .footer-links-section--list .link-section:hover {
+            color: grey; }
     .app_footer-container .footer-row-content .footer_separter {
-      border-left: 1px solid var(--calculated_footer_border); }
+      border-left: 1px solid var(--calculated_footer_border);
+      margin-left: 0.5rem; }
       .app_footer-container .footer-row-content .footer_separter .footer-txt {
-        width: 25rem;
-        margin-left: 1rem; }
+        width: 23rem;
+        margin-left: 1.5rem; }
       .app_footer-container .footer-row-content .footer_separter .footer-logo {
         background-size: contain;
-        background-position: center;
         background-repeat: no-repeat;
         height: 6rem !important;
-        margin-left: 1rem;
+        margin-left: 1.5rem;
         width: 7rem; }
       .app_footer-container .footer-row-content .footer_separter svg .hollaEX_logo_gray {
         fill: var(--calculated_base_footer_text); }
       .app_footer-container .footer-row-content .footer_separter .blue-link {
         color: #00aeef !important; }
     .app_footer-container .footer-row-content .footer-public-texts .footer-public-texts-text {
-      line-height: 1.8rem;
+      line-height: 2rem;
       font-weight: bold; }
     .app_footer-container .footer-row-content .footer-public-links {
       justify-content: flex-end;
@@ -8749,19 +9622,11 @@ foreignObject {
     .app_footer-container .footer-row-content .footer-public-links {
       justify-content: center; }
       .app_footer-container .footer-row-content .footer-public-links .footer-public-links-icon {
-        margin: 0 1.5rem !important; }
-    .app_footer-container .footer-row-content .footer-links-section {
-      width: 70%; } }
-
-@media screen and (min-width: 1920px) {
-  .app_footer-container .footer-row-content .footer-links-section {
-    width: 50%; } }
+        margin: 0 1.5rem !important; } }
 
 @media screen and (max-width: 767px) {
-  .app_footer-container .footer-row-content .footer-links-section {
-    width: 80%; }
   .app_footer-container .footer-row-content .footer_separter .footer-txt {
-    width: 30rem; } }
+    width: 12rem; } }
 
 .layout-mobile .app_footer-container .footer-row-content .footer-links-section {
   width: 100%; }
@@ -8781,7 +9646,7 @@ foreignObject {
       flex-direction: column;
       align-items: center; }
     .layout-mobile .app_footer-container .footer-row-content .footer-links-section .footer_separter .footer-txt {
-      width: 37rem; }
+      width: 100%; }
     .layout-mobile .app_footer-container .footer-row-content .footer-links-section .footer_separter .footer-logo {
       height: 3.5rem;
       margin-top: 11px;
@@ -8907,6 +9772,9 @@ foreignObject {
   font-size: 10px !important;
   text-decoration: none !important;
   font-weight: normal !important; }
+  .edit-wrapper__icon-wrapper.large {
+    width: 50px !important;
+    height: 50px !important; }
 
 .edit-wrapper__icon {
   position: relative;
@@ -8943,6 +9811,92 @@ foreignObject {
   .check-deposit-modal-wrapper .inner-content .verification_icon {
     width: 15px; }
 
+.app-menu-bar-side {
+  min-width: 18rem;
+  max-width: 18rem; }
+
+.direction_rtl .apply_rtl .app-menu-bar-side .side-bar-txt {
+  margin: 0 25px 0 0; }
+
+.app-side-bar .app-menu-bar-side {
+  background-color: var(--base_wallet-sidebar-and-popup);
+  border-right: 1px solid var(--calculated_secondary-border);
+  padding: 20px 16px 0 15px; }
+  .app-side-bar .app-menu-bar-side .app-menu-bar-icon {
+    width: 20px; }
+
+.app-side-bar .app-menu-bar-side_list {
+  height: 60px;
+  padding: 18px 17px;
+  cursor: pointer;
+  color: var(--labels_secondary-inactive-label-text-graphics) !important; }
+  .app-side-bar .app-menu-bar-side_list .side-bar-txt {
+    height: 24px;
+    margin: 0 0 0 14px;
+    font-size: 16px; }
+
+.app-side-bar .list_active,
+.app-side-bar .app-menu-bar-side_list:hover {
+  border-radius: 4px;
+  background-color: var(--calculated_secondary-border-1); }
+  .app-side-bar .list_active .side-bar-txt,
+  .app-side-bar .app-menu-bar-side_list:hover .side-bar-txt {
+    color: var(--calculated_base_top-bar-navigation_text) !important; }
+  .app-side-bar .list_active .tab-summary0,
+  .app-side-bar .list_active .tab-wallet0,
+  .app-side-bar .list_active .tab-security0,
+  .app-side-bar .list_active .tab-history0,
+  .app-side-bar .list_active .tab-verify0,
+  .app-side-bar .list_active .tab-setting0,
+  .app-side-bar .list_active .help-question,
+  .app-side-bar .list_active .tab-signout,
+  .app-side-bar .list_active .tab-history-st,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-summary0,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-wallet0,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-security0,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-history0,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-verify0,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-setting0,
+  .app-side-bar .app-menu-bar-side_list:hover .help-question,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-signout,
+  .app-side-bar .app-menu-bar-side_list:hover .tab-history-st {
+    fill: var(--calculated_base_top-bar-navigation_text) !important; }
+
+.app-side-bar .list_active {
+  background-color: var(--calculated_secondary-border) !important; }
+
+@media (max-width: 991px) {
+  .app-menu-bar-side {
+    padding: 20px 8px 0 8px !important;
+    min-width: 6rem !important;
+    max-width: 10rem !important; }
+    .app-menu-bar-side .app-menu-bar-icon {
+      width: 15px !important; }
+  .app-menu-bar-side_list,
+  .list_active,
+  .app-menu-bar-side_list:hover {
+    width: 100%;
+    padding: 0px 24px !important;
+    font-size: 12px !important; }
+  .app-menu-bar-side_list .side-bar-txt,
+  .app-menu-bar-side_list .side-bar-text-active,
+  .list_active .side-bar-txt,
+  .list_active .side-bar-text-active {
+    display: none !important; } }
+
+@media (min-width: 1920px) {
+  .app-menu-bar-side {
+    max-width: 26rem;
+    min-width: 26rem; } }
+
+@media (max-width: 1096px) {
+  .app-menu-bar-side {
+    min-width: 20rem;
+    max-width: 20rem; } }
+
+.layout-mobile .app-menu-bar-side {
+  display: none !important; }
+
 html {
   font-size: 12px !important;
   height: 100%; }
@@ -8954,7 +9908,7 @@ body {
   height: 100%;
   background-color: var(--base_background) !important;
   color: var(--labels_important-active-labels-text-graphics);
-  font-size: 1rem !important;
+  font-size: 1.1rem !important;
   font-family: "Open Sans" !important;
   height: 100%; }
 
@@ -9157,6 +10111,7 @@ svg .item-options,
 svg .check-order,
 svg .otp-inactive,
 svg .otp-active,
+svg .unknown-error-icon,
 svg .cancel-all {
   fill: var(--labels_important-active-labels-text-graphics); }
 
diff --git a/web/src/index.js b/web/src/index.js
index 92f99488cc..1763435669 100644
--- a/web/src/index.js
+++ b/web/src/index.js
@@ -1,4 +1,5 @@
-import 'babel-polyfill';
+import 'core-js/stable';
+import 'regenerator-runtime/runtime';
 import React from 'react';
 import { hash } from 'rsvp';
 import { Provider } from 'react-redux';
@@ -10,6 +11,7 @@ import ConfigProvider from 'components/ConfigProvider';
 import EditProvider from 'components/EditProvider';
 import defaultConfig from 'config/project.config';
 import './config/initialize';
+import { addElements, injectHTML } from 'utils/script';
 
 import 'flag-icon-css/css/flag-icon.min.css';
 import 'react-dates/initialize';
@@ -17,7 +19,7 @@ import 'react-dates/lib/css/_datepicker.css';
 import 'react-alice-carousel/lib/alice-carousel.css';
 
 import store from './store';
-import routes from './routes';
+import { generateRoutes } from './routes';
 import './index.css';
 import '../node_modules/rc-tooltip/assets/bootstrap_white.css'; // eslint-disable-line
 
@@ -33,7 +35,15 @@ import {
 } from 'utils/initialize';
 
 import { getKitData } from 'actions/operatorActions';
-import { requestConstant } from 'actions/appActions';
+import {
+	requestConstant,
+	setHomePageSetting,
+	setInjectedValues,
+	setInjectedHTML,
+	requestPlugins,
+	setWebViews,
+	setPlugins,
+} from 'actions/appActions';
 
 import { version, name } from '../package.json';
 import { API_URL } from './config/constants';
@@ -71,6 +81,9 @@ const getConfigs = async () => {
 		setup_completed,
 		native_currency,
 		logo_image,
+		features: { home_page = false } = {},
+		injected_values = [],
+		injected_html = {},
 	} = kitData;
 
 	kitData['sections'] = sections;
@@ -107,25 +120,44 @@ const getConfigs = async () => {
 	setValidLanguages(valid_languages);
 	setExchangeInitialized(initialized);
 	setSetupCompleted(setup_completed);
+	store.dispatch(setHomePageSetting(home_page));
+	store.dispatch(setInjectedValues(injected_values));
+	store.dispatch(setInjectedHTML(injected_html));
+
+	const { data = {} } = await requestPlugins();
+	if (data.data && data.data.length !== 0) {
+		store.dispatch(setPlugins(data.data));
+		store.dispatch(setWebViews(data.data));
+	}
 
-	return merge({}, defaultConfig, remoteConfigs, { coin_icons });
+	const appConfigs = merge({}, defaultConfig, remoteConfigs, { coin_icons });
+
+	return [appConfigs, injected_values, injected_html];
 };
 
-const bootstrapApp = (appConfig) => {
+const bootstrapApp = (appConfig, injected_values, injected_html) => {
 	const {
 		icons: {
 			dark: { EXCHANGE_FAV_ICON = '/favicon.ico' },
 		},
 	} = appConfig;
+	addElements(injected_values, 'head');
+	injectHTML(injected_html, 'head');
 	drawFavIcon(EXCHANGE_FAV_ICON);
 	initializeStrings();
 	// window.appConfig = { ...appConfig }
+	const {
+		app: { remoteRoutes },
+	} = store.getState();
 
 	render(
 		<Provider store={store}>
 			<EditProvider>
 				<ConfigProvider initialConfig={appConfig}>
-					<Router routes={routes} history={browserHistory} />
+					<Router
+						routes={generateRoutes(remoteRoutes)}
+						history={browserHistory}
+					/>
 				</ConfigProvider>
 			</EditProvider>
 		</Provider>,
@@ -133,9 +165,17 @@ const bootstrapApp = (appConfig) => {
 	);
 };
 
-getConfigs()
-	.then(bootstrapApp)
-	.catch((err) => console.error('Initialization failed!\n', err));
+const initialize = async () => {
+	try {
+		const [configs, injected_values, injected_html] = await getConfigs();
+		bootstrapApp(configs, injected_values, injected_html);
+	} catch (err) {
+		console.error('Initialization failed!\n', err);
+		setTimeout(initialize, 3000);
+	}
+};
+
+initialize().then(() => console.info('Successfully Initialized'));
 
 // import registerServiceWorker from './registerServiceWorker'
 // registerServiceWorker();
diff --git a/web/src/index.scss b/web/src/index.scss
index 9d2c026c01..789a934e27 100644
--- a/web/src/index.scss
+++ b/web/src/index.scss
@@ -277,6 +277,7 @@ svg {
 	.check-order,
 	.otp-inactive,
 	.otp-active,
+	.unknown-error-icon,
 	.cancel-all {
 		fill: $colors-main-black;
 	}
diff --git a/web/src/reducers/appReducer.js b/web/src/reducers/appReducer.js
index d84d5059da..d0d571a007 100644
--- a/web/src/reducers/appReducer.js
+++ b/web/src/reducers/appReducer.js
@@ -26,13 +26,20 @@ import {
 	SET_CONFIG_LEVEL,
 	ADD_TO_FAVOURITES,
 	REMOVE_FROM_FAVOURITES,
+	CHANGE_HOME_PAGE_SETTING,
 	SET_IS_READY,
+	SET_WEB_VIEWS,
+	SET_INJECTED_VALUES,
+	SET_INJECTED_HTML,
 } from '../actions/appActions';
 import { THEME_DEFAULT } from '../config/constants';
 import { getLanguage } from '../utils/string';
 import { getTheme } from '../utils/theme';
 import { unique } from 'utils/data';
 import { getFavourites, setFavourites } from 'utils/favourites';
+import { generateRemoteRouteStringId } from 'utils/string';
+import { generateRemoteRouteIconId } from 'utils/icon';
+// import { PLUGINS } from 'utils/plugin';
 
 const EMPTY_NOTIFICATION = {
 	type: '',
@@ -52,6 +59,7 @@ const EMPTY_SNACK_NOTIFICATION = {
 };
 
 const INITIAL_STATE = {
+	home_page: false,
 	isReady: false,
 	favourites: getFavourites() || [],
 	announcements: [],
@@ -143,9 +151,14 @@ const INITIAL_STATE = {
 	info: { is_trial: false, active: true, status: true },
 	wave: [],
 	enabledPlugins: [],
+	targets: [],
+	webViews: {},
+	remoteRoutes: [],
 	availablePlugins: [],
 	getPluginLoading: false,
 	features: {},
+	injected_values: [],
+	injected_html: {},
 };
 
 const reducer = (state = INITIAL_STATE, { type, payload = {} }) => {
@@ -350,6 +363,44 @@ const reducer = (state = INITIAL_STATE, { type, payload = {} }) => {
 				enabledPlugins: payload.enabledPlugins.map(({ name }) => name),
 			};
 		}
+		case SET_WEB_VIEWS: {
+			const allWebViews = [];
+			payload.enabledPlugins.forEach(({ web_view = [] }) => {
+				if (web_view && web_view.length) {
+					allWebViews.push(...web_view);
+				}
+			});
+
+			const remoteRoutes = [];
+			allWebViews.forEach(({ target, meta }) => {
+				if (meta && meta.is_page) {
+					const { icon_id, string_id, ...rest } = meta;
+					remoteRoutes.push({
+						target,
+						icon_id: generateRemoteRouteIconId(icon_id),
+						string_id: generateRemoteRouteStringId(string_id),
+						...rest,
+					});
+				}
+			});
+
+			const CLUSTERED_WEB_VIEWS = {};
+			allWebViews.forEach((plugin) => {
+				const { target } = plugin;
+				if (!CLUSTERED_WEB_VIEWS[target]) {
+					CLUSTERED_WEB_VIEWS[target] = [plugin];
+				} else {
+					CLUSTERED_WEB_VIEWS[target].push(plugin);
+				}
+			});
+
+			return {
+				...state,
+				webViews: CLUSTERED_WEB_VIEWS,
+				targets: Object.entries(CLUSTERED_WEB_VIEWS).map(([target]) => target),
+				remoteRoutes,
+			};
+		}
 		case SET_INFO:
 			return {
 				...state,
@@ -398,6 +449,24 @@ const reducer = (state = INITIAL_STATE, { type, payload = {} }) => {
 				favourites,
 			};
 		}
+		case CHANGE_HOME_PAGE_SETTING: {
+			return {
+				...state,
+				home_page: payload,
+			};
+		}
+		case SET_INJECTED_VALUES: {
+			return {
+				...state,
+				injected_values: payload,
+			};
+		}
+		case SET_INJECTED_HTML: {
+			return {
+				...state,
+				injected_html: payload,
+			};
+		}
 		default:
 			return state;
 	}
diff --git a/web/src/reducers/userReducer.js b/web/src/reducers/userReducer.js
index ff6524422f..d319c0d876 100644
--- a/web/src/reducers/userReducer.js
+++ b/web/src/reducers/userReducer.js
@@ -75,7 +75,7 @@ const INITIAL_STATE = {
 	balance: {
 		timestamp: Date.now(),
 	},
-	crypto_wallet: {},
+	wallet: [],
 	userData: {
 		timestamp: Date.now(),
 	},
@@ -133,7 +133,7 @@ export default function reducer(state = INITIAL_STATE, action) {
 				email,
 				email_verified,
 				balance,
-				crypto_wallet,
+				wallet,
 				verification_level,
 				otp_enabled,
 				username,
@@ -167,7 +167,7 @@ export default function reducer(state = INITIAL_STATE, action) {
 					...balance,
 					timestamp: Date.now(),
 				},
-				crypto_wallet,
+				wallet,
 				verification_level,
 				userData,
 				otp_enabled,
@@ -417,13 +417,11 @@ export default function reducer(state = INITIAL_STATE, action) {
 				},
 			};
 		case 'CREATE_ADDRESS_FULFILLED':
-			const { address, crypto } = action.payload.data;
-			const { crypto_wallet } = state;
-			// crypto_wallet[getCurrencyFromSymbol(crypto)] = address;
-			crypto_wallet[crypto] = address;
+			const { address, crypto: currency, network = null } = action.payload.data;
+			const { wallet } = state;
 			return {
 				...state,
-				crypto_wallet,
+				wallet: [...wallet, { currency, address, network }],
 				addressRequest: {
 					...INITIAL_ADDRESS_OBJECT,
 					success: true,
diff --git a/web/src/reducers/walletReducer.js b/web/src/reducers/walletReducer.js
index 9cf957b0bb..0155d26ee3 100644
--- a/web/src/reducers/walletReducer.js
+++ b/web/src/reducers/walletReducer.js
@@ -40,6 +40,7 @@ const INITIAL_STATE = {
 	latestUserTrades: [],
 	deposits: INITIAL_API_OBJECT,
 	withdrawals: INITIAL_API_OBJECT,
+	logins: INITIAL_API_OBJECT,
 	depositVerification: INITIAL_VERIFICATION_OBJECT,
 	btcFee: INITIAL_BTC_WHITDRAWALS_FEE,
 	withdrawalCancelData: INITIAL_DELETE_WHITDRAWALS_MSG,
@@ -123,10 +124,12 @@ export default function reducer(state = INITIAL_STATE, { type, payload }) {
 		case ACTION_KEYS.ADD_USER_TRADES: {
 			// check if we have trades from DB
 			const tradesData = joinData(payload.trades, state.trades.data);
+			const newCount = state.trades.count + payload.trades.length;
 			return {
 				...state,
 				trades: {
-					count: tradesData.length,
+					...state.trades,
+					count: newCount,
 					data: tradesData,
 				},
 				latestUserTrades: tradesData.slice(0, 10),
@@ -269,6 +272,42 @@ export default function reducer(state = INITIAL_STATE, { type, payload }) {
 					loading: true,
 				},
 			};
+		// USER_LOGINS
+		case ACTION_KEYS.USER_LOGINS_PENDING: {
+			const { page = 1 } = payload;
+			const data = page > 1 ? state.logins.data : INITIAL_API_OBJECT.data;
+			return {
+				...state,
+				logins: {
+					...INITIAL_API_OBJECT,
+					loading: true,
+					data,
+				},
+			};
+		}
+		case ACTION_KEYS.USER_LOGINS_REJECTED:
+			return {
+				...state,
+				logins: {
+					...INITIAL_API_OBJECT,
+					loading: false,
+					fetched: true,
+					error: payload,
+				},
+			};
+		case ACTION_KEYS.USER_LOGINS_FULFILLED:
+			return {
+				...state,
+				logins: {
+					...INITIAL_API_OBJECT,
+					loading: false,
+					fetched: true,
+					count: payload.count,
+					page: payload.page,
+					isRemaining: payload.isRemaining,
+					data: joinData(state.logins.data, payload.data),
+				},
+			};
 		case ACTION_KEYS.USER_WITHDRAWALS_BTC_FEE_FULFILLED:
 			return {
 				...state,
diff --git a/web/src/remote-component.config.js b/web/src/remote-component.config.js
new file mode 100644
index 0000000000..44439fa852
--- /dev/null
+++ b/web/src/remote-component.config.js
@@ -0,0 +1,15 @@
+/**
+ * Dependencies for Remote Components
+ */
+module.exports = {
+	resolve: {
+		react: require('react'),
+		classnames: require('classnames'),
+		'prop-types': require('prop-types'),
+		'react-svg': require('react-svg'),
+		'react-device-detect': require('react-device-detect'),
+		'react-redux': require('react-redux'),
+		'redux-form': require('redux-form'),
+		redux: require('redux'),
+	},
+};
diff --git a/web/src/routes.js b/web/src/routes.js
index 7660231966..918654991d 100644
--- a/web/src/routes.js
+++ b/web/src/routes.js
@@ -1,10 +1,8 @@
-import React from 'react';
+import React, { Fragment } from 'react';
 import { Router, Route, browserHistory } from 'react-router';
 import ReactGA from 'react-ga';
 import { isMobile } from 'react-device-detect';
 
-import { DISPLAY_LANDING } from './config/constants';
-
 import {
 	App as Container,
 	Account,
@@ -59,6 +57,7 @@ import chat from './containers/Admin/Chat';
 import store from './store';
 import { verifyToken } from './actions/authAction';
 import { setLanguage } from './actions/appActions';
+import { SmartTarget } from 'components';
 
 import {
 	isLoggedIn,
@@ -170,7 +169,7 @@ function loggedIn(nextState, replace) {
 }
 
 const checkLanding = (nextState, replace) => {
-	if (!DISPLAY_LANDING) {
+	if (!store.getState().app.home_page) {
 		replace({
 			pathname: '/login',
 		});
@@ -223,208 +222,231 @@ function withAdminProps(Component, key) {
 	};
 }
 
-export default (
-	<Router history={browserHistory}>
-		<Route path="/" name="Home" component={Home} onEnter={checkLanding} />
-		<Route path="lang/:locale" component={createLocalizedRoutes} />
-		<Route component={AuthContainer} {...noAuthRoutesCommonProps}>
-			{isMobile ? (
-				<Route
-					path="/"
-					name="Login"
-					component={Login}
-					{...noAuthRoutesCommonProps}
-				/>
-			) : null}
-			<Route path="login" name="Login" component={Login} />
-			<Route path="signup" name="signup" component={Signup} />
-		</Route>
-		<Route component={AuthContainer} {...noLoggedUserCommonProps}>
-			<Route
-				path="reset-password"
-				name="Reset Password Request"
-				component={RequestResetPassword}
-			/>
-			<Route
-				path="reset-password/:code"
-				name="Reset Password"
-				component={ResetPassword}
-			/>
-			<Route path="verify" name="Verify" component={VerificationEmailRequest} />
-			<Route
-				path="verify/:code"
-				name="verifyCode"
-				component={VerificationEmailCode}
-			/>
-		</Route>
-		<Route component={Container}>
-			{isMobile ? (
+function generateRemoteRoutes(remoteRoutes) {
+	return (
+		<Fragment>
+			{remoteRoutes.map(({ path, name, target }, index) => (
 				<Route
-					path="/home"
-					name="Home"
-					component={MobileHome}
+					key={`${name}_remote-route_${index}`}
+					path={path}
+					name={name}
+					component={() => (
+						<div>
+							<SmartTarget id={target} />
+						</div>
+					)}
 					onEnter={requireAuth}
 				/>
-			) : null}
-			<Route
-				path="account"
-				name="Account"
-				component={Account}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="account/settings/username"
-				name="username"
-				component={Account}
-			/>
-			<Route
-				path="security"
-				name="Security"
-				component={Account}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="developers"
-				name="Developers"
-				component={Account}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="settings"
-				name="Settings"
-				component={Account}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="summary"
-				name="Summary"
-				component={Account}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="verification"
-				name="Verification"
-				component={Account}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="wallet"
-				name="Wallet"
-				component={MainWallet}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="wallet/:currency"
-				name="Wallet"
-				component={CurrencyWallet}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="wallet/:currency/deposit"
-				name="Deposit"
-				component={Deposit}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="wallet/:currency/withdraw"
-				name="Withdraw"
-				component={Withdraw}
-				onEnter={requireAuth}
-			/>
-			<Route
-				path="transactions"
-				name="Transactions"
-				component={TransactionsHistory}
-				onEnter={requireAuth}
-			/>
-			<Route path="trade/:pair" name="Trade" component={Trade} />
-			<Route path="trade/add/tabs" name="Trade Tabs" component={AddTradeTabs} />
-			<Route
-				path="quick-trade/:pair"
-				name="Quick Trade"
-				component={QuickTrade}
-			/>
-			<Route path="chat" name="Chat" component={Chat} onEnter={requireAuth} />
-			<Route
-				path="confirm-withdraw/:token"
-				name="ConfirmWithdraw"
-				component={WithdrawConfirmation}
-			/>
-			<Route path="logout" name="LogOut" onEnter={setLogout} />
-		</Route>
-		<Route component={AdminContainer}>
-			<Route path="/admin" name="Admin Main" component={AdminDashboard} />
-			<Route
-				path="/admin/general"
-				name="Admin General"
-				component={withAdminProps(General, 'general')}
-			/>
-			<Route
-				path="/admin/tiers"
-				name="Admin Tiers"
-				component={withAdminProps(Tiers, 'tiers')}
-			/>
-			<Route
-				path="/admin/roles"
-				name="Admin Roles"
-				component={withAdminProps(Roles, 'roles')}
-			/>
-			<Route
-				path="/admin/user"
-				name="Admin User"
-				component={withAdminProps(User, 'user')}
-			/>
-			<Route
-				path="/admin/financials"
-				name="Admin Financials"
-				component={withAdminProps(AdminFinancials, 'financials')}
-			/>
-			<Route
-				path="/admin/trade"
-				name="Admin Trade"
-				component={withAdminProps(MoveToDash, 'trade')}
-			/>
-			<Route
-				path="/admin/hosting"
-				name="Admin Hosting"
-				component={withAdminProps(MoveToDash, 'hosting')}
-			/>
-			<Route
-				path="/admin/apikeys"
-				name="Admin APIkeys"
-				component={withAdminProps(MoveToDash, 'apikeys')}
-			/>
-			<Route
-				path="/admin/billing"
-				name="Admin Billing"
-				component={withAdminProps(MoveToDash, 'billing')}
-			/>
-			<Route
-				path="/admin/chat"
-				name="Admin Chat"
-				component={withAdminProps(chat, 'chat')}
-			/>
-			<Route
-				path="/admin/collateral"
-				name="Admin Collateral"
-				component={withAdminProps(MoveToDash, 'collateral')}
-			/>
-			{/* <Route
+			))}
+		</Fragment>
+	);
+}
+
+export const generateRoutes = (routes = []) => {
+	const remoteRoutes = generateRemoteRoutes(routes);
+	return (
+		<Router history={browserHistory}>
+			<Route path="lang/:locale" component={createLocalizedRoutes} />
+			<Route component={AuthContainer} {...noAuthRoutesCommonProps}>
+				<Route path="login" name="Login" component={Login} />
+				<Route path="signup" name="signup" component={Signup} />
+			</Route>
+			<Route component={AuthContainer} {...noLoggedUserCommonProps}>
+				<Route
+					path="reset-password"
+					name="Reset Password Request"
+					component={RequestResetPassword}
+				/>
+				<Route
+					path="reset-password/:code"
+					name="Reset Password"
+					component={ResetPassword}
+				/>
+				<Route
+					path="verify"
+					name="Verify"
+					component={VerificationEmailRequest}
+				/>
+				<Route
+					path="verify/:code"
+					name="verifyCode"
+					component={VerificationEmailCode}
+				/>
+			</Route>
+			<Route component={Container}>
+				<Route path="/" name="Home" component={Home} onEnter={checkLanding} />
+				{isMobile ? (
+					<Route
+						path="/home"
+						name="Home"
+						component={MobileHome}
+						onEnter={requireAuth}
+					/>
+				) : null}
+				<Route
+					path="account"
+					name="Account"
+					component={Account}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="account/settings/username"
+					name="username"
+					component={Account}
+				/>
+				<Route
+					path="security"
+					name="Security"
+					component={Account}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="developers"
+					name="Developers"
+					component={Account}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="settings"
+					name="Settings"
+					component={Account}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="summary"
+					name="Summary"
+					component={Account}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="verification"
+					name="Verification"
+					component={Account}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="wallet"
+					name="Wallet"
+					component={MainWallet}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="wallet/:currency"
+					name="Wallet"
+					component={CurrencyWallet}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="wallet/:currency/deposit"
+					name="Deposit"
+					component={Deposit}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="wallet/:currency/withdraw"
+					name="Withdraw"
+					component={Withdraw}
+					onEnter={requireAuth}
+				/>
+				<Route
+					path="transactions"
+					name="Transactions"
+					component={TransactionsHistory}
+					onEnter={requireAuth}
+				/>
+				<Route path="trade/:pair" name="Trade" component={Trade} />
+				<Route
+					path="trade/add/tabs"
+					name="Trade Tabs"
+					component={AddTradeTabs}
+				/>
+				<Route
+					path="quick-trade/:pair"
+					name="Quick Trade"
+					component={QuickTrade}
+				/>
+				<Route path="chat" name="Chat" component={Chat} onEnter={requireAuth} />
+				<Route
+					path="confirm-withdraw/:token"
+					name="ConfirmWithdraw"
+					component={WithdrawConfirmation}
+				/>
+				<Route path="logout" name="LogOut" onEnter={setLogout} />
+				{remoteRoutes}
+			</Route>
+			<Route component={AdminContainer}>
+				<Route path="/admin" name="Admin Main" component={AdminDashboard} />
+				<Route
+					path="/admin/general"
+					name="Admin General"
+					component={withAdminProps(General, 'general')}
+				/>
+				<Route
+					path="/admin/tiers"
+					name="Admin Tiers"
+					component={withAdminProps(Tiers, 'tiers')}
+				/>
+				<Route
+					path="/admin/roles"
+					name="Admin Roles"
+					component={withAdminProps(Roles, 'roles')}
+				/>
+				<Route
+					path="/admin/user"
+					name="Admin User"
+					component={withAdminProps(User, 'user')}
+				/>
+				<Route
+					path="/admin/financials"
+					name="Admin Financials"
+					component={withAdminProps(AdminFinancials, 'financials')}
+				/>
+				<Route
+					path="/admin/trade"
+					name="Admin Trade"
+					component={withAdminProps(MoveToDash, 'trade')}
+				/>
+				<Route
+					path="/admin/hosting"
+					name="Admin Hosting"
+					component={withAdminProps(MoveToDash, 'hosting')}
+				/>
+				<Route
+					path="/admin/apikeys"
+					name="Admin APIkeys"
+					component={withAdminProps(MoveToDash, 'apikeys')}
+				/>
+				<Route
+					path="/admin/billing"
+					name="Admin Billing"
+					component={withAdminProps(MoveToDash, 'billing')}
+				/>
+				<Route
+					path="/admin/chat"
+					name="Admin Chat"
+					component={withAdminProps(chat, 'chat')}
+				/>
+				<Route
+					path="/admin/collateral"
+					name="Admin Collateral"
+					component={withAdminProps(MoveToDash, 'collateral')}
+				/>
+				{/* <Route
 				path="/admin/wallets"
 				name="Admin Wallets"
 				component={withAdminProps(Wallets, 'wallets')}
 			/> */}
-			{/* <Route
+				{/* <Route
 				path="/admin/transfer"
 				name="Admin Transfer"
 				component={withAdminProps(Transfer, 'transfer')}
 			/> */}
-			<Route
-				path="/admin/fees"
-				name="Admin Fees"
-				component={withAdminProps(AdminFees, 'fees')}
-			/>
-			{/* <Route
+				<Route
+					path="/admin/fees"
+					name="Admin Fees"
+					component={withAdminProps(AdminFees, 'fees')}
+				/>
+				{/* <Route
 				path="/admin/withdrawals"
 				name="Admin Withdrawals"
 				component={withAdminProps(DepositsPage, 'withdrawal')}
@@ -434,61 +456,62 @@ export default (
 				name="Admin Deposits"
 				component={withAdminProps(DepositsPage, 'deposit')}
 			/> */}
-			<Route
-				path="/admin/pair"
-				name="Admin Pairs"
-				component={withAdminProps(UserFees, 'pair')}
-			/>
-			<Route
-				path="/admin/coin"
-				name="Admin Coins"
-				component={withAdminProps(Limits, 'coin')}
-			/>
-			<Route
-				path="/admin/activeorders"
-				name="Admin Orders"
-				component={withAdminProps(AdminOrders, 'orders')}
-			/>
-			<Route
-				path="/admin/broker"
-				name="Admin broker"
-				component={withAdminProps(Broker, 'broker')}
-			/>
-			<Route
-				path="/admin/plugins"
-				name="Admin plugins"
-				component={withAdminProps(Plugins, 'plugins')}
-			/>
-			{/* <Route
+				<Route
+					path="/admin/pair"
+					name="Admin Pairs"
+					component={withAdminProps(UserFees, 'pair')}
+				/>
+				<Route
+					path="/admin/coin"
+					name="Admin Coins"
+					component={withAdminProps(Limits, 'coin')}
+				/>
+				<Route
+					path="/admin/activeorders"
+					name="Admin Orders"
+					component={withAdminProps(AdminOrders, 'orders')}
+				/>
+				<Route
+					path="/admin/broker"
+					name="Admin broker"
+					component={withAdminProps(Broker, 'broker')}
+				/>
+				<Route
+					path="/admin/plugins"
+					name="Admin plugins"
+					component={withAdminProps(Plugins, 'plugins')}
+				/>
+				{/* <Route
 				path="/admin/plugins/:services"
 				name="Admin plugins"
 				component={withAdminProps(PluginServices, 'plugins')}
 			/> */}
+				<Route
+					path="/admin/settings"
+					name="Admin settings"
+					component={withAdminProps(Settings, 'settings')}
+				/>
+				<Route
+					path="/admin/resources"
+					name="Admin resources"
+					component={withAdminProps(Resources, 'resources')}
+				/>
+			</Route>
 			<Route
-				path="/admin/settings"
-				name="Admin settings"
-				component={withAdminProps(Settings, 'settings')}
+				path="privacy-policy"
+				component={Legal}
+				content="legal"
+				onEnter={requireAuth}
 			/>
 			<Route
-				path="/admin/resources"
-				name="Admin resources"
-				component={withAdminProps(Resources, 'resources')}
+				path="general-terms"
+				component={Legal}
+				content="terms"
+				onEnter={requireAuth}
 			/>
-		</Route>
-		<Route
-			path="privacy-policy"
-			component={Legal}
-			content="legal"
-			onEnter={requireAuth}
-		/>
-		<Route
-			path="general-terms"
-			component={Legal}
-			content="terms"
-			onEnter={requireAuth}
-		/>
-		<Route path="admin-login" name="admin-login" component={AdminLogin} />
-		<Route path="init" name="initWizard" component={Init} />
-		<Route path="*" component={NotFound} />
-	</Router>
-);
+			<Route path="admin-login" name="admin-login" component={AdminLogin} />
+			<Route path="init" name="initWizard" component={Init} />
+			<Route path="*" component={NotFound} />
+		</Router>
+	);
+};
diff --git a/web/src/utils/color.js b/web/src/utils/color.js
index f6f7d12dd2..b8322fc8a1 100644
--- a/web/src/utils/color.js
+++ b/web/src/utils/color.js
@@ -32,6 +32,11 @@ const pushCalculatedColors = (themeData) => {
 		)
 			.alpha(0.33)
 			.string(),
+		'calculated_secondary-border-1': Color(
+			themeData['labels_important-active-labels-text-graphics']
+		)
+			.alpha(0.15)
+			.string(),
 		'calculated_super-pale_label-text-graphics': Color(
 			themeData['labels_important-active-labels-text-graphics']
 		)
@@ -60,6 +65,36 @@ const pushCalculatedColors = (themeData) => {
 		)
 			.alpha(0.12)
 			.string(),
+		'calculated_trading_buying-orderbook-best-bar': Color(
+			themeData['trading_buying-related-elements']
+		)
+			.alpha(0.55)
+			.string(),
+		'calculated_trading_selling-orderbook-best-bar': Color(
+			themeData['trading_selling-related-elements']
+		)
+			.alpha(0.55)
+			.string(),
+		'calculated_trading_buying-orderbook-hover': Color(
+			themeData['trading_buying-related-elements']
+		)
+			.alpha(0.65)
+			.string(),
+		'calculated_trading_selling-orderbook-hover': Color(
+			themeData['trading_selling-related-elements']
+		)
+			.alpha(0.65)
+			.string(),
+		'calculated_trading-orderbook-text': Color(
+			themeData['labels_important-active-labels-text-graphics']
+		)
+			.alpha(0.8)
+			.string(),
+		'calculated_trading-orderbook-secondary-text': Color(
+			themeData['labels_important-active-labels-text-graphics']
+		)
+			.alpha(0.5)
+			.string(),
 		'calculated_trading_buying-related-text': Color(
 			themeData['trading_buying-related-elements']
 		).isLight()
@@ -73,6 +108,14 @@ const pushCalculatedColors = (themeData) => {
 		'calculated_base_modal-overlay': Color(themeData['base_background'])
 			.alpha(0.75)
 			.string(),
+		calculated_landing_background: Color(themeData['base_background'])
+			.alpha(0)
+			.string(),
+		calculated_landing_markets_table: Color(
+			themeData['base_wallet-sidebar-and-popup']
+		)
+			.alpha(0.94)
+			.string(),
 		'calculated_specials_highlight-box': Color(
 			themeData['specials_buttons-links-and-highlights']
 		)
diff --git a/web/src/utils/icon.js b/web/src/utils/icon.js
index ec7964cb7b..c03fbc630e 100644
--- a/web/src/utils/icon.js
+++ b/web/src/utils/icon.js
@@ -82,3 +82,7 @@ export const getAllIconsArray = (themeKeys, content = defaultIcons) => {
 
 	return allIcons;
 };
+
+export const generateRemoteRouteIconId = (id = '') => {
+	return `REMOTE_ROUTE_ICON__${id.toUpperCase()}`;
+};
diff --git a/web/src/utils/math.js b/web/src/utils/math.js
index 50e620b003..cd4aaafefd 100644
--- a/web/src/utils/math.js
+++ b/web/src/utils/math.js
@@ -1,6 +1,11 @@
+import math from 'mathjs';
+
 export const calcPercentage = (partialValue, totalValue, precision = 2) => {
-	let percentage = (totalValue ? partialValue / totalValue : 0) * 100;
-	percentage = Math.min(percentage, 100);
-	percentage = Math.max(percentage, 0);
+	let percentage = 0;
+	if (totalValue) {
+		percentage = math.multiply(math.divide(partialValue, totalValue), 100);
+	}
+	percentage = math.min(percentage, 100);
+	percentage = math.max(percentage, 0);
 	return percentage.toFixed(precision);
 };
diff --git a/web/src/utils/plugin.js b/web/src/utils/plugin.js
new file mode 100644
index 0000000000..f58654df1f
--- /dev/null
+++ b/web/src/utils/plugin.js
@@ -0,0 +1,44 @@
+import { render } from 'react-dom';
+
+// This is to test remote plugins injection
+/*export const PLUGINS = [
+	{
+		target: 'REMOTE_COMPONENT__BANK_VERIFICATION_HOME',
+		src: '/bank_verification_home.js',
+		props: [
+			{ key: 'user', store_key: 'user' },
+			{ key: 'handleBack', store_key: 'handleBack' },
+			{ key: 'setActivePageContent', store_key: 'setActivePageContent' },
+			{ key: 'icons', store_key: 'icons' },
+			{ key: 'MAX_NUMBER_BANKS', store_key: 'MAX_NUMBER_BANKS' },
+		],
+	},
+	{
+		target: 'REMOTE_COMPONENT__BANK_VERIFICATION',
+		src: '/bank_verification.js',
+		props: [
+			{ key: 'user', store_key: 'user' },
+			{ key: 'openContactForm', store_key: 'openContactForm' },
+			{ key: 'setActivePageContent', store_key: 'setActivePageContent' },
+			{ key: 'handleBack', store_key: 'handleBack' },
+			{ key: 'moveToNextStep', store_key: 'moveToNextStep' },
+			{ key: 'icons', store_key: 'icons' },
+			{ key: 'verifyBankData', store_key: 'verifyBankData' },
+			{ key: 'getErrorLocalized', store_key: 'getErrorLocalized' },
+			{ key: 'maxLength', store_key: 'maxLength' },
+			{ key: 'required', store_key: 'required' },
+		],
+	},
+];*/
+
+export const injectPlugin = (component, targetId) => {
+	const targetElement = document.getElementById(targetId);
+	if (targetElement) {
+		render(component, targetElement);
+		console.info(
+			`Remote component successfully injected into DOM element ${targetId}`
+		);
+	} else {
+		console.error(`There is no DOM element with the id ${targetId}`);
+	}
+};
diff --git a/web/src/utils/script.js b/web/src/utils/script.js
new file mode 100644
index 0000000000..9e4bb65ed8
--- /dev/null
+++ b/web/src/utils/script.js
@@ -0,0 +1,84 @@
+const createElement = (tag, attributes) => {
+	const element = document.createElement(tag);
+
+	Object.entries(attributes).forEach(([key, value]) => {
+		element[key] = value;
+	});
+
+	return element;
+};
+
+const injectElement = (element, target) => {
+	if (document && document[target]) {
+		document[target].appendChild(element);
+	} else {
+		console.error(`Failed to inject element ${element} into ${target}`);
+	}
+};
+
+const addElement = (tag, attributes, target) => {
+	const element = createElement(tag, attributes);
+	injectElement(element, target);
+};
+
+const filterElementsByTarget = (elements, filter) => {
+	return elements.filter(({ target }) => !filter || target === filter);
+};
+
+export const addElements = (elements = [], targetFilter) => {
+	const filteredElements = filterElementsByTarget(elements, targetFilter);
+	filteredElements.forEach(({ tag, attributes, target }) => {
+		addElement(tag, attributes, target);
+	});
+};
+
+/*HTML INJECTION*/
+
+const extractAttributes = (node) => {
+	if (node && node.tagName) {
+		const tag = node.tagName.toLowerCase();
+		const attributes = {};
+		Array.from(node.attributes).forEach(({ name, value }) => {
+			if (node.hasAttributes() && node.hasAttribute(name)) {
+				attributes[name] = value;
+			}
+		});
+
+		if (tag === 'script' && node.innerHTML) {
+			attributes['text'] = node.innerHTML;
+		} else if (node.innerHTML) {
+			attributes['innerHTML'] = node.innerHTML;
+		}
+
+		return [tag, attributes];
+	}
+	return [];
+};
+
+const stringToHTML = (string) => {
+	const dom = document.createElement('div');
+	dom.innerHTML = string;
+	return dom;
+};
+
+export const injectHTML = (injected_html = {}, target) => {
+	try {
+		const string = injected_html && injected_html[target];
+		if (string) {
+			const html = stringToHTML(string);
+			const nodeList = html.childNodes;
+
+			const elements = [];
+			Array.from(nodeList).forEach((node) => {
+				const [tag, attributes] = extractAttributes(node);
+				if (tag && attributes) {
+					elements.push({ target, tag, attributes });
+				}
+			});
+
+			addElements(elements, target);
+		}
+	} catch (err) {
+		console.error(err);
+	}
+};
diff --git a/web/src/utils/string.js b/web/src/utils/string.js
index c37f0559a3..7466c6af23 100644
--- a/web/src/utils/string.js
+++ b/web/src/utils/string.js
@@ -194,3 +194,7 @@ const EXCLUSIONS = [
 	'SETTINGS_ORDERPOPUP_OPTIONS',
 	'SETTINGS_THEME_OPTIONS',
 ];
+
+export const generateRemoteRouteStringId = (id = '') => {
+	return `REMOTE_ROUTE_STRING__${id.toUpperCase()}`;
+};
diff --git a/web/src/utils/utils.js b/web/src/utils/utils.js
index 267c8e74c7..bf36d7f2e1 100644
--- a/web/src/utils/utils.js
+++ b/web/src/utils/utils.js
@@ -1,6 +1,7 @@
 import moment from 'moment';
 import momentJ from 'moment-jalaali';
 import math from 'mathjs';
+import _toLower from 'lodash/toLower';
 import {
 	TOKEN_TIME,
 	TIMESTAMP_FORMAT,
@@ -264,3 +265,14 @@ export const setChartResolution = (resolution) => {
 export const getChartResolution = () => {
 	return localStorage.getItem(CHART_RESOLUTION_KEY);
 };
+
+export const handleUpgrade = (info = {}) => {
+	if (_toLower(info.type) === "diy" ||
+		(_toLower(info.plan) !== "crypto"
+			&& _toLower(info.plan) !== "fiat")
+	) {
+		return true;
+	} else {
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/web/src/utils/wallet.js b/web/src/utils/wallet.js
new file mode 100644
index 0000000000..3702a42e37
--- /dev/null
+++ b/web/src/utils/wallet.js
@@ -0,0 +1,37 @@
+const getWalletsByCurrnecy = (currency, wallets) => {
+	return wallets.filter((wallet) => wallet.currency === currency);
+};
+
+const getWalletByNetwork = (network, networks, currnecyWallets) => {
+	let wallet;
+	if (!networks && currnecyWallets.length === 1) {
+		wallet = currnecyWallets[0];
+	} else if (network) {
+		wallet = currnecyWallets.find((wallet) => wallet.network === network);
+	}
+
+	return wallet ? wallet['address'] : '';
+};
+
+export const getWallet = (currnecy, network, wallets, networks) => {
+	return getWalletByNetwork(
+		network,
+		networks,
+		getWalletsByCurrnecy(currnecy, wallets)
+	);
+};
+
+export const getNetworkLabelByKey = (network) => {
+	if (network) {
+		switch (network) {
+			case 'eth':
+				return 'ERC20';
+			case 'trx':
+				return 'TRC20';
+			default:
+				network.toUpperCase();
+		}
+	} else {
+		return network;
+	}
+};