diff --git a/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx b/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
index ef2f218e5..137167178 100644
--- a/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
+++ b/src/components/Inputs/DepositAmountInput/DepositAmountInput.tsx
@@ -21,6 +21,7 @@ interface IProps {
   balanceValue?: string
   disabled?: boolean
   priceLoading?: boolean
+  isBalanceLoading: boolean
 }
 
 export const DepositAmountInput: React.FC<IProps> = ({
@@ -38,7 +39,8 @@ export const DepositAmountInput: React.FC<IProps> = ({
   tokenPrice,
   balanceValue,
   disabled = false,
-  priceLoading = false
+  priceLoading = false,
+  isBalanceLoading
 }) => {
   const classes = useStyles()
 
@@ -145,6 +147,13 @@ export const DepositAmountInput: React.FC<IProps> = ({
 
   const usdBalance = tokenPrice && balanceValue ? tokenPrice * +balanceValue : 0
 
+  const formattedBalance = currency
+    ? `${
+        balanceValue
+          ? formatNumbers(thresholds)(balanceValue) + showPrefix(Number(balanceValue))
+          : '0'
+      } ${currency}`
+    : '- -'
   return (
     <Grid container className={classes.wrapper} style={style}>
       <div className={classes.root}>
@@ -199,14 +208,11 @@ export const DepositAmountInput: React.FC<IProps> = ({
               <>
                 <Typography className={classes.caption2}>
                   Balance:{' '}
-                  {currency
-                    ? `${
-                        balanceValue
-                          ? formatNumbers(thresholds)(balanceValue) +
-                            showPrefix(Number(balanceValue))
-                          : '0'
-                      } ${currency}`
-                    : '- -'}
+                  {isBalanceLoading ? (
+                    <img src={loadingAnimation} className={classes.loadingBalance} />
+                  ) : (
+                    <>{' '.concat(formattedBalance)}</>
+                  )}
                 </Typography>
                 <Button
                   className={
diff --git a/src/components/Inputs/DepositAmountInput/style.ts b/src/components/Inputs/DepositAmountInput/style.ts
index 6d1ab649e..e3f5a3625 100644
--- a/src/components/Inputs/DepositAmountInput/style.ts
+++ b/src/components/Inputs/DepositAmountInput/style.ts
@@ -198,6 +198,11 @@ const useStyles = makeStyles((theme: Theme) => ({
     ...typography.caption4,
     fontSize: 13,
     color: colors.white.main
+  },
+  loadingBalance: {
+    padding: '0 10px 0 20px',
+    width: 15,
+    height: 15
   }
 }))
 
diff --git a/src/components/NewPosition/DepositSelector/DepositSelector.tsx b/src/components/NewPosition/DepositSelector/DepositSelector.tsx
index 131e777dd..766399b12 100644
--- a/src/components/NewPosition/DepositSelector/DepositSelector.tsx
+++ b/src/components/NewPosition/DepositSelector/DepositSelector.tsx
@@ -62,6 +62,8 @@ export interface IDepositSelector {
   concentrationIndex: number
   minimumSliderIndex: number
   positionOpeningMethod: PositionOpeningMethod
+  setShouldResetPlot: (val: boolean) => void
+  isBalanceLoading: boolean
 }
 
 export const DepositSelector: React.FC<IDepositSelector> = ({
@@ -93,7 +95,9 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
   concentrationArray,
   concentrationIndex,
   minimumSliderIndex,
-  positionOpeningMethod
+  positionOpeningMethod,
+  setShouldResetPlot,
+  isBalanceLoading
 }) => {
   const classes = useStyles()
 
@@ -227,6 +231,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
               tokens={tokens}
               current={tokenAIndex !== null ? tokens[tokenAIndex] : null}
               onSelect={index => {
+                setShouldResetPlot(true)
                 setTokenAIndex(index)
                 setPositionTokens(index, tokenBIndex, feeTierIndex)
               }}
@@ -262,6 +267,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
               tokens={tokens}
               current={tokenBIndex !== null ? tokens[tokenBIndex] : null}
               onSelect={index => {
+                setShouldResetPlot(true)
                 setTokenBIndex(index)
                 setPositionTokens(tokenAIndex, index, feeTierIndex)
               }}
@@ -279,6 +285,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
         <FeeSwitch
           onSelect={fee => {
             setPositionTokens(tokenAIndex, tokenBIndex, fee)
+            setShouldResetPlot(true)
           }}
           feeTiers={feeTiers}
           showOnlyPercents
@@ -347,6 +354,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
           }}
           {...tokenAInputState}
           priceLoading={priceALoading}
+          isBalanceLoading={isBalanceLoading}
         />
 
         <DepositAmountInput
@@ -404,6 +412,7 @@ export const DepositSelector: React.FC<IDepositSelector> = ({
           }}
           {...tokenBInputState}
           priceLoading={priceBLoading}
+          isBalanceLoading={isBalanceLoading}
         />
       </Grid>
 
diff --git a/src/components/NewPosition/NewPosition.tsx b/src/components/NewPosition/NewPosition.tsx
index e54294df8..cdeea1e52 100644
--- a/src/components/NewPosition/NewPosition.tsx
+++ b/src/components/NewPosition/NewPosition.tsx
@@ -32,6 +32,7 @@ import DepositSelector from './DepositSelector/DepositSelector'
 import MarketIdLabel from './MarketIdLabel/MarketIdLabel'
 import PoolInit from './PoolInit/PoolInit'
 import RangeSelector from './RangeSelector/RangeSelector'
+import refreshIcon from '@static/svg/refresh.svg'
 import useStyles from './style'
 import { getMinTick } from '@invariant-labs/sdk/src/utils'
 
@@ -106,6 +107,8 @@ export interface INewPosition {
   onSlippageChange: (slippage: string) => void
   initialSlippage: string
   globalPrice?: number
+  handleRefresh: () => void
+  isBalanceLoading: boolean
 }
 
 export const NewPosition: React.FC<INewPosition> = ({
@@ -158,7 +161,9 @@ export const NewPosition: React.FC<INewPosition> = ({
   currentFeeIndex,
   onSlippageChange,
   initialSlippage,
-  globalPrice
+  globalPrice,
+  handleRefresh,
+  isBalanceLoading
 }) => {
   const classes = useStyles()
 
@@ -189,6 +194,8 @@ export const NewPosition: React.FC<INewPosition> = ({
     [tickSpacing]
   )
 
+  const [shouldResetPlot, setShouldResetPlot] = useState(true)
+
   const setRangeBlockerInfo = () => {
     if (tokenAIndex === null || tokenBIndex === null) {
       return 'Select tokens to set price range.'
@@ -210,8 +217,8 @@ export const NewPosition: React.FC<INewPosition> = ({
       .fill(1)
       .map((_e, index) => ({ x: index, y: index, index })),
     midPrice: {
-      x: 50,
-      index: 50
+      x: 0,
+      index: 0
     },
     tokenASymbol: 'ABC',
     tokenBSymbol: 'XYZ'
@@ -442,9 +449,32 @@ export const NewPosition: React.FC<INewPosition> = ({
         </Grid>
       </Link>
 
-      <Grid container justifyContent='space-between'>
-        <Typography className={classes.title}>Add new liquidity position</Typography>
-        <Grid container item alignItems='center' className={classes.options}>
+      <Grid
+        container
+        item
+        className={classes.subHeader}
+        alignItems='center'
+        justifyContent='space-between'>
+        <Grid
+          container
+          item
+          alignItems='center'
+          justifyContent='space-between'
+          className={classes.leftSideSubHeader}>
+          <Typography className={classes.title}>Add new liquidity position</Typography>
+          <Button
+            disabled={tokenAIndex === null || tokenBIndex === null}
+            onClick={handleRefresh}
+            className={classes.refreshIconBtn}>
+            <img src={refreshIcon} className={classes.refreshIcon} />
+          </Button>
+        </Grid>
+        <Grid
+          container
+          item
+          alignItems='center'
+          justifyContent='flex-end'
+          className={classes.options}>
           {address !== '' ? (
             <MarketIdLabel
               displayLength={9}
@@ -605,6 +635,8 @@ export const NewPosition: React.FC<INewPosition> = ({
           concentrationIndex={concentrationIndex}
           minimumSliderIndex={minimumSliderIndex}
           positionOpeningMethod={positionOpeningMethod}
+          setShouldResetPlot={setShouldResetPlot}
+          isBalanceLoading={isBalanceLoading}
         />
 
         {isCurrentPoolExisting ||
@@ -653,6 +685,8 @@ export const NewPosition: React.FC<INewPosition> = ({
             concentrationIndex={concentrationIndex}
             minimumSliderIndex={minimumSliderIndex}
             getTicksInsideRange={getTicksInsideRange}
+            shouldResetPlot={shouldResetPlot}
+            setShouldResetPlot={setShouldResetPlot}
           />
         ) : (
           <PoolInit
diff --git a/src/components/NewPosition/RangeSelector/RangeSelector.tsx b/src/components/NewPosition/RangeSelector/RangeSelector.tsx
index ccba3d6cf..f29f62f10 100644
--- a/src/components/NewPosition/RangeSelector/RangeSelector.tsx
+++ b/src/components/NewPosition/RangeSelector/RangeSelector.tsx
@@ -55,6 +55,8 @@ export interface IRangeSelector {
     leftInRange: number
     rightInRange: number
   }
+  shouldResetPlot: boolean
+  setShouldResetPlot: (val: boolean) => void
 }
 
 export const RangeSelector: React.FC<IRangeSelector> = ({
@@ -79,6 +81,8 @@ export const RangeSelector: React.FC<IRangeSelector> = ({
   hasTicksError,
   reloadHandler,
   volumeRange,
+  shouldResetPlot,
+  setShouldResetPlot,
   concentrationArray,
   minimumSliderIndex,
   concentrationIndex,
@@ -245,10 +249,11 @@ export const RangeSelector: React.FC<IRangeSelector> = ({
   }, [currentPairReversed])
 
   useEffect(() => {
-    if (ticksLoading && isMountedRef.current) {
+    if (ticksLoading && shouldResetPlot && midPrice.index !== 0 && isMountedRef.current) {
       resetPlot()
+      setShouldResetPlot(false)
     }
-  }, [ticksLoading, midPrice])
+  }, [ticksLoading, midPrice, poolIndex])
 
   const autoZoomHandler = (left: number, right: number, canZoomCloser: boolean = false) => {
     const leftX = calcPrice(left, isXtoY, xDecimal, yDecimal)
diff --git a/src/components/NewPosition/style.ts b/src/components/NewPosition/style.ts
index 23895a1dd..44181fba7 100644
--- a/src/components/NewPosition/style.ts
+++ b/src/components/NewPosition/style.ts
@@ -28,7 +28,6 @@ const useStyles = makeStyles((theme: Theme) => ({
   title: {
     color: colors.white.main,
     ...typography.heading4,
-    marginBottom: 18,
 
     [theme.breakpoints.down('xs')]: {
       fontSize: 18
@@ -85,11 +84,56 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
   options: {
     width: 'fit-content',
-    marginBottom: 18,
+    marginBottom: 16,
     height: 28
   },
   switch: {
     transition: 'opacity 500ms'
+  },
+  jupiterIcon: {
+    cursor: 'pointer',
+    transition: 'filter 100ms',
+    '&:hover': {
+      filter: 'brightness(1.5)'
+    }
+  },
+  refreshIconBtn: {
+    padding: 0,
+    margin: 0,
+    minWidth: 'auto',
+    background: 'none',
+    marginRight: 7,
+    '&:hover': {
+      background: 'none'
+    },
+    '&:disabled': {
+      opacity: 0.5
+    }
+  },
+  refreshIcon: {
+    width: 26,
+    height: 21,
+    cursor: 'pointer',
+    transition: 'filter 100ms',
+    '&:hover': {
+      filter: 'brightness(1.5)'
+    }
+  },
+  subHeader: {
+    alignItems: 'center',
+
+    [theme.breakpoints.down('sm')]: {
+      justifyContent: 'flex-start'
+    }
+  },
+  leftSideSubHeader: {
+    marginBottom: 16,
+    width: 'calc(50% - 12px)',
+
+    [theme.breakpoints.down('sm')]: {
+      flex: 'initial',
+      width: 'auto'
+    }
   }
 }))
 
diff --git a/src/components/PositionDetails/PositionDetails.tsx b/src/components/PositionDetails/PositionDetails.tsx
index 96ce0a25c..e455c9be6 100644
--- a/src/components/PositionDetails/PositionDetails.tsx
+++ b/src/components/PositionDetails/PositionDetails.tsx
@@ -13,6 +13,7 @@ import { Link, useHistory } from 'react-router-dom'
 import { ILiquidityToken } from './SinglePositionInfo/consts'
 import SinglePositionPlot from './SinglePositionPlot/SinglePositionPlot'
 import useStyles from './style'
+import refreshIcon from '@static/svg/refresh.svg'
 
 import MarketIdLabel from '@components/NewPosition/MarketIdLabel/MarketIdLabel'
 import { Color } from '@material-ui/lab'
@@ -41,6 +42,7 @@ interface IProps {
   initialIsDiscreteValue: boolean
   onDiscreteChange: (val: boolean) => void
   showFeesLoader?: boolean
+  showLiquidityLoader?: boolean
   hasTicksError?: boolean
   reloadHandler: () => void
   plotVolumeRange?: {
@@ -51,6 +53,7 @@ interface IProps {
   globalPrice?: number
   setXToY: (val: boolean) => void
   xToY: boolean
+  handleRefresh: () => void
 }
 
 const PositionDetails: React.FC<IProps> = ({
@@ -77,13 +80,15 @@ const PositionDetails: React.FC<IProps> = ({
   initialIsDiscreteValue,
   onDiscreteChange,
   showFeesLoader = false,
+  showLiquidityLoader = false,
   hasTicksError,
   reloadHandler,
   plotVolumeRange,
   userHasStakes = false,
   globalPrice,
   setXToY,
-  xToY
+  xToY,
+  handleRefresh
 }) => {
   const classes = useStyles()
 
@@ -109,6 +114,7 @@ const PositionDetails: React.FC<IProps> = ({
           xToY={xToY}
           swapHandler={() => setXToY(!xToY)}
           showFeesLoader={showFeesLoader}
+          showLiquidityLoader={showLiquidityLoader}
           userHasStakes={userHasStakes}
         />
       </Grid>
@@ -117,17 +123,16 @@ const PositionDetails: React.FC<IProps> = ({
         container
         item
         direction='column'
-        alignItems='flex-end'
+        alignItems='center'
         className={classes.right}
         wrap='nowrap'>
         <Grid
           container
           item
           direction='row'
-          alignItems='flex-end'
+          alignItems='center'
           // justifyContent='space-between'
-          style={{ paddingLeft: 20, flexDirection: 'row-reverse' }}
-          className={classes.right}
+          className={classes.rightSubHeader}
           wrap='nowrap'>
           <Hidden xsDown>
             <Button
@@ -143,11 +148,14 @@ const PositionDetails: React.FC<IProps> = ({
               <span className={classes.buttonText}>+ Add Liquidity</span>
             </Button>
           </Hidden>
+          <Button onClick={handleRefresh} className={classes.refreshIconBtn}>
+            <img src={refreshIcon} className={classes.refreshIcon} />
+          </Button>
           <MarketIdLabel
             marketId={poolAddress.toString()}
             displayLength={9}
             copyPoolAddressHandler={copyPoolAddressHandler}
-            style={{ paddingBottom: 20, paddingRight: 10 }}
+            style={{ paddingTop: '6px' }}
           />
         </Grid>
 
diff --git a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
index 309d0142c..9d0372146 100644
--- a/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
+++ b/src/components/PositionDetails/SinglePositionInfo/SinglePositionInfo.tsx
@@ -21,6 +21,7 @@ interface IProp {
   xToY: boolean
   swapHandler: () => void
   showFeesLoader?: boolean
+  showLiquidityLoader?: boolean
   userHasStakes?: boolean
 }
 
@@ -35,6 +36,7 @@ const SinglePositionInfo: React.FC<IProp> = ({
   xToY,
   swapHandler,
   showFeesLoader = false,
+  showLiquidityLoader = false,
   userHasStakes = false
 }) => {
   const history = useHistory()
@@ -101,7 +103,6 @@ const SinglePositionInfo: React.FC<IProp> = ({
             Close position
           </Button>
           <Hidden smUp>
-            {' '}
             <Button
               className={classes.button}
               variant='contained'
@@ -128,6 +129,7 @@ const SinglePositionInfo: React.FC<IProp> = ({
           }
           showBalance
           swapHandler={swapHandler}
+          showLoader={showLiquidityLoader}
         />
         <BoxInfo
           title={'Unclaimed fees'}
diff --git a/src/components/PositionDetails/SinglePositionPlot/SinglePositionPlot.tsx b/src/components/PositionDetails/SinglePositionPlot/SinglePositionPlot.tsx
index b74fbbcbe..202ed115f 100644
--- a/src/components/PositionDetails/SinglePositionPlot/SinglePositionPlot.tsx
+++ b/src/components/PositionDetails/SinglePositionPlot/SinglePositionPlot.tsx
@@ -180,7 +180,7 @@ const SinglePositionPlot: React.FC<ISinglePositionPlot> = ({
           xDecimal={tokenX.decimal}
           yDecimal={tokenY.decimal}
           isDiscrete={isPlotDiscrete}
-          coverOnLoading
+          coverOnLoading={true}
           hasError={hasTicksError}
           reloadHandler={reloadHandler}
           volumeRange={volumeRange}
diff --git a/src/components/PositionDetails/style.ts b/src/components/PositionDetails/style.ts
index 32a5059c0..81f2952b0 100644
--- a/src/components/PositionDetails/style.ts
+++ b/src/components/PositionDetails/style.ts
@@ -29,6 +29,13 @@ const useStyles = makeStyles((theme: Theme) => ({
       width: '100%'
     }
   },
+  rightSubHeader: {
+    marginBottom: 16,
+    width: '100%',
+    paddingLeft: 20,
+    flexDirection: 'row-reverse',
+    gap: 10
+  },
   back: {
     height: 40,
     marginBottom: 16,
@@ -57,7 +64,6 @@ const useStyles = makeStyles((theme: Theme) => ({
     borderRadius: 14,
     height: 40,
     width: 130,
-    marginBottom: 16,
     paddingRight: 9,
     paddingLeft: 9,
     letterSpacing: -0.03,
@@ -72,6 +78,25 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
   buttonText: {
     WebkitPaddingBefore: '2px'
+  },
+  refreshIconBtn: {
+    padding: 0,
+    margin: 0,
+    minWidth: 'auto',
+    background: 'none',
+    marginRight: 7,
+    '& :hover': {
+      background: 'none'
+    }
+  },
+  refreshIcon: {
+    width: 26,
+    height: 21,
+    cursor: 'pointer',
+    transition: 'filter 100ms',
+    '&:hover': {
+      filter: 'brightness(1.5)'
+    }
   }
 }))
 
diff --git a/src/components/PriceRangePlot/PriceRangePlot.tsx b/src/components/PriceRangePlot/PriceRangePlot.tsx
index eee0a09a4..8d3942f79 100644
--- a/src/components/PriceRangePlot/PriceRangePlot.tsx
+++ b/src/components/PriceRangePlot/PriceRangePlot.tsx
@@ -503,11 +503,11 @@ export const PriceRangePlot: React.FC<IPriceRangePlot> = ({
           'markers',
           'areas',
           'lines',
-          lazyLoadingLayer,
           globalPriceLayer,
           currentLayer,
           volumeRangeLayer,
           brushLayer,
+          lazyLoadingLayer,
           'axes',
           'legends'
         ]}
diff --git a/src/components/Swap/Swap.tsx b/src/components/Swap/Swap.tsx
index 89d6200e9..d4dab9d79 100644
--- a/src/components/Swap/Swap.tsx
+++ b/src/components/Swap/Swap.tsx
@@ -98,6 +98,8 @@ export interface ISwap {
   onSlippageChange: (slippage: string) => void
   initialSlippage: string
   isBalanceLoading: boolean
+  deleteTimeoutError: () => void
+  isTimeoutError: boolean
 }
 
 export const Swap: React.FC<ISwap> = ({
@@ -126,7 +128,9 @@ export const Swap: React.FC<ISwap> = ({
   priceToLoading,
   onSlippageChange,
   initialSlippage,
-  isBalanceLoading
+  isBalanceLoading,
+  deleteTimeoutError,
+  isTimeoutError
 }) => {
   const classes = useStyles()
   enum inputTarget {
@@ -467,6 +471,13 @@ export const Swap: React.FC<ISwap> = ({
     void setSimulateAmount()
   }, [isFetchingNewPool])
 
+  useEffect(() => {
+    if (isTimeoutError) {
+      onRefresh(tokenFromIndex, tokenToIndex)
+      deleteTimeoutError()
+    }
+  }, [isTimeoutError])
+
   return (
     <Grid container className={classes.swapWrapper} alignItems='center'>
       <Grid container className={classes.header}>
diff --git a/src/containers/NewPositionWrapper/NewPositionWrapper.tsx b/src/containers/NewPositionWrapper/NewPositionWrapper.tsx
index a8852a179..6cfda1073 100644
--- a/src/containers/NewPositionWrapper/NewPositionWrapper.tsx
+++ b/src/containers/NewPositionWrapper/NewPositionWrapper.tsx
@@ -27,15 +27,22 @@ import { BN } from '@project-serum/anchor'
 import { actions as poolsActions } from '@reducers/pools'
 import { actions } from '@reducers/positions'
 import { actions as snackbarsActions } from '@reducers/snackbars'
-import { Status } from '@reducers/solanaWallet'
+import { Status, actions as solanaWallet } from '@reducers/solanaWallet'
+import { actions as connectionActions } from '@reducers/solanaConnection'
 import {
   isLoadingLatestPoolsForTransaction,
   poolsArraySortedByFees,
   volumeRanges
 } from '@selectors/pools'
 import { initPosition, plotTicks } from '@selectors/positions'
-import { network } from '@selectors/solanaConnection'
-import { canCreateNewPool, canCreateNewPosition, status, swapTokens } from '@selectors/solanaWallet'
+import { network, timeoutError } from '@selectors/solanaConnection'
+import {
+  canCreateNewPool,
+  canCreateNewPosition,
+  status,
+  swapTokens,
+  balanceLoading
+} from '@selectors/solanaWallet'
 import { PublicKey } from '@solana/web3.js'
 import { getCurrentSolanaConnection, networkTypetoProgramNetwork } from '@web3/connection'
 import { openWalletSelectorModal } from '@web3/selector'
@@ -62,10 +69,13 @@ export const NewPositionWrapper: React.FC<IProps> = ({
 
   const connection = getCurrentSolanaConnection()
 
+  const isTimeoutError = useSelector(timeoutError)
+
   const tokens = useSelector(swapTokens)
   const walletStatus = useSelector(status)
   const allPools = useSelector(poolsArraySortedByFees)
   const poolsVolumeRanges = useSelector(volumeRanges)
+  const isBalanceLoading = useSelector(balanceLoading)
 
   const canUserCreateNewPool = useSelector(canCreateNewPool)
   const canUserCreateNewPosition = useSelector(canCreateNewPosition)
@@ -348,7 +358,8 @@ export const NewPositionWrapper: React.FC<IProps> = ({
 
   const [tokenBPriceData, setTokenBPriceData] = useState<TokenPriceData | undefined>(undefined)
   const [priceBLoading, setPriceBLoading] = useState(false)
-  useEffect(() => {
+
+  const getGlobalPrice = () => {
     if (tokenAIndex === null || tokenBIndex === null) {
       return
     }
@@ -363,6 +374,10 @@ export const NewPositionWrapper: React.FC<IProps> = ({
     } else {
       setGlobalPrice(undefined)
     }
+  }
+
+  useEffect(() => {
+    getGlobalPrice()
   }, [tokenAIndex, tokenBIndex])
 
   useEffect(() => {
@@ -504,6 +519,81 @@ export const NewPositionWrapper: React.FC<IProps> = ({
     return new BN(0)
   }
 
+  const handleRefresh = async () => {
+    if (tokenBIndex === null || tokenAIndex === null || tokenAIndex === tokenBIndex) {
+      return
+    }
+    dispatch(solanaWallet.getBalance())
+
+    const idA = tokens[tokenAIndex].assetAddress.toString() ?? ''
+    if (idA) {
+      setPriceALoading(true)
+      await getJupTokenPrice(idA)
+        .then(data => setTokenAPriceData(data))
+        .catch(() => setTokenAPriceData(undefined))
+        .finally(() => setPriceALoading(false))
+    } else {
+      setTokenAPriceData(undefined)
+    }
+
+    const idB = tokens[tokenBIndex].assetAddress.toString() ?? ''
+    if (idB) {
+      setPriceBLoading(true)
+      getJupTokenPrice(idB)
+        .then(data => setTokenBPriceData(data))
+        .catch(() => setTokenBPriceData(undefined))
+        .finally(() => setPriceBLoading(false))
+    } else {
+      setTokenBPriceData(undefined)
+    }
+
+    dispatch(
+      poolsActions.getAllPoolsForPairData({
+        first: tokens[tokenAIndex].address,
+        second: tokens[tokenBIndex].address
+      })
+    )
+
+    dispatch(
+      poolsActions.getPoolData(
+        new Pair(tokens[tokenAIndex].assetAddress, tokens[tokenBIndex].assetAddress, {
+          fee: ALL_FEE_TIERS_DATA[feeIndex].tier.fee,
+          tickSpacing: ALL_FEE_TIERS_DATA[feeIndex].tier.tickSpacing
+        })
+      )
+    )
+
+    if (tokenAIndex !== null && tokenBIndex !== null) {
+      const index = allPools.findIndex(
+        pool =>
+          pool.fee.v.eq(fee) &&
+          ((pool.tokenX.equals(tokens[tokenAIndex].assetAddress) &&
+            pool.tokenY.equals(tokens[tokenBIndex].assetAddress)) ||
+            (pool.tokenX.equals(tokens[tokenBIndex].assetAddress) &&
+              pool.tokenY.equals(tokens[tokenAIndex].assetAddress)))
+      )
+      setPoolIndex(index !== -1 ? index : null)
+
+      if (index !== -1) {
+        dispatch(
+          actions.getCurrentPlotTicks({
+            poolIndex: index,
+            isXtoY: allPools[index].tokenX.equals(tokens[tokenAIndex].assetAddress)
+          })
+        )
+      }
+    }
+
+    getGlobalPrice()
+  }
+
+  useEffect(() => {
+    if (isTimeoutError) {
+      void handleRefresh()
+      dispatch(connectionActions.setTimeoutError(false))
+    }
+  }, [isTimeoutError])
+
   return (
     <NewPosition
       initialTokenFrom={initialTokenFrom}
@@ -676,6 +766,8 @@ export const NewPositionWrapper: React.FC<IProps> = ({
       onSlippageChange={onSlippageChange}
       initialSlippage={initialSlippage}
       globalPrice={globalPrice}
+      handleRefresh={handleRefresh}
+      isBalanceLoading={isBalanceLoading}
     />
   )
 }
diff --git a/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx b/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx
index e15a55e35..0b98275fa 100644
--- a/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx
+++ b/src/containers/SinglePositionWrapper/SinglePositionWrapper.tsx
@@ -9,15 +9,18 @@ import {
   getJupTokensRatioPrice,
   printBN
 } from '@consts/utils'
-import { calculatePriceSqrt } from '@invariant-labs/sdk'
+import { Pair, calculatePriceSqrt } from '@invariant-labs/sdk'
 import { MAX_TICK, getX, getY } from '@invariant-labs/sdk/lib/math'
 import { calculateClaimAmount } from '@invariant-labs/sdk/src/utils'
 import { Grid } from '@material-ui/core'
 import { Color } from '@material-ui/lab'
+import { actions as poolsActions } from '@reducers/pools'
 import { actions as farmsActions } from '@reducers/farms'
 import { actions } from '@reducers/positions'
 import { actions as snackbarsActions } from '@reducers/snackbars'
-import { Status } from '@reducers/solanaWallet'
+import { Status, actions as solanaWallet } from '@reducers/solanaWallet'
+import { actions as connectionActions } from '@reducers/solanaConnection'
+import { timeoutError } from '@selectors/solanaConnection'
 import { hasFarms, hasUserStakes, stakesForPosition } from '@selectors/farms'
 import { hasTokens, volumeRanges } from '@selectors/pools'
 import {
@@ -26,7 +29,7 @@ import {
   plotTicks,
   singlePositionData
 } from '@selectors/positions'
-import { status } from '@selectors/solanaWallet'
+import { status, balanceLoading } from '@selectors/solanaWallet'
 import loader from '@static/gif/loader.gif'
 import React, { useEffect, useMemo, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
@@ -58,23 +61,28 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
   const hasAnyTokens = useSelector(hasTokens)
   const hasAnyFarms = useSelector(hasFarms)
   const hasAnyStakes = useSelector(hasUserStakes)
+
   const walletStatus = useSelector(status)
+  const isBalanceLoading = useSelector(balanceLoading)
+
   const positionStakes = useSelector(stakesForPosition(position?.address))
 
+  const isTimeoutError = useSelector(timeoutError)
+
   const [xToY, setXToY] = useState<boolean>(
     initialXtoY(position?.tokenX.assetAddress.toString(), position?.tokenY.assetAddress.toString())
   )
 
   const [globalPrice, setGlobalPrice] = useState<number | undefined>(undefined)
 
-  const [waitingForTicksData, setWaitingForTicksData] = useState<boolean | null>(null)
+  const [waitingForTicksData, setWaitingForTicksData] = useState<boolean | null>(false)
 
   const [showFeesLoader, setShowFeesLoader] = useState(true)
 
   const [isFinishedDelayRender, setIsFinishedDelayRender] = useState(false)
 
   useEffect(() => {
-    if (position?.id && waitingForTicksData === null) {
+    if (position?.id && !waitingForTicksData) {
       setWaitingForTicksData(true)
       dispatch(actions.getCurrentPositionRangeTicks(id))
       dispatch(
@@ -232,6 +240,8 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
   }, [position])
 
   const [tokenXClaim, tokenYClaim] = useMemo(() => {
+    setShowFeesLoader(true)
+
     if (
       waitingForTicksData === false &&
       position &&
@@ -346,7 +356,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
     }
   }, [position?.id])
 
-  useEffect(() => {
+  const getGlobalPrice = () => {
     if (!position) {
       return
     }
@@ -367,6 +377,10 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
     } else {
       setGlobalPrice(undefined)
     }
+  }
+
+  useEffect(() => {
+    getGlobalPrice()
   }, [xToY, position?.tokenX, position?.tokenY])
 
   const copyPoolAddressHandler = (message: string, variant: Color) => {
@@ -395,7 +409,41 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
     }
   }, [walletStatus])
 
-  if (!isLoadingList && position) {
+  const handleRefresh = () => {
+    if (position) {
+      dispatch(solanaWallet.getBalance())
+
+      dispatch(actions.getPositionsList())
+
+      setWaitingForTicksData(true)
+      dispatch(actions.getCurrentPositionRangeTicks(id))
+      dispatch(
+        actions.getCurrentPlotTicks({
+          poolIndex: position.poolData.poolIndex,
+          isXtoY: true
+        })
+      )
+      dispatch(
+        poolsActions.getPoolData(
+          new Pair(position.tokenX.assetAddress, position.tokenY.assetAddress, {
+            fee: position.poolData.fee,
+            tickSpacing: position.poolData.tickSpacing
+          })
+        )
+      )
+
+      getGlobalPrice()
+    }
+  }
+
+  useEffect(() => {
+    if (isTimeoutError) {
+      handleRefresh()
+      dispatch(connectionActions.setTimeoutError(false))
+    }
+  }, [isTimeoutError])
+
+  if (position) {
     return (
       <PositionDetails
         tokenXAddress={position.tokenX.assetAddress}
@@ -421,7 +469,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
             })
           )
         }}
-        ticksLoading={ticksLoading}
+        ticksLoading={ticksLoading || isLoadingList}
         tickSpacing={position?.poolData.tickSpacing ?? 1}
         tokenX={{
           name: position.tokenX.symbol,
@@ -454,7 +502,8 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
         max={max}
         initialIsDiscreteValue={initialIsDiscreteValue}
         onDiscreteChange={setIsDiscreteValue}
-        showFeesLoader={showFeesLoader}
+        showFeesLoader={showFeesLoader || isLoadingList}
+        showLiquidityLoader={isLoadingList || isBalanceLoading}
         hasTicksError={hasTicksError}
         reloadHandler={() => {
           dispatch(
@@ -469,6 +518,7 @@ export const SinglePositionWrapper: React.FC<IProps> = ({ id }) => {
         globalPrice={globalPrice}
         xToY={xToY}
         setXToY={setXToY}
+        handleRefresh={handleRefresh}
       />
     )
   }
diff --git a/src/containers/WrappedSwap/WrappedSwap.tsx b/src/containers/WrappedSwap/WrappedSwap.tsx
index 8c21bf687..a857e8ee4 100644
--- a/src/containers/WrappedSwap/WrappedSwap.tsx
+++ b/src/containers/WrappedSwap/WrappedSwap.tsx
@@ -17,7 +17,8 @@ import {
   poolTicks,
   tickMaps
 } from '@selectors/pools'
-import { network } from '@selectors/solanaConnection'
+import { network, timeoutError } from '@selectors/solanaConnection'
+import { actions as connectionActions } from '@reducers/solanaConnection'
 import { status, swapTokens, swapTokensDict, balanceLoading } from '@selectors/solanaWallet'
 import { swap as swapPool } from '@selectors/swap'
 import { PublicKey } from '@solana/web3.js'
@@ -41,7 +42,9 @@ export const WrappedSwap = () => {
   const isBalanceLoading = useSelector(balanceLoading)
   const { success, inProgress } = useSelector(swapPool)
   const isFetchingNewPool = useSelector(isLoadingLatestPoolsForTransaction)
+
   const networkType = useSelector(network)
+  const isTimeoutError = useSelector(timeoutError)
 
   const [progress, setProgress] = useState<ProgressState>('none')
   const [tokenFrom, setTokenFrom] = useState<PublicKey | null>(null)
@@ -220,6 +223,10 @@ export const WrappedSwap = () => {
     }
   }
 
+  const deleteTimeoutError = () => {
+    dispatch(connectionActions.setTimeoutError(false))
+  }
+
   return (
     <Swap
       isFetchingNewPool={isFetchingNewPool}
@@ -293,6 +300,8 @@ export const WrappedSwap = () => {
       onSlippageChange={onSlippageChange}
       initialSlippage={initialSlippage}
       isBalanceLoading={isBalanceLoading}
+      deleteTimeoutError={deleteTimeoutError}
+      isTimeoutError={isTimeoutError}
     />
   )
 }
diff --git a/src/store/reducers/solanaConnection.ts b/src/store/reducers/solanaConnection.ts
index 0fa987804..1c4564396 100644
--- a/src/store/reducers/solanaConnection.ts
+++ b/src/store/reducers/solanaConnection.ts
@@ -14,6 +14,7 @@ export interface ISolanaConnectionStore {
   network: NetworkType
   slot: number
   rpcAddress: string
+  timeoutError: boolean
 }
 
 export const defaultState: ISolanaConnectionStore = {
@@ -21,8 +22,10 @@ export const defaultState: ISolanaConnectionStore = {
   message: '',
   network: NetworkType.MAINNET,
   slot: 0,
-  rpcAddress: SolanaNetworks.MAIN_NIGHTLY
+  rpcAddress: SolanaNetworks.MAIN_NIGHTLY,
+  timeoutError: false
 }
+
 export const solanaConnectionSliceName = 'solanaConnection'
 const solanaConnectionSlice = createSlice({
   name: solanaConnectionSliceName,
@@ -58,6 +61,10 @@ const solanaConnectionSlice = createSlice({
     setSlot(state, action: PayloadAction<number>) {
       state.slot = action.payload
       return state
+    },
+    setTimeoutError(state, action: PayloadAction<boolean>) {
+      state.timeoutError = action.payload
+      return state
     }
   }
 })
diff --git a/src/store/sagas/positions.ts b/src/store/sagas/positions.ts
index ddd0e17d6..031e03cf2 100644
--- a/src/store/sagas/positions.ts
+++ b/src/store/sagas/positions.ts
@@ -17,6 +17,7 @@ import {
   actions
 } from '@reducers/positions'
 import { actions as snackbarsActions } from '@reducers/snackbars'
+import { actions as connectionActions } from '@reducers/solanaConnection'
 import { GuardPredicate } from '@redux-saga/types'
 import { PayloadAction } from '@reduxjs/toolkit'
 import { stakesForPosition } from '@selectors/farms'
@@ -30,6 +31,7 @@ import {
   PublicKey,
   SystemProgram,
   Transaction,
+  TransactionExpiredTimeoutError,
   sendAndConfirmRawTransaction
 } from '@solana/web3.js'
 import { getMarketProgram } from '@web3/programs/amm'
@@ -501,6 +503,11 @@ function* handleInitPositionWithSOL(action: PayloadAction<InitPositionData>): Ge
   } catch (error) {
     console.log(error)
 
+    // TODO finish after merge https://github.com/invariant-labs/webapp/pull/667
+    if (error instanceof TransactionExpiredTimeoutError) {
+      yield put(connectionActions.setTimeoutError(true))
+    }
+
     yield put(actions.setInitPositionSuccess(false))
 
     closeSnackbar(loaderCreatePosition)
diff --git a/src/store/sagas/swap.ts b/src/store/sagas/swap.ts
index 118783b1e..1ac5905e2 100644
--- a/src/store/sagas/swap.ts
+++ b/src/store/sagas/swap.ts
@@ -2,13 +2,20 @@ import { SIGNING_SNACKBAR_CONFIG, WRAPPED_SOL_ADDRESS } from '@consts/static'
 import { createLoaderKey, solToPriorityFee } from '@consts/utils'
 import { Pair } from '@invariant-labs/sdk'
 import { actions as snackbarsActions } from '@reducers/snackbars'
+import { actions as connectionActions } from '@reducers/solanaConnection'
 import { actions as swapActions } from '@reducers/swap'
 import { poolsArraySortedByFees, tokens } from '@selectors/pools'
 import { network, rpcAddress } from '@selectors/solanaConnection'
 import { accounts } from '@selectors/solanaWallet'
 import { swap } from '@selectors/swap'
 import { NATIVE_MINT, TOKEN_PROGRAM_ID, Token } from '@solana/spl-token'
-import { Keypair, SystemProgram, Transaction, sendAndConfirmRawTransaction } from '@solana/web3.js'
+import {
+  Keypair,
+  SystemProgram,
+  Transaction,
+  TransactionExpiredTimeoutError,
+  sendAndConfirmRawTransaction
+} from '@solana/web3.js'
 import { getMarketProgram } from '@web3/programs/amm'
 import { call, put, select, takeEvery } from 'typed-redux-saga'
 import { getConnection } from './connection'
@@ -281,6 +288,10 @@ export function* handleSwapWithSOL(): Generator {
 
     yield put(swapActions.setSwapSuccess(false))
 
+    // TODO finish after merge https://github.com/invariant-labs/webapp/pull/667
+    if (error instanceof TransactionExpiredTimeoutError) {
+      yield put(connectionActions.setTimeoutError(true))
+    }
     yield put(
       snackbarsActions.add({
         message:
diff --git a/src/store/selectors/solanaConnection.ts b/src/store/selectors/solanaConnection.ts
index 68116bb5d..556d73178 100644
--- a/src/store/selectors/solanaConnection.ts
+++ b/src/store/selectors/solanaConnection.ts
@@ -3,13 +3,14 @@ import { keySelectors, AnyProps } from './helpers'
 
 const store = (s: AnyProps) => s[solanaConnectionSliceName] as ISolanaConnectionStore
 
-export const { network, status, slot, rpcAddress } = keySelectors(store, [
+export const { network, status, slot, rpcAddress, timeoutError } = keySelectors(store, [
   'network',
   'status',
   'slot',
-  'rpcAddress'
+  'rpcAddress',
+  'timeoutError'
 ])
 
-export const solanaConnectionSelectors = { network, status, slot, rpcAddress }
+export const solanaConnectionSelectors = { network, status, slot, rpcAddress, timeoutError }
 
 export default solanaConnectionSelectors