diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 0fccc2b1e..7f93d365f 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-* @bobthebuidlr @linkielink @Patricie29 @StefChatz
\ No newline at end of file
+* @linkielink @Patricie29 @StefChatz
\ No newline at end of file
diff --git a/src/api/accounts/getAccount.ts b/src/api/accounts/getAccount.ts
index fb8f31646..d09ad526a 100644
--- a/src/api/accounts/getAccount.ts
+++ b/src/api/accounts/getAccount.ts
@@ -18,9 +18,13 @@ export default async function getAccount(
   const accountPosition: Positions = await creditManagerQueryClient.positions({ accountId })
 
   let perpsVaultPosition = null
+
   if (isPerpsEnabled && address) {
     const perpsQueryClient = await getPerpsQueryClient(chainConfig)
-    perpsVaultPosition = await perpsQueryClient.vaultPosition({ accountId, userAddress: address })
+    perpsVaultPosition = await perpsQueryClient.vaultPosition({
+      accountId,
+      userAddress: chainConfig.contracts.creditManager,
+    })
   }
 
   const accountKind = await creditManagerQueryClient.accountKind({ accountId: accountId })
diff --git a/src/api/cosmwasm-client.ts b/src/api/cosmwasm-client.ts
index e9175646d..5601e01e5 100644
--- a/src/api/cosmwasm-client.ts
+++ b/src/api/cosmwasm-client.ts
@@ -57,7 +57,7 @@ const getParamsQueryClient = async (chainConfig: ChainConfig) => {
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + contract
 
-    if (!_paramsQueryClient.get(key)) {
+    if (!_paramsQueryClient.get(key) && contract) {
       const client = await getClient(rpc)
       _paramsQueryClient.set(key, new MarsParamsQueryClient(client, contract))
     }
@@ -75,7 +75,7 @@ const getOracleQueryClientOsmosis = async (chainConfig: ChainConfig) => {
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + contract
 
-    if (!_oracleQueryClient.get(key)) {
+    if (!_oracleQueryClient.get(key) && contract) {
       const client = await getClient(rpc)
       _oracleQueryClient.set(key, new MarsOracleOsmosisQueryClient(client, contract))
     }
@@ -93,7 +93,7 @@ const getOracleQueryClientNeutron = async (chainConfig: ChainConfig) => {
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + contract
 
-    if (!_oracleQueryClient.get(key)) {
+    if (!_oracleQueryClient.get(key) && contract) {
       const client = await getClient(rpc)
       _oracleQueryClient.set(key, new MarsOracleWasmQueryClient(client, contract))
     }
@@ -120,7 +120,7 @@ const getIncentivesQueryClient = async (chainConfig: ChainConfig) => {
     const contract = chainConfig.contracts.incentives
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + contract
-    if (!_incentivesQueryClient.get(key)) {
+    if (!_incentivesQueryClient.get(key) && contract) {
       const client = await getClient(rpc)
       _incentivesQueryClient.set(key, new MarsIncentivesQueryClient(client, contract))
     }
@@ -137,7 +137,7 @@ const getPerpsQueryClient = async (chainConfig: ChainConfig) => {
     const contract = chainConfig.contracts.perps
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + contract
-    if (!_perpsClient.get(key)) {
+    if (!_perpsClient.get(key) && contract) {
       const client = await getClient(rpc)
       _perpsClient.set(key, new MarsPerpsQueryClient(client, contract))
     }
@@ -155,7 +155,7 @@ const getRedBankQueryClient = async (chainConfig: ChainConfig) => {
     const rpc = getUrl(chainConfig.endpoints.rpc)
     const key = rpc + contract
 
-    if (!_redBankQueryClient.get(key)) {
+    if (!_redBankQueryClient.get(key) && contract) {
       const client = await getClient(rpc)
       _redBankQueryClient.set(key, new MarsRedBankQueryClient(client, contract))
     }
diff --git a/src/api/perps/getOpeningFee.ts b/src/api/perps/getOpeningFee.ts
deleted file mode 100644
index f89d41c65..000000000
--- a/src/api/perps/getOpeningFee.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { getPerpsQueryClient } from 'api/cosmwasm-client'
-import { BNCoin } from 'types/classes/BNCoin'
-
-export default async function getOpeningFee(
-  chainConfig: ChainConfig,
-  denom: string,
-  amount: string,
-) {
-  const perpsClient = await getPerpsQueryClient(chainConfig)
-
-  return perpsClient
-    .openingFee({ denom, size: amount as any })
-    .then((resp) => BNCoin.fromCoin(resp.fee))
-}
diff --git a/src/chains/neutron/neutron-1.ts b/src/chains/neutron/neutron-1.ts
index b800753b1..1f464ec0e 100644
--- a/src/chains/neutron/neutron-1.ts
+++ b/src/chains/neutron/neutron-1.ts
@@ -68,20 +68,14 @@ const Neutron1: ChainConfig = {
     sell: 'ibc/B559A80D62249C8AA07A380E2A2BEA6E5CA9A6F079C912C3A9E9B494105E4F81',
   },
   contracts: {
-    redBank: 'neutron1n97wnm7q6d2hrcna3rqlnyqw2we6k0l8uqvmyqq6gsml92epdu7quugyph',
-    incentives: 'neutron1aszpdh35zsaz0yj80mz7f5dtl9zq5jfl8hgm094y0j0vsychfekqxhzd39',
-    oracle: 'neutron1dwp6m7pdrz6rnhdyrx5ha0acsduydqcpzkylvfgspsz60pj2agxqaqrr7g',
-    params: 'neutron1x4rgd7ry23v2n49y7xdzje0743c5tgrnqrqsvwyya2h6m48tz4jqqex06x',
     creditManager: 'neutron1qdzn3l4kn7gsjna2tfpg3g3mwd6kunx4p50lfya59k02846xas6qslgs3r',
-    accountNft: 'neutron184kvu96rqtetmunkkmhu5hru8yaqg7qfhd8ldu5avjnamdqu69squrh3f5',
-    perps: 'neutron14v9g7regs90qvful7djcajsvrfep5pg9qau7qm6wya6c2lzcpnms692dlt',
     pyth: 'neutron1m2emc93m9gpwgsrsf2vylv9xvgqh654630v7dfrhrkmr5slly53spg85wv',
   },
   endpoints: {
     routes: 'https://app.astroport.fi/api/routes',
-    rpc: process.env.NEXT_PUBLIC_NEUTRON_RPC ?? 'https://rpc-kralum.neutron-1.neutron.org',
-    fallbackRpc: 'https://rpc.novel.remedy.tm.p2p.org',
-    rest: process.env.NEXT_PUBLIC_NEUTRON_REST ?? 'https://rest-kralum.neutron-1.neutron.org',
+    rpc: process.env.NEXT_PUBLIC_NEUTRON_RPC ?? 'https://rpc-lb.neutron.org',
+    fallbackRpc: 'https://neutron-rpc.cosmos-apis.com',
+    rest: process.env.NEXT_PUBLIC_NEUTRON_REST ?? 'https://rest-lb.neutron.org',
     swap: 'https://neutron.astroport.fi/swap',
     explorer: 'https://mintscan.io/neutron',
     dexAssets: 'https://neutron-cache-api.onrender.com/neutron-1/tokens',
diff --git a/src/chains/neutron/pion-1.ts b/src/chains/neutron/pion-1.ts
index 1b1ea4ec1..309fb7316 100644
--- a/src/chains/neutron/pion-1.ts
+++ b/src/chains/neutron/pion-1.ts
@@ -13,13 +13,7 @@ const Pion1: ChainConfig = {
     sell: 'factory/neutron1ke0vqqzyymlp5esr8gjwuzh94ysnpvj8er5hm7/UUSDC',
   },
   contracts: {
-    redBank: 'neutron1f8ag222s4rnytkweym7lfncrxhtee3za5uk54r5n2rjxvsl9slzq36f66d',
-    incentives: 'neutron12hvgykldx0vxly59ta0ufjz776wxkl9k3r8ugln7xn6zus34a44s2vqw26',
-    oracle: 'neutron1pev35y62g6vte0s9t67gsf6m8d60x36t7wr0p0ghjl9r3h5mwl0q4h2zwc',
-    params: 'neutron1q66e3jv2j9r0duzwzt37fwl7h5njhr2kqs0fxmaa58sfqke80a2ss5hrz7',
-    creditManager: 'neutron13vyqc4efsnc357ze97ppv9h954zjasuj9d0w8es3mk9ea8sg6mvsr3xkjg',
-    accountNft: 'neutron1hx27cs7jjuvwq4hqgxn4av8agnspy2nwvrrq8e9f80jkeyrwrh8s8x645z',
-    perps: 'neutron1yu66sjvgg8shfjxkdlxcqh8yg6tmymsgve8lv62q6k4wrs5mt0pq6ard0n',
+    creditManager: 'neutron1zkxezh5e6jvg0h3kj50hz5d0yrgagkp0c3gcdr6stulw7fye9xlqygj2gz',
     pyth: 'neutron15ldst8t80982akgr8w8ekcytejzkmfpgdkeq4xgtge48qs7435jqp87u3t',
   },
   endpoints: {
diff --git a/src/chains/osmosis/osmosis-1.ts b/src/chains/osmosis/osmosis-1.ts
index a7ab7673a..c46b303d4 100644
--- a/src/chains/osmosis/osmosis-1.ts
+++ b/src/chains/osmosis/osmosis-1.ts
@@ -89,14 +89,8 @@ const Osmosis1: ChainConfig = {
   },
   bech32Config: Bech32Address.defaultBech32Config('osmo'),
   contracts: {
-    redBank: 'osmo1c3ljch9dfw5kf52nfwpxd2zmj2ese7agnx0p9tenkrryasrle5sqf3ftpg',
-    accountNft: 'osmo1450hrg6dv2l58c0rvdwx8ec2a0r6dd50hn4frk370tpvqjhy8khqw7sw09',
-    oracle: 'osmo1mhznfr60vjdp2gejhyv2gax9nvyyzhd3z0qcwseyetkfustjauzqycsy2g',
     creditManager: 'osmo1f2m24wktq0sw3c0lexlg7fv4kngwyttvzws3a3r3al9ld2s2pvds87jqvf',
-    incentives: 'osmo1nkahswfr8shg8rlxqwup0vgahp0dk4x8w6tkv3rra8rratnut36sk22vrm',
-    params: 'osmo1nlmdxt9ctql2jr47qd4fpgzg84cjswxyw6q99u4y4u4q6c2f5ksq7ysent',
     pyth: 'osmo13ge29x4e2s63a8ytz2px8gurtyznmue4a69n5275692v3qn3ks8q7cwck7',
-    perps: '',
   },
   defaultCurrency: {
     coinDenom: 'OSMO',
diff --git a/src/components/Modals/KeeperFeeModal.tsx b/src/components/Modals/KeeperFeeModal.tsx
index e72f4b847..38bb5af7a 100644
--- a/src/components/Modals/KeeperFeeModal.tsx
+++ b/src/components/Modals/KeeperFeeModal.tsx
@@ -1,54 +1,82 @@
 import classNames from 'classnames'
-import { useCallback, useEffect, useState } from 'react'
-
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import Modal from 'components/Modals/Modal'
 import AssetAmountInput from 'components/common/AssetAmountInput'
 import Button from 'components/common/Button'
 import { Callout, CalloutType } from 'components/common/Callout'
 import Text from 'components/common/Text'
-import { getDefaultChainSettings } from 'constants/defaultSettings'
 import { LocalStorageKeys } from 'constants/localStorageKeys'
-import { BN_ZERO_ONE } from 'constants/math'
 import useAsset from 'hooks/assets/useAsset'
 import useChainConfig from 'hooks/chain/useChainConfig'
 import useLocalStorage from 'hooks/localStorage/useLocalStorage'
 import useStore from 'store'
-import { magnify } from 'utils/formatters'
 import { BN } from 'utils/helpers'
+import { PRICE_ORACLE_DECIMALS } from 'constants/query'
 
 export default function KeeperFeeModal() {
   const chainConfig = useChainConfig()
+  const creditManagerConfig = useStore((s) => s.creditManagerConfig)
+  const USD = useAsset('usd')
+  const modal = useStore((s) => s.keeperFeeModal)
+
+  const defaultKeeperFee = JSON.stringify(
+    creditManagerConfig?.keeper_fee_config?.min_fee ?? {
+      denom: '',
+      amount: '0',
+    },
+  )
+
   const [keeperFee, setKeeperFee] = useLocalStorage(
     LocalStorageKeys.PERPS_KEEPER_FEE,
-    getDefaultChainSettings(chainConfig).perpsKeeperFee,
+    defaultKeeperFee,
   )
-  const [amount, setAmount] = useState(BN(keeperFee.amount))
-  const USD = useAsset('usd')
+
+  const parsedKeeperFee = useMemo(() => {
+    try {
+      return typeof keeperFee === 'string' ? JSON.parse(keeperFee) : keeperFee
+    } catch {
+      return { denom: '', amount: '0' }
+    }
+  }, [keeperFee])
+
+  const [amount, setAmount] = useState(() => {
+    return BN(parsedKeeperFee?.amount ?? '0').shiftedBy(2 - PRICE_ORACLE_DECIMALS)
+  })
 
   const onClose = useCallback(() => {
     useStore.setState({ keeperFeeModal: false })
   }, [])
 
+  const minKeeperFee = BN(creditManagerConfig?.keeper_fee_config?.min_fee?.amount ?? '0')
+  const isLessThanMin = amount.isLessThan(minKeeperFee?.shiftedBy(2 - PRICE_ORACLE_DECIMALS))
+
   useEffect(() => {
-    setAmount(BN(keeperFee.amount))
-  }, [keeperFee])
+    if (parsedKeeperFee?.amount) {
+      setAmount(BN(parsedKeeperFee.amount).shiftedBy(2 - PRICE_ORACLE_DECIMALS))
+    }
+  }, [parsedKeeperFee])
 
   const handleActionClick = () => {
-    setKeeperFee({ denom: keeperFee.denom, amount: amount.toString() })
+    if (!USD || !parsedKeeperFee.denom) return
+
+    setKeeperFee(
+      JSON.stringify({
+        denom: parsedKeeperFee.denom,
+        amount: amount.shiftedBy(PRICE_ORACLE_DECIMALS - 2).toString(),
+      }),
+    )
     onClose()
   }
 
   const onUpdateAmount = useCallback(
-    (amount: BigNumber) => {
+    (newAmount: BigNumber) => {
       if (!USD) return
-      setAmount(magnify(amount.toString(), USD))
+      setAmount(newAmount)
     },
     [USD],
   )
 
-  const modal = useStore((s) => s.keeperFeeModal)
-
-  if (!modal || !USD) return
+  if (!modal || !USD || !chainConfig.perps) return null
 
   return (
     <Modal
@@ -71,10 +99,11 @@ export default function KeeperFeeModal() {
           asset={USD}
           isUSD
         />
-        {amount.isLessThan(BN_ZERO_ONE) && (
+        {isLessThanMin && (
           <Callout type={CalloutType.WARNING}>
-            You can not set the Keeper Fee to less than $0.10 as it is the minimum amount for the
-            Keeper Fee.
+            You can not set the Keeper Fee to less than $
+            {minKeeperFee?.shiftedBy(-PRICE_ORACLE_DECIMALS).toString()} as it is the minimum amount
+            for the Keeper Fee.
           </Callout>
         )}
         <Text size='sm' className='text-white/60'>
@@ -84,7 +113,7 @@ export default function KeeperFeeModal() {
         </Text>
         <Button
           onClick={handleActionClick}
-          disabled={amount.isLessThan(BN_ZERO_ONE)}
+          disabled={isLessThanMin}
           className='w-full !text-base'
           color='tertiary'
           text='Done'
diff --git a/src/components/Modals/PerpsSlTpModal.tsx b/src/components/Modals/PerpsSlTpModal.tsx
index df5553ac5..f48d35480 100644
--- a/src/components/Modals/PerpsSlTpModal.tsx
+++ b/src/components/Modals/PerpsSlTpModal.tsx
@@ -5,13 +5,11 @@ import { Callout, CalloutType } from 'components/common/Callout'
 import Divider from 'components/common/Divider'
 import { TrashBin } from 'components/common/Icons'
 import Text from 'components/common/Text'
-import { getDefaultChainSettings } from 'constants/defaultSettings'
 import { LocalStorageKeys } from 'constants/localStorageKeys'
 import { BN_ZERO } from 'constants/math'
 import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
 import useAssets from 'hooks/assets/useAssets'
 import useDepositEnabledAssets from 'hooks/assets/useDepositEnabledAssets'
-import useChainConfig from 'hooks/chain/useChainConfig'
 import useLocalStorage from 'hooks/localStorage/useLocalStorage'
 import usePerpsAsset from 'hooks/perps/usePerpsAsset'
 import usePerpsConfig from 'hooks/perps/usePerpsConfig'
@@ -56,11 +54,11 @@ export default function PerpsSlTpModal() {
     return takeProfitPrice.minus(currentPrice).dividedBy(currentPrice).multipliedBy(100)
   }, [currentPrice, takeProfitPrice])
 
-  const chainConfig = useChainConfig()
+  const creditManagerConfig = useStore((s) => s.creditManagerConfig)
 
   const [keeperFee, _] = useLocalStorage(
     LocalStorageKeys.PERPS_KEEPER_FEE,
-    getDefaultChainSettings(chainConfig).perpsKeeperFee,
+    creditManagerConfig?.keeper_fee_config?.min_fee,
   )
 
   const feeToken = useMemo(
diff --git a/src/components/Wallet/WalletConnectProvider.tsx b/src/components/Wallet/WalletConnectProvider.tsx
index 3d13dfa8e..50001b9fc 100644
--- a/src/components/Wallet/WalletConnectProvider.tsx
+++ b/src/components/Wallet/WalletConnectProvider.tsx
@@ -66,6 +66,10 @@ const mobileProviders: WalletMobileProvider[] = [
   new CosmostationMobileProvider({
     networks: getSupportedChainsInfos(WalletID.CosmostationMobile),
   }),
+  new CosmiframeExtensionProvider({
+    allowedParentOrigins: DAODAO_ORIGINS,
+    networks: getSupportedChainsInfos(WalletID.DaoDao),
+  }) as any,
 ]
 
 const extensionProviders: WalletExtensionProvider[] = [
diff --git a/src/components/Wallet/WalletSelect.tsx b/src/components/Wallet/WalletSelect.tsx
index abac0a932..2c4c315d1 100644
--- a/src/components/Wallet/WalletSelect.tsx
+++ b/src/components/Wallet/WalletSelect.tsx
@@ -1,7 +1,7 @@
 import { useShuttle } from '@delphi-labs/shuttle-react'
 import moment from 'moment'
 import Image from 'next/image'
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useMemo, useState } from 'react'
 import { isMobile } from 'react-device-detect'
 import QRCode from 'react-qr-code'
 
@@ -15,7 +15,6 @@ import useChainConfig from 'hooks/chain/useChainConfig'
 import useCurrentWallet from 'hooks/wallet/useCurrentWallet'
 import useStore from 'store'
 import { WalletID } from 'types/enums'
-import { setNodeError } from 'utils/error'
 import { isAndroid, isIOS } from 'utils/mobile'
 
 interface Props {
@@ -60,7 +59,6 @@ export default function WalletSelect(props: Props) {
   const { extensionProviders, mobileProviders, mobileConnect } = useShuttle()
   const [qrCodeUrl, setQRCodeUrl] = useState('')
   const [error, setError] = useState(props.error)
-  const errorStore = useStore((s) => s.errorStore)
   const [isLoading, setIsLoading] = useState<string | boolean>(false)
   const recentWallet = useCurrentWallet()
   const handleConnectClick = (extensionProviderId: string) => {
@@ -152,6 +150,8 @@ export default function WalletSelect(props: Props) {
     }
   }, [error?.message, error?.title])
 
+  const showMobileWallets = useMemo(() => isMobile && !isDaodaoIframe, [isDaodaoIframe])
+
   if (qrCodeUrl)
     return (
       <FullOverlayContent
@@ -180,7 +180,40 @@ export default function WalletSelect(props: Props) {
       docs='wallet'
     >
       <div className='flex flex-wrap w-full gap-3'>
-        {!isMobile && (
+        {showMobileWallets ? (
+          mobileProviders.map((provider) => {
+            const walletId = provider.id as WalletID
+            return (
+              <React.Fragment key={walletId}>
+                {Array.from(provider.networks.values())
+                  .filter((network) => network.chainId === chainConfig.id)
+                  .map((network) => {
+                    return (
+                      <WalletOption
+                        key={`${walletId}-${network.chainId}`}
+                        name={
+                          isMobile
+                            ? WALLETS[walletId].name
+                            : (WALLETS[walletId].walletConnect ?? 'WalletConnect')
+                        }
+                        imageSrc={
+                          isMobile
+                            ? WALLETS[walletId].imageURL
+                            : (WALLETS[walletId].mobileImageURL ?? '/')
+                        }
+                        handleClick={() =>
+                          isKeplrMobileInApp
+                            ? handleConnectClick(walletId.replace('mobile-', ''))
+                            : handleMobileConnectClick(walletId, network.chainId)
+                        }
+                        showLoader={isLoading === walletId}
+                      />
+                    )
+                  })}
+              </React.Fragment>
+            )
+          })
+        ) : (
           <>
             {sortedExtensionProviders.map((provider) => {
               const walletId = provider.id as WalletID
@@ -216,39 +249,6 @@ export default function WalletSelect(props: Props) {
             })}
           </>
         )}
-        {!isDaodaoIframe &&
-          mobileProviders.map((provider) => {
-            const walletId = provider.id as WalletID
-            return (
-              <React.Fragment key={walletId}>
-                {Array.from(provider.networks.values())
-                  .filter((network) => network.chainId === chainConfig.id)
-                  .map((network) => {
-                    return (
-                      <WalletOption
-                        key={`${walletId}-${network.chainId}`}
-                        name={
-                          isMobile
-                            ? WALLETS[walletId].name
-                            : (WALLETS[walletId].walletConnect ?? 'WalletConnect')
-                        }
-                        imageSrc={
-                          isMobile
-                            ? WALLETS[walletId].imageURL
-                            : (WALLETS[walletId].mobileImageURL ?? '/')
-                        }
-                        handleClick={() =>
-                          isKeplrMobileInApp
-                            ? handleConnectClick(walletId.replace('mobile-', ''))
-                            : handleMobileConnectClick(walletId, network.chainId)
-                        }
-                        showLoader={isLoading === walletId}
-                      />
-                    )
-                  })}
-              </React.Fragment>
-            )
-          })}
       </div>
     </FullOverlayContent>
   )
diff --git a/src/components/account/AccountPerpPositionTable/Columns/Asset.tsx b/src/components/account/AccountPerpPositionTable/Columns/Asset.tsx
index 4c93473f0..ee9e47084 100644
--- a/src/components/account/AccountPerpPositionTable/Columns/Asset.tsx
+++ b/src/components/account/AccountPerpPositionTable/Columns/Asset.tsx
@@ -92,7 +92,7 @@ export default function Asset(props: Props) {
         {row.amount.isZero() ? (
           <CloseLabel />
         ) : (
-          <TradeDirection tradeDirection={row.tradeDirection} />
+          <TradeDirection tradeDirection={row.tradeDirection} type={row.type} />
         )}
       </Text>
     </Tooltip>
diff --git a/src/components/account/AccountStrategiesTable/Columns/StrategyAndValue.tsx b/src/components/account/AccountStrategiesTable/Columns/StrategyAndValue.tsx
index 050fec7e6..50a810c4b 100644
--- a/src/components/account/AccountStrategiesTable/Columns/StrategyAndValue.tsx
+++ b/src/components/account/AccountStrategiesTable/Columns/StrategyAndValue.tsx
@@ -10,7 +10,7 @@ import { BN } from 'utils/helpers'
 export const STRATEGY_AND_VALUE_META = {
   header: 'Strategy & Value',
   id: 'name',
-  meta: { className: 'w-40 min-w-40' },
+  meta: { className: 'min-w-40' },
 }
 
 interface Props {
diff --git a/src/components/common/AssetAmountInput.tsx b/src/components/common/AssetAmountInput.tsx
index 7d521e7e7..c8e0a24bb 100644
--- a/src/components/common/AssetAmountInput.tsx
+++ b/src/components/common/AssetAmountInput.tsx
@@ -5,6 +5,7 @@ import DisplayCurrency from 'components/common/DisplayCurrency'
 import NumberInput from 'components/common/NumberInput'
 import { BN_ZERO } from 'constants/math'
 import { BNCoin } from 'types/classes/BNCoin'
+import { formatValue } from 'utils/formatters'
 
 interface Props {
   label?: string
@@ -57,10 +58,6 @@ export default function AssetAmountInput(props: Props) {
     return val.isGreaterThan(1) ? val.toFixed(2) : val.toPrecision(2)
   }, [asset.decimals, max])
 
-  useEffect(() => {
-    asset.decimals = isUSD ? 0 : asset.decimals
-  }, [asset, isUSD])
-
   useEffect(() => {
     if (!disabled) return
     setAmount(BN_ZERO)
@@ -108,7 +105,7 @@ export default function AssetAmountInput(props: Props) {
               <div className='flex flex-row flex-1 mt-2'>
                 <span className='text-xs font-bold'>{maxButtonLabel ?? 'Max:'}</span>
                 <span className='mx-1 text-xs font-bold text-white text-opacity-60'>
-                  {maxValue}
+                  {formatValue(Number(maxValue), { abbreviated: false })}
                 </span>
                 <div
                   className='hover:cursor-pointer select-none bg-white bg-opacity-20 text-2xs !leading-3 font-bold py-0.5 px-1.5 rounded'
diff --git a/src/components/common/Banner.tsx b/src/components/common/Banner.tsx
index 98b4b94c3..7b11a9cb7 100644
--- a/src/components/common/Banner.tsx
+++ b/src/components/common/Banner.tsx
@@ -1,17 +1,20 @@
 import classNames from 'classnames'
+import AssetImage from 'components/common/assets/AssetImage'
+import Button from 'components/common/Button'
+import { Cross } from 'components/common/Icons'
 import Text from 'components/common/Text'
 import React from 'react'
-import AssetImage from 'components/common/assets/AssetImage'
 
 interface Props {
   asset?: Asset
   title: React.ReactNode
   description: string
   button: React.ReactNode
+  onClose?: () => void
 }
 
 export default function Banner(props: Props) {
-  const { asset, title, description, button } = props
+  const { asset, title, description, button, onClose } = props
 
   return (
     <div
@@ -27,10 +30,24 @@ export default function Banner(props: Props) {
           'blur-orb-secondary bg-purple',
         )}
       />
-      <div className='flex gap-2 md:gap-4 items-center'>
+      {onClose && (
+        <div className='absolute top-0 right-1'>
+          <Button
+            variant='transparent'
+            color='quaternary'
+            onClick={onClose}
+            leftIcon={<Cross />}
+            className='!p-1.5'
+            iconClassName='w-3 h-3'
+          />
+        </div>
+      )}
+      <div className='flex items-center gap-2 md:gap-4'>
         {asset && <AssetImage asset={asset} className='w-16 h-16 sm:w-10 sm:h-10' />}
         <div className='space-y-1 md:space-y-2'>
-          <Text size='sm'>{title}</Text>
+          <Text size='sm' className={classNames(onClose && 'pr-5')}>
+            {title}
+          </Text>
           <Text size='xs' className='text-white/50'>
             {description}
           </Text>
diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
index 73fefce49..8e5b64203 100644
--- a/src/components/common/Footer.tsx
+++ b/src/components/common/Footer.tsx
@@ -3,6 +3,7 @@ import { DocURL } from 'types/enums'
 
 import useAssets from 'hooks/assets/useAssets'
 import usePerpsVault from 'hooks/perps/usePerpsVault'
+import { useEffect } from 'react'
 import useStore from 'store'
 import packageInfo from '../../../package.json'
 
@@ -13,9 +14,11 @@ export default function Footer() {
   const storeAssets = useStore((s) => s.assets)
   const perpsBaseDenom = useStore((s) => s.perpsBaseDenom)
 
-  if (storeAssets.length === 0 && !isLoadingAssets) useStore.setState({ assets })
-  if (!perpsBaseDenom && !isLoadingVault && vault)
-    useStore.setState({ perpsBaseDenom: vault.denom })
+  useEffect(() => {
+    if (storeAssets.length === 0 && !isLoadingAssets) useStore.setState({ assets })
+    if (!perpsBaseDenom && !isLoadingVault && vault)
+      useStore.setState({ perpsBaseDenom: vault.denom })
+  }, [assets, isLoadingAssets, isLoadingVault, perpsBaseDenom, storeAssets.length, vault])
 
   const version = `v${packageInfo.version}`
   return (
diff --git a/src/components/common/LimitPriceInput.tsx b/src/components/common/LimitPriceInput.tsx
index f66189744..8196d9df0 100644
--- a/src/components/common/LimitPriceInput.tsx
+++ b/src/components/common/LimitPriceInput.tsx
@@ -4,6 +4,7 @@ import { BNCoin } from 'types/classes/BNCoin'
 import DisplayCurrency from 'components/common/DisplayCurrency'
 import classNames from 'classnames'
 import { BN_ZERO } from 'constants/math'
+import { getPerpsPriceDecimals } from 'utils/formatters'
 
 interface Props {
   label?: string
@@ -48,7 +49,7 @@ export default function LimitPriceInput(props: Props) {
             asset={{ ...asset, decimals: 0 }}
             amount={inputValue}
             className='border-none bg-transparent outline-none flex-1 !text-left'
-            maxDecimals={6}
+            maxDecimals={18}
             disabled={disabled}
             onChange={handleChange}
             onFocus={onFocus}
diff --git a/src/components/common/Toaster/index.tsx b/src/components/common/Toaster/index.tsx
index c10b387e7..cc5061203 100644
--- a/src/components/common/Toaster/index.tsx
+++ b/src/components/common/Toaster/index.tsx
@@ -100,6 +100,7 @@ export default function Toaster() {
       closeOnClick: false,
       hideProgressBar: true,
       autoClose: false,
+      position: 'bottom-right',
     })
   }
 
diff --git a/src/components/perps/BalancesTable/Columns/EntryPrice.tsx b/src/components/perps/BalancesTable/Columns/EntryPrice.tsx
index 20d7b233e..958fb8282 100644
--- a/src/components/perps/BalancesTable/Columns/EntryPrice.tsx
+++ b/src/components/perps/BalancesTable/Columns/EntryPrice.tsx
@@ -10,13 +10,13 @@ export const ENTRY_PRICE_META = (isOrderTable: boolean) => {
     accessorKey: 'entryPrice',
     header: () => (
       <div className='flex flex-col gap-1'>
-        <Text size='xs'>{isOrderTable ? 'Limit Price' : 'Entry Price'}</Text>
+        <Text size='xs'>{isOrderTable ? 'Trigger Condition' : 'Entry Price'}</Text>
         <Text size='xs' className='text-white/40'>
           Current Price
         </Text>
       </div>
     ),
-    meta: { className: 'min-w-40 w-40' },
+    meta: { className: 'min-w-48 w-48' },
   }
 }
 
@@ -24,28 +24,61 @@ type Props = {
   entryPrice: BigNumber
   currentPrice: BigNumber
   asset: Asset
+  type: string
+  tradeDirection: 'long' | 'short'
 }
 
 export default function EntryPrice(props: Props) {
   const entryPrice = props.entryPrice.shiftedBy(props.asset.decimals - PRICE_ORACLE_DECIMALS)
-
   const currentPrice = props.currentPrice.shiftedBy(props.asset.decimals - PRICE_ORACLE_DECIMALS)
 
+  const getDisplayValue = () => {
+    const priceDisplay = (
+      <DisplayCurrency
+        coin={BNCoin.fromDenomAndBigNumber('usd', entryPrice)}
+        options={{
+          maxDecimals: getPerpsPriceDecimals(entryPrice),
+          abbreviated: false,
+        }}
+        showDetailedPrice
+      />
+    )
+
+    if (props.type === 'market') {
+      return <div className='flex flex-col items-end gap-1'>{priceDisplay}</div>
+    }
+
+    if (props.type === 'limit') {
+      return (
+        <div className='flex flex-col items-end gap-1'>
+          <div className='flex items-center gap-1'>
+            <Text size='xs'>{props.tradeDirection === 'long' ? '<=' : '>='}</Text>
+            {priceDisplay}
+          </div>
+        </div>
+      )
+    }
+
+    if (props.type === 'stop') {
+      return (
+        <div className='flex flex-col items-end gap-1'>
+          <div className='flex items-center gap-1'>
+            <Text size='xs'>{props.tradeDirection === 'long' ? '>=' : '<='}</Text>
+            {priceDisplay}
+          </div>
+        </div>
+      )
+    }
+
+    return null
+  }
+
   return (
     <TitleAndSubCell
-      title={
-        <DisplayCurrency
-          coin={BNCoin.fromDenomAndBigNumber('usd', entryPrice ?? 0)}
-          options={{
-            maxDecimals: getPerpsPriceDecimals(entryPrice),
-            abbreviated: false,
-          }}
-          showDetailedPrice
-        />
-      }
+      title={getDisplayValue()}
       sub={
         <DisplayCurrency
-          coin={BNCoin.fromDenomAndBigNumber('usd', currentPrice ?? 0)}
+          coin={BNCoin.fromDenomAndBigNumber('usd', currentPrice)}
           options={{
             maxDecimals: getPerpsPriceDecimals(currentPrice),
             minDecimals: getPerpsPriceDecimals(currentPrice),
diff --git a/src/components/perps/BalancesTable/Columns/Manage.tsx b/src/components/perps/BalancesTable/Columns/Manage.tsx
index 02936f307..0e4f8afcb 100644
--- a/src/components/perps/BalancesTable/Columns/Manage.tsx
+++ b/src/components/perps/BalancesTable/Columns/Manage.tsx
@@ -212,7 +212,7 @@ export default function Manage(props: Props) {
     ],
   )
 
-  if (props.perpPosition.type === 'limit')
+  if (props.perpPosition.type === 'limit' || props.perpPosition.type === 'stop')
     return (
       <div className='flex justify-end'>
         <ActionButton
diff --git a/src/components/perps/BalancesTable/Columns/Size.tsx b/src/components/perps/BalancesTable/Columns/Size.tsx
index 2a5559a48..34646afcd 100644
--- a/src/components/perps/BalancesTable/Columns/Size.tsx
+++ b/src/components/perps/BalancesTable/Columns/Size.tsx
@@ -8,6 +8,7 @@ import { BNCoin } from 'types/classes/BNCoin'
 import { demagnify, getPerpsPriceDecimals } from 'utils/formatters'
 
 export const SIZE_META = {
+  id: 'size',
   accessorKey: 'size',
   header: () => (
     <div className='flex flex-col gap-1'>
@@ -37,7 +38,7 @@ export default function Size(props: Props) {
     <TitleAndSubCell
       title={
         <FormattedNumber
-          amount={Math.abs(Number(demagnify(amount, asset).toFixed(2)))}
+          amount={Math.abs(Number(demagnify(amount, asset)))}
           options={{ maxDecimals: props.asset.decimals }}
           className='text-xs'
         />
diff --git a/src/components/perps/BalancesTable/Columns/Type.tsx b/src/components/perps/BalancesTable/Columns/Status.tsx
similarity index 60%
rename from src/components/perps/BalancesTable/Columns/Type.tsx
rename to src/components/perps/BalancesTable/Columns/Status.tsx
index 84fe5f2bd..3285a47aa 100644
--- a/src/components/perps/BalancesTable/Columns/Type.tsx
+++ b/src/components/perps/BalancesTable/Columns/Status.tsx
@@ -1,9 +1,9 @@
 import Text from 'components/common/Text'
 
-export const TYPE_META = {
+export const STATUS_META = {
   accessorKey: 'type',
-  header: 'Type',
-  id: 'type',
+  header: 'Status',
+  id: 'status',
   meta: { className: 'min-w-20 w-20' },
 }
 
@@ -14,13 +14,15 @@ interface Props {
   showIndicators: boolean
 }
 
-export function Type({ type, hasStopLoss, hasTakeProfit, showIndicators }: Props) {
+export function Status({ type, hasStopLoss, hasTakeProfit, showIndicators }: Props) {
+  const displayStatus = type === 'market' ? 'Open' : type
+
   return (
-    <div className='flex flex-col items-start'>
-      <Text size='sm' className='capitalize'>
-        {type}
+    <div className='flex flex-col items-end'>
+      <Text size='xs' className='capitalize'>
+        {displayStatus}
       </Text>
-      {showIndicators && (hasStopLoss || hasTakeProfit) && (
+      {/* {showIndicators && (hasStopLoss || hasTakeProfit) && (
         <div className='flex items-center justify-center gap-1 mt-1'>
           {hasStopLoss && (
             <span className='px-1 text-xs rounded bg-white/10 text-white/60'>SL</span>
@@ -29,7 +31,7 @@ export function Type({ type, hasStopLoss, hasTakeProfit, showIndicators }: Props
             <span className='px-1 text-xs rounded bg-white/10 text-white/60'>TP</span>
           )}
         </div>
-      )}
+      )} */}
     </div>
   )
 }
diff --git a/src/components/perps/BalancesTable/Columns/TradeDirection.tsx b/src/components/perps/BalancesTable/Columns/TradeDirection.tsx
index 84f08ec46..897103192 100644
--- a/src/components/perps/BalancesTable/Columns/TradeDirection.tsx
+++ b/src/components/perps/BalancesTable/Columns/TradeDirection.tsx
@@ -1,56 +1,111 @@
 import classNames from 'classnames'
 import { ArrowRight } from 'components/common/Icons'
 import Text from 'components/common/Text'
+import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
+import { byDenom } from 'utils/array'
+import { BN } from 'utils/helpers'
 
-export const PERP_TYPE_META = {
+export const TRADE_DIRECTION_META = {
+  id: 'direction',
   accessorKey: 'tradeDirection',
-  header: 'Side',
-  meta: { className: 'w-30' },
+  header: 'Direction',
+  meta: { className: 'w-40 min-w-40' },
 }
 
-type Props = {
+interface Props {
   tradeDirection: TradeDirection
-  className?: string
-  directionChange?: boolean
+  reduce_only?: boolean
   previousTradeDirection?: TradeDirection
+  className?: string
+  denom?: string
+  amount?: BigNumber
+  type: PositionType
+  showPositionEffect?: boolean
+}
+
+function getPositionEffect(
+  currentPosition: PerpsPosition | undefined,
+  orderDirection: TradeDirection,
+  orderAmount: BigNumber,
+  orderType: PositionType,
+  isReduceOnly?: boolean,
+): string {
+  if (!currentPosition) return ''
+  if (orderType === 'market') return ''
+
+  if (currentPosition.tradeDirection === orderDirection) return 'Increase Position'
+
+  if (isReduceOnly) {
+    if (orderAmount.abs().isGreaterThan(currentPosition.amount.abs())) return 'Close Position'
+    return 'Reduce Position'
+  }
+
+  if (currentPosition.tradeDirection !== orderDirection) {
+    if (orderAmount.abs().isGreaterThan(currentPosition.amount.abs())) return 'Flip Position'
+    if (orderAmount.abs().isEqualTo(currentPosition.amount.abs())) return 'Close Position'
+    return 'Reduce Position'
+  }
+
+  return ''
 }
 
-export default function TradeDirection(props: Props) {
-  const { tradeDirection, className, previousTradeDirection } = props
+export default function TradeDirection({
+  tradeDirection,
+  reduce_only,
+  previousTradeDirection,
+  className,
+  denom,
+  amount,
+  type,
+  showPositionEffect = false,
+}: Props) {
+  const currentAccount = useCurrentAccount()
+  const currentPosition = currentAccount?.perps.find(byDenom(denom ?? ''))
+
+  const positionEffect = showPositionEffect
+    ? amount && denom
+      ? getPositionEffect(currentPosition, tradeDirection, BN(amount), type, reduce_only)
+      : ''
+    : ''
+
   return (
-    <div className='inline-flex items-center gap-1'>
-      {previousTradeDirection && (
-        <>
-          <Text
-            size='xs'
-            tag='div'
-            className={classNames(
-              'capitalize px-2 py-0.5 rounded-sm flex items-center',
-              previousTradeDirection === 'short' && 'text-error bg-error/20',
-              previousTradeDirection === 'long' && 'text-success bg-success/20',
-              className,
-            )}
-          >
-            {previousTradeDirection}
-          </Text>
-
-          <div className='w-4'>
-            <ArrowRight />
-          </div>
-        </>
-      )}
-      <Text
-        size='xs'
-        tag='div'
-        className={classNames(
-          'capitalize px-2 py-0.5 rounded-sm flex items-center',
-          tradeDirection === 'short' && 'text-error bg-error/20',
-          tradeDirection === 'long' && 'text-success bg-success/20',
-          className,
+    <div className={classNames('flex flex-col items-end gap-0.5', className)}>
+      <div className='inline-flex items-center justify-center gap-1'>
+        {previousTradeDirection && (
+          <>
+            <Text
+              size='xs'
+              tag='div'
+              className={classNames(
+                'capitalize px-2 py-0.5 rounded-sm flex items-center justify-center',
+                previousTradeDirection === 'short' && 'text-error bg-error/20',
+                previousTradeDirection === 'long' && 'text-success bg-success/20',
+              )}
+            >
+              {previousTradeDirection}
+            </Text>
+            <div className='w-4'>
+              <ArrowRight />
+            </div>
+          </>
         )}
-      >
-        {tradeDirection}
-      </Text>
+        <Text
+          size='xs'
+          tag='div'
+          className={classNames(
+            'capitalize px-2 py-0.5 rounded-sm flex items-center justify-center',
+            tradeDirection === 'short' && 'text-error bg-error/20',
+            tradeDirection === 'long' && 'text-success bg-success/20',
+          )}
+        >
+          {tradeDirection}
+        </Text>
+      </div>
+      {positionEffect && (
+        <Text size='xs' className='text-white/50'>
+          {positionEffect}
+        </Text>
+      )}
     </div>
   )
 }
diff --git a/src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx b/src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx
index 060efa713..b4d1ac2cc 100644
--- a/src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx
+++ b/src/components/perps/BalancesTable/Columns/usePerpsBalancesColumns.tsx
@@ -7,10 +7,10 @@ import Manage, { MANAGE_META } from 'components/perps/BalancesTable/Columns/Mana
 import { PERP_NAME_META, PerpName } from 'components/perps/BalancesTable/Columns/PerpName'
 import PnL, { PNL_META } from 'components/perps/BalancesTable/Columns/PnL'
 import Size, { SIZE_META, sizeSortingFn } from 'components/perps/BalancesTable/Columns/Size'
+import { Status, STATUS_META } from 'components/perps/BalancesTable/Columns/Status'
 import TradeDirection, {
-  PERP_TYPE_META,
+  TRADE_DIRECTION_META,
 } from 'components/perps/BalancesTable/Columns/TradeDirection'
-import { Type, TYPE_META } from 'components/perps/BalancesTable/Columns/Type'
 import { PRICE_ORACLE_DECIMALS } from 'constants/query'
 import usePerpsLimitOrderRows from 'hooks/perps/usePerpsLimitOrdersRows'
 import { demagnify } from 'utils/formatters'
@@ -32,31 +32,41 @@ export default function usePerpsBalancesColumns(props: Props) {
         cell: ({ row }) => <PerpName asset={row.original.asset} />,
       },
       {
-        ...PERP_TYPE_META,
-        cell: ({ row }) => <TradeDirection tradeDirection={row.original.tradeDirection} />,
+        ...TRADE_DIRECTION_META,
+        cell: ({ row }) => {
+          const { type, tradeDirection, reduce_only, amount, denom } = row.original
+          return (
+            <TradeDirection
+              tradeDirection={tradeDirection}
+              reduce_only={type !== 'market' && reduce_only}
+              amount={amount}
+              denom={denom}
+              type={type}
+              showPositionEffect={isOrderTable}
+            />
+          )
+        },
       },
       {
         ...SIZE_META,
+        id: 'size',
         cell: ({ row }) => {
           const { asset, amount, type, entryPrice } = row.original
           const demagnifiedAmount = BN(demagnify(amount, asset))
 
           let value
-          if (type === 'limit') {
-            // For limit orders, calculate adjusted value
+          if (type === 'market') {
+            value = demagnifiedAmount.times(BN(asset.price?.amount || 0))
+          } else {
             value = demagnifiedAmount
               .times(entryPrice)
               .shiftedBy(asset.decimals - PRICE_ORACLE_DECIMALS)
-          } else {
-            // For market orders/positions, use value directly
-            value = demagnifiedAmount.times(BN(asset.price?.amount || 0))
           }
 
           return <Size amount={row.original.amount} asset={row.original.asset} value={value} />
         },
         sortingFn: sizeSortingFn,
       },
-
       ...(isOrderTable
         ? []
         : [
@@ -70,11 +80,14 @@ export default function usePerpsBalancesColumns(props: Props) {
           ]),
       {
         ...ENTRY_PRICE_META(isOrderTable),
+        id: isOrderTable ? 'triggerPrice' : 'entryPrice',
         cell: ({ row }) => (
           <EntryPrice
             entryPrice={row.original.entryPrice}
             currentPrice={row.original.currentPrice}
             asset={row.original.asset}
+            type={row.original.type}
+            tradeDirection={row.original.tradeDirection}
           />
         ),
       },
@@ -98,7 +111,7 @@ export default function usePerpsBalancesColumns(props: Props) {
 
   const typeColumn = useMemo<ColumnDef<PerpPositionRow>>(
     () => ({
-      ...TYPE_META,
+      ...STATUS_META,
       cell: ({ row }) => {
         const position = row.original
         const { hasStopLoss, hasTakeProfit } = checkStopLossAndTakeProfit(
@@ -106,7 +119,7 @@ export default function usePerpsBalancesColumns(props: Props) {
           activeLimitOrders,
         )
         return (
-          <Type
+          <Status
             type={position.type}
             hasStopLoss={hasStopLoss}
             hasTakeProfit={hasTakeProfit}
diff --git a/src/components/perps/BalancesTable/index.tsx b/src/components/perps/BalancesTable/index.tsx
index 6c79805db..0ed0b1690 100644
--- a/src/components/perps/BalancesTable/index.tsx
+++ b/src/components/perps/BalancesTable/index.tsx
@@ -14,6 +14,7 @@ export default function PerpsBalancesTable() {
   const activeLimitOrders = usePerpsLimitOrderRows()
   const columns = usePerpsBalancesColumns({ isOrderTable: false })
   const limitOrderColumns = usePerpsBalancesColumns({ isOrderTable: true })
+
   const [searchParams, setSearchParams] = useSearchParams()
 
   const onClickRow = useCallback(
@@ -31,6 +32,7 @@ export default function PerpsBalancesTable() {
     () => [
       {
         title: 'Perp Positions',
+        id: 'perp-positions',
         renderContent: () => (
           <Table
             title='Perp Positions'
@@ -43,11 +45,11 @@ export default function PerpsBalancesTable() {
         ),
       },
       {
-        title: 'Open Limit Orders',
+        title: 'Open Orders',
         notificationCount: activeLimitOrders.length > 0 ? activeLimitOrders.length : undefined,
         renderContent: () => (
           <Table
-            title='Open Limit Orders'
+            title='Open Orders'
             columns={limitOrderColumns}
             data={activeLimitOrders}
             initialSorting={[]}
diff --git a/src/components/perps/BalancesTable/usePerpsBalancesData.ts b/src/components/perps/BalancesTable/usePerpsBalancesData.ts
index 4a00ceaea..ed45c0a74 100644
--- a/src/components/perps/BalancesTable/usePerpsBalancesData.ts
+++ b/src/components/perps/BalancesTable/usePerpsBalancesData.ts
@@ -1,16 +1,14 @@
 import { useMemo } from 'react'
 
-import { BN_ONE, BN_ZERO } from 'constants/math'
+import { BN_ZERO } from 'constants/math'
 import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
 
 import useDepositEnabledAssets from 'hooks/assets/useDepositEnabledAssets'
 import usePerpsEnabledAssets from 'hooks/assets/usePerpsEnabledAssets'
 import usePerpsConfig from 'hooks/perps/usePerpsConfig'
-import usePerpsLimitOrders from 'hooks/perps/usePerpsLimitOrders'
-import { BNCoin } from 'types/classes/BNCoin'
 import { getAccountNetValue } from 'utils/accounts'
 import { byDenom } from 'utils/array'
-import { demagnify, getCoinValue } from 'utils/formatters'
+import { demagnify } from 'utils/formatters'
 import { BN } from 'utils/helpers'
 import { PRICE_ORACLE_DECIMALS } from 'constants/query'
 import useHealthComputer from 'hooks/health-computer/useHealthComputer'
@@ -18,9 +16,7 @@ import useHealthComputer from 'hooks/health-computer/useHealthComputer'
 export default function usePerpsBalancesTable() {
   const currentAccount = useCurrentAccount()
   const perpAssets = usePerpsEnabledAssets()
-  const { data: limitOrders } = usePerpsLimitOrders()
   const { data: perpsConfig } = usePerpsConfig()
-
   const allAssets = useDepositEnabledAssets()
   const { computeLiquidationPrice } = useHealthComputer(currentAccount)
 
@@ -29,7 +25,7 @@ export default function usePerpsBalancesTable() {
 
     const netValue = getAccountNetValue(currentAccount, allAssets)
 
-    const activePerpsPositions = currentAccount.perps.map((position) => {
+    return currentAccount.perps.map((position) => {
       const asset = perpAssets.find(byDenom(position.denom))!
       const liquidationPrice = computeLiquidationPrice(position.denom, 'perp')
 
@@ -40,6 +36,7 @@ export default function usePerpsBalancesTable() {
         denom: position.denom,
         baseDenom: position.baseDenom,
         type: 'market',
+        reduce_only: position.reduce_only,
         pnl: position.pnl,
         entryPrice: position.entryPrice,
         currentPrice: position.currentPrice,
@@ -51,59 +48,5 @@ export default function usePerpsBalancesTable() {
           .toNumber(),
       } as PerpPositionRow
     })
-
-    if (!limitOrders) return activePerpsPositions
-
-    if (!perpsConfig?.base_denom) return activePerpsPositions
-    const zeroCoin = BNCoin.fromDenomAndBigNumber(perpsConfig.base_denom, BN_ZERO)
-    const activeLimitOrders: PerpPositionRow[] = []
-    limitOrders
-      .filter((order) => order['account_id'] === currentAccount.id)
-      .forEach((limitOrder) => {
-        const limitOrderAction = limitOrder.order.actions.find((action) =>
-          action.toString().includes('execute_perp_order'),
-        ) as ExceutePerpsOrder | undefined
-        const limitOrderCondition = limitOrder.order.conditions.find((condition) =>
-          condition.toString().includes('oracle_price'),
-        ) as TriggerCondition | undefined
-
-        if (!limitOrderAction || !limitOrderCondition) return
-        const perpOrder = limitOrderAction.execute_perp_order
-        const perpTrigger = limitOrderCondition.oracle_price
-        const asset = perpAssets.find(byDenom(perpOrder.denom))!
-        const amount = BN(perpOrder.order_size)
-        const liquidationPrice = computeLiquidationPrice(perpOrder.denom, 'asset')
-        if (!asset) return
-        activeLimitOrders.push({
-          orderId: limitOrder.order.order_id,
-          asset,
-          denom: perpOrder.denom,
-          baseDenom: perpsConfig.base_denom,
-          tradeDirection: BN(perpOrder.order_size).isGreaterThanOrEqualTo(0) ? 'long' : 'short',
-          amount: amount.abs(),
-          type: 'limit',
-          pnl: {
-            net: BNCoin.fromCoin(limitOrder.order.keeper_fee).negated(),
-            realized: {
-              fees: zeroCoin,
-              funding: zeroCoin,
-              net: zeroCoin,
-              price: zeroCoin,
-            },
-            unrealized: {
-              fees: zeroCoin,
-              funding: zeroCoin,
-              net: zeroCoin,
-              price: zeroCoin,
-            },
-          },
-          entryPrice: BN(perpTrigger.price),
-          currentPrice: asset.price?.amount ?? BN_ZERO,
-          liquidationPrice: BN(liquidationPrice ?? '0'),
-          leverage: 1,
-        })
-      })
-
-    return [...activePerpsPositions, ...activeLimitOrders]
-  }, [currentAccount, perpsConfig, allAssets, limitOrders, perpAssets, computeLiquidationPrice])
+  }, [currentAccount, perpsConfig, allAssets, perpAssets, computeLiquidationPrice])
 }
diff --git a/src/components/perps/Module/KeeperFee.tsx b/src/components/perps/Module/KeeperFee.tsx
index b9ffafff0..1c2a69258 100644
--- a/src/components/perps/Module/KeeperFee.tsx
+++ b/src/components/perps/Module/KeeperFee.tsx
@@ -1,28 +1,47 @@
 import Button from 'components/common/Button'
 import DisplayCurrency from 'components/common/DisplayCurrency'
 import Text from 'components/common/Text'
-import { getDefaultChainSettings } from 'constants/defaultSettings'
 import { LocalStorageKeys } from 'constants/localStorageKeys'
 import useChainConfig from 'hooks/chain/useChainConfig'
 import useLocalStorage from 'hooks/localStorage/useLocalStorage'
+import { useMemo } from 'react'
 import useStore from 'store'
 import { BNCoin } from 'types/classes/BNCoin'
+import { BN } from 'utils/helpers'
 
 export default function KeeperFee() {
   const chainConfig = useChainConfig()
-  const [keeperFee] = useLocalStorage<Coin>(
-    LocalStorageKeys.PERPS_KEEPER_FEE,
-    getDefaultChainSettings(chainConfig).perpsKeeperFee,
+  const creditManagerConfig = useStore((s) => s.creditManagerConfig)
+
+  const defaultKeeperFee = JSON.stringify(
+    creditManagerConfig?.keeper_fee_config?.min_fee ?? {
+      denom: '',
+      amount: '0',
+    },
   )
 
-  if (!keeperFee) return
+  const [keeperFee] = useLocalStorage(LocalStorageKeys.PERPS_KEEPER_FEE, defaultKeeperFee)
+
+  const parsedKeeperFee = useMemo(() => {
+    try {
+      return typeof keeperFee === 'string' ? JSON.parse(keeperFee) : keeperFee
+    } catch {
+      return { denom: '', amount: '0' }
+    }
+  }, [keeperFee])
+
+  if (!parsedKeeperFee || !chainConfig.perps) return null
+
   return (
     <div className='flex flex-col w-full border rounded bg-white/5 border-white/20'>
       <div className='flex gap-1 px-3 py-4 align-center'>
         <Text size='xs' className='flex flex-grow font-bold'>
           Keeper Fee
         </Text>
-        <DisplayCurrency coin={BNCoin.fromCoin(keeperFee)} className='flex text-xs text-white/40' />
+        <DisplayCurrency
+          coin={BNCoin.fromDenomAndBigNumber(parsedKeeperFee.denom, BN(parsedKeeperFee.amount))}
+          className='flex text-xs text-white/40'
+        />
         <Button
           text='Edit'
           className='!py-0 !pr-0 ml-2 text-xs border-l border-white/20 !text-martian-red hover:!text-mars !min-h-0'
diff --git a/src/components/perps/Module/PerpsModule.tsx b/src/components/perps/Module/PerpsModule.tsx
index e6acd6917..18d40e20d 100644
--- a/src/components/perps/Module/PerpsModule.tsx
+++ b/src/components/perps/Module/PerpsModule.tsx
@@ -6,6 +6,7 @@ import { Callout, CalloutType } from 'components/common/Callout'
 import Card from 'components/common/Card'
 import Divider from 'components/common/Divider'
 import LeverageSlider from 'components/common/LeverageSlider'
+import LimitPriceInput from 'components/common/LimitPriceInput'
 import OrderTypeSelector from 'components/common/OrderTypeSelector'
 import SwitchWithLabel from 'components/common/Switch/SwitchWithLabel'
 import Text from 'components/common/Text'
@@ -26,6 +27,7 @@ import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
 import { useUpdatedAccount } from 'hooks/accounts/useUpdatedAccount'
 import useAssets from 'hooks/assets/useAssets'
 import usePerpsAsset from 'hooks/perps/usePerpsAsset'
+import { usePerpsOrderForm } from 'hooks/perps/usePerpsOrderForm'
 import usePerpsVault from 'hooks/perps/usePerpsVault'
 import useTradingFeeAndPrice from 'hooks/perps/useTradingFeeAndPrice'
 import useAutoLend from 'hooks/wallet/useAutoLend'
@@ -34,8 +36,6 @@ import { OrderType } from 'types/enums'
 import { byDenom } from 'utils/array'
 import getPerpsPosition from 'utils/getPerpsPosition'
 import { capitalizeFirstLetter } from 'utils/helpers'
-import { usePerpsOrderForm } from 'hooks/perps/usePerpsOrderForm'
-import LimitPriceInput from 'components/common/LimitPriceInput'
 
 export function PerpsModule() {
   const [tradeDirection, setTradeDirection] = useState<TradeDirection>('long')
@@ -57,15 +57,14 @@ export function PerpsModule() {
   const [stopPriceInfo, setStopPriceInfo] = useState<CallOut | undefined>(DEFAULT_STOP_PRICE_INFO)
 
   const isStopOrder = selectedOrderType === OrderType.STOP
-  const [stopPrice, setStopPrice] = useState<BigNumber>(BN_ZERO)
+
+  const { limitPrice, setLimitPrice, setStopPrice, orderType, stopPrice } = usePerpsOrderForm()
 
   useEffect(() => {
     if (!isStopOrder) {
       setStopPrice(BN_ZERO)
     }
-  }, [isStopOrder])
-
-  const { limitPrice, setLimitPrice, orderType } = usePerpsOrderForm()
+  }, [isStopOrder, setStopPrice])
 
   useEffect(() => {
     if (orderType === 'limit') {
@@ -127,10 +126,10 @@ export function PerpsModule() {
       setReduceOnlyWarning(
         'This order violates the Reduce-Only setting. Reduce-Only orders can only decrease your current position size or close it entirely. Please uncheck Reduce-Only or adjust your order size.',
       )
-      return false
+    } else {
+      setReduceOnlyWarning(null)
     }
 
-    setReduceOnlyWarning(null)
     return true
   }, [isReduceOnly, currentPerpPosition, amount])
 
@@ -160,8 +159,16 @@ export function PerpsModule() {
       setStopPrice(BN_ZERO)
       setSelectedOrderType(orderType)
       setIsReduceOnly(false)
+      simulatePerps(currentPerpPosition, isAutoLendEnabledForCurrentAccount)
     },
-    [updateAmount, setLimitPrice],
+    [
+      updateAmount,
+      setLimitPrice,
+      setStopPrice,
+      simulatePerps,
+      currentPerpPosition,
+      isAutoLendEnabledForCurrentAccount,
+    ],
   )
 
   const onChangeStopTradeDirection = useCallback(
@@ -171,7 +178,7 @@ export function PerpsModule() {
       setStopPrice(BN_ZERO)
       setIsReduceOnly(false)
     },
-    [updateAmount],
+    [updateAmount, setStopPrice],
   )
 
   const onChangeAmount = useCallback(
@@ -248,23 +255,7 @@ export function PerpsModule() {
 
   useEffect(() => {
     if (!tradingFee || !perpsVault || perpsVaultModal) return
-    if (isLimitOrder) {
-      return
-    }
-
-    if (isStopOrder && currentPerpPosition) {
-      const newPosition = getPerpsPosition(
-        perpsVault.denom,
-        perpsAsset,
-        currentPerpPosition.amount.negated(),
-        stopTradeDirection,
-        tradingFee,
-        currentPerpPosition,
-        stopPrice,
-      )
-      simulatePerps(newPosition, isAutoLendEnabledForCurrentAccount)
-      return
-    }
+    if (isLimitOrder || isStopOrder) return
 
     const newAmount = currentPerpPosition?.amount.plus(amount) ?? amount
     const previousTradeDirection = currentPerpPosition?.amount.isLessThan(0) ? 'short' : 'long'
@@ -302,15 +293,14 @@ export function PerpsModule() {
       amount.isZero() || amount.isGreaterThan(maxAmount) || warningMessages.isNotEmpty()
 
     if (isStopOrder) {
-      if (!currentPerpPosition || stopPrice.isZero()) return true
+      if (stopPrice.isZero()) return true
       const currentPrice = perpsAsset?.price?.amount ?? BN_ZERO
       if (currentPrice.isZero()) return true
 
-      if (currentPerpPosition.tradeDirection === 'long') {
-        return stopPrice.isGreaterThanOrEqualTo(currentPrice)
+      if (stopTradeDirection === 'long') {
+        return stopPrice.isLessThanOrEqualTo(currentPrice)
       }
-
-      return stopPrice.isLessThanOrEqualTo(currentPrice)
+      return stopPrice.isGreaterThanOrEqualTo(currentPrice)
     }
 
     if (isLimitOrder) {
@@ -323,8 +313,8 @@ export function PerpsModule() {
     maxAmount,
     warningMessages,
     isStopOrder,
-    currentPerpPosition,
     stopPrice,
+    stopTradeDirection,
     perpsAsset?.price?.amount,
     isLimitOrder,
     limitPriceInfo,
@@ -357,10 +347,10 @@ export function PerpsModule() {
 
   const effectiveLeverage = useMemo(() => {
     if (amount.isGreaterThan(maxAmount)) {
-      return 0
+      return maxLeverage
     }
     return Math.max(leverage, 0)
-  }, [amount, maxAmount, leverage])
+  }, [amount, maxAmount, leverage, maxLeverage])
 
   const isAmountExceedingMax = useMemo(() => {
     return amount.isGreaterThan(maxAmount)
@@ -464,7 +454,7 @@ export function PerpsModule() {
               value={effectiveLeverage}
               onChange={onChangeLeverage}
               type={tradeDirection}
-              disabled={isDisabledAmountInput || amount.isGreaterThan(maxAmount)}
+              disabled={isDisabledAmountInput}
             />
             {maxLeverage > 5 && (
               <LeverageButtons
@@ -510,7 +500,10 @@ export function PerpsModule() {
           previousTradeDirection={previousTradeDirection}
           previousLeverage={previousLeverage}
           hasActivePosition={hasActivePosition}
-          onTxExecuted={() => updateAmount(BN_ZERO)}
+          onTxExecuted={() => {
+            updateAmount(BN_ZERO)
+            simulatePerps(currentPerpPosition, isAutoLendEnabledForCurrentAccount)
+          }}
           disabled={isDisabledExecution}
           orderType={selectedOrderType}
           limitPrice={isLimitOrder ? limitPrice : BN_ZERO}
diff --git a/src/components/perps/Module/Summary.tsx b/src/components/perps/Module/Summary.tsx
index 15d5fd5cf..74566ee41 100644
--- a/src/components/perps/Module/Summary.tsx
+++ b/src/components/perps/Module/Summary.tsx
@@ -73,10 +73,12 @@ export default function PerpsSummary(props: Props) {
   const updatedAccount = useStore((s) => s.updatedAccount)
   const { isAutoLendEnabledForCurrentAccount } = useAutoLend()
   const chainConfig = useChainConfig()
+  const creditManagerConfig = useStore((s) => s.creditManagerConfig)
   const [keeperFee, _] = useLocalStorage(
     LocalStorageKeys.PERPS_KEEPER_FEE,
-    getDefaultChainSettings(chainConfig).perpsKeeperFee,
+    creditManagerConfig?.keeper_fee_config?.min_fee,
   )
+
   const currentAccount = useCurrentAccount()
   const isLimitOrder = props.orderType === OrderType.LIMIT
   const isStopOrder = props.orderType === OrderType.STOP
@@ -151,9 +153,9 @@ export default function PerpsSummary(props: Props) {
       let comparison: 'less_than' | 'greater_than'
 
       if (tradeDirection === 'long') {
-        comparison = 'greater_than'
-      } else {
         comparison = 'less_than'
+      } else {
+        comparison = 'greater_than'
       }
 
       await submitLimitOrder({
@@ -238,6 +240,7 @@ export default function PerpsSummary(props: Props) {
                   ? tradeDirection
                   : (previousTradeDirection ?? 'long')
               }
+              type={isLimitOrder ? 'limit' : 'stop'}
               className='capitalize !text-sm'
             />
           )}
@@ -378,7 +381,7 @@ function ManageSummary(
   } = props
 
   const size = useMemo(() => previousAmount.plus(amount).abs(), [amount, previousAmount])
-
+  const isLimitOrder = props.orderType === OrderType.LIMIT
   if (amount.isZero()) return null
 
   return (
@@ -402,6 +405,7 @@ function ManageSummary(
             tradeDirection={
               isNewPosition || isDirectionChange ? tradeDirection : previousTradeDirection
             }
+            type={isLimitOrder ? 'limit' : 'stop'}
             previousTradeDirection={isDirectionChange ? previousTradeDirection : undefined}
           />
         </SummaryLine>
@@ -423,17 +427,29 @@ function ManageSummary(
         />
       </SummaryLine>
       <SummaryLine label='Leverage' contentClassName='flex gap-1 pt-2'>
-        {previousLeverage && !previousAmount.isZero() && (
-          <>
+        {previousLeverage && !previousAmount.isZero() ? (
+          <div className='flex items-center gap-1'>
             <span>{formatLeverage(previousLeverage)}</span>
             <div className='w-4'>
               <ArrowRight
-                className={classNames(leverage > previousLeverage ? 'text-error' : 'text-success')}
+                className={classNames(
+                  leverage > previousLeverage ? 'text-error' : 'text-success',
+                  'transition-colors duration-200',
+                )}
               />
             </div>
-          </>
+            <span
+              className={classNames(
+                leverage > previousLeverage ? 'text-error' : 'text-success',
+                'transition-colors duration-200',
+              )}
+            >
+              {formatLeverage(leverage)}
+            </span>
+          </div>
+        ) : (
+          <span>{formatLeverage(leverage)}</span>
         )}
-        <span>{formatLeverage(leverage)}</span>
       </SummaryLine>
     </div>
   )
diff --git a/src/components/perps/PerpsBanner.tsx b/src/components/perps/PerpsBanner.tsx
index a360cdffc..a4b29edbd 100644
--- a/src/components/perps/PerpsBanner.tsx
+++ b/src/components/perps/PerpsBanner.tsx
@@ -1,6 +1,10 @@
 import Banner from 'components/common/Banner'
 import { Deposit } from 'components/earn/farm/common/Table/Columns/Deposit'
+import { getDefaultChainSettings } from 'constants/defaultSettings'
+import { LocalStorageKeys } from 'constants/localStorageKeys'
 import useWhitelistedAssets from 'hooks/assets/useWhitelistedAssets'
+import useChainConfig from 'hooks/chain/useChainConfig'
+import useLocalStorage from 'hooks/localStorage/useLocalStorage'
 import usePerpsVault from 'hooks/perps/usePerpsVault'
 import { byDenom } from 'utils/array'
 import { formatValue } from 'utils/formatters'
@@ -8,17 +12,24 @@ import { formatValue } from 'utils/formatters'
 export default function PerpsBanner() {
   const { data: vault } = usePerpsVault()
   const whitelistedAssets = useWhitelistedAssets()
+  const chainConfig = useChainConfig()
   const asset = whitelistedAssets.find(byDenom(vault?.denom ?? ''))
+  const [showPerpsVaultBanner, setShowPerpsVaultBanner] = useLocalStorage(
+    LocalStorageKeys.SHOW_PERPS_VAULT_BANNER,
+    getDefaultChainSettings(chainConfig).showPerpsVaultBanner,
+  )
 
+  if (!showPerpsVaultBanner) return null
   return (
     <Banner
       asset={asset}
+      onClose={() => setShowPerpsVaultBanner(false)}
       title={
         <>
-          Counterparty vault: Earn up to{' '}
+          Counterparty vault APY:{' '}
           <span className='text-purple'>
             {formatValue(vault?.apy ?? 0, {
-              suffix: '% APY',
+              suffix: '%',
               maxDecimals: 2,
               minDecimals: 0,
               abbreviated: false,
diff --git a/src/components/perps/PerpsChart.tsx b/src/components/perps/PerpsChart.tsx
index 887af4bdc..fffdce47e 100644
--- a/src/components/perps/PerpsChart.tsx
+++ b/src/components/perps/PerpsChart.tsx
@@ -35,11 +35,12 @@ export function PerpsChart() {
 
   const { liquidationPrice } = useLiquidationPrice(liqPrice)
 
-  const { setLimitPrice, setOrderType, setSelectedOrderType } = usePerpsOrderForm()
+  const { setLimitPrice, setOrderType, setSelectedOrderType, setStopPrice } = usePerpsOrderForm()
 
   const onCreateLimitOrder = useCallback(
-    (price: number) => {
-      const newLimitPrice = BN(price)
+    (price: BigNumber) => {
+      const formattedPrice = price.toFixed(18, 1)
+      const newLimitPrice = BN(formattedPrice)
       setLimitPrice(newLimitPrice, true)
       setOrderType('limit')
       setSelectedOrderType(OrderType.LIMIT)
@@ -47,6 +48,16 @@ export function PerpsChart() {
     [setLimitPrice, setOrderType, setSelectedOrderType],
   )
 
+  const onCreateStopOrder = useCallback(
+    (price: BigNumber) => {
+      const formattedPrice = price.toFixed(18, 1)
+      setStopPrice(BN(formattedPrice), true)
+      setOrderType('stop')
+      setSelectedOrderType(OrderType.STOP)
+    },
+    [setStopPrice, setOrderType, setSelectedOrderType],
+  )
+
   return (
     <div className='order-2 h-full'>
       <TradeChart
@@ -58,6 +69,7 @@ export function PerpsChart() {
         liquidationPrice={liquidationPrice ?? undefined}
         limitOrders={currentLimitOrders}
         onCreateLimitOrder={onCreateLimitOrder}
+        onCreateStopOrder={onCreateStopOrder}
       />
     </div>
   )
diff --git a/src/components/perps/PerpsInfo/FundingRate.tsx b/src/components/perps/PerpsInfo/FundingRate.tsx
index 2c8e7dc6f..2a01e98b1 100644
--- a/src/components/perps/PerpsInfo/FundingRate.tsx
+++ b/src/components/perps/PerpsInfo/FundingRate.tsx
@@ -1,10 +1,14 @@
-import { useMemo, useState } from 'react'
+import { useMemo } from 'react'
 
 import { FormattedNumber } from 'components/common/FormattedNumber'
 import { ChevronDown } from 'components/common/Icons'
 import { Tooltip } from 'components/common/Tooltip'
+import { getDefaultChainSettings } from 'constants/defaultSettings'
+import { LocalStorageKeys } from 'constants/localStorageKeys'
 import { BN_ZERO } from 'constants/math'
+import useChainConfig from 'hooks/chain/useChainConfig'
 import useToggle from 'hooks/common/useToggle'
+import useLocalStorage from 'hooks/localStorage/useLocalStorage'
 import usePerpsMarket from 'hooks/perps/usePerpsMarket'
 
 type Interval = '1H' | '1D' | '1W' | '1M' | '1Y'
@@ -19,7 +23,11 @@ enum Intervals {
 
 export default function FundingRate() {
   const market = usePerpsMarket()
-  const [interval, setInterval] = useState<Interval>('1H')
+  const chainConfig = useChainConfig()
+  const [interval, setInterval] = useLocalStorage<Interval>(
+    LocalStorageKeys.FUNDING_RATE_INTERVAL,
+    getDefaultChainSettings(chainConfig).fundingRateInterval as Interval,
+  )
   const [show, toggleShow] = useToggle(false)
 
   const fundingRate = useMemo(() => {
diff --git a/src/components/perps/PerpsInfo/Skew.tsx b/src/components/perps/PerpsInfo/Skew.tsx
new file mode 100644
index 000000000..287d26a2d
--- /dev/null
+++ b/src/components/perps/PerpsInfo/Skew.tsx
@@ -0,0 +1,32 @@
+import DisplayCurrency from 'components/common/DisplayCurrency'
+import { FormattedNumber } from 'components/common/FormattedNumber'
+import usePerpsMarket from 'hooks/perps/usePerpsMarket'
+import { BNCoin } from 'types/classes/BNCoin'
+
+export default function Skew() {
+  const perpsMarket = usePerpsMarket()
+
+  if (!perpsMarket) return null
+
+  const { openInterest } = perpsMarket
+  const totalOI = openInterest.total
+
+  return (
+    <div className='flex items-center gap-1'>
+      <DisplayCurrency
+        className='text-sm hidden md:inline'
+        coin={BNCoin.fromDenomAndBigNumber(perpsMarket.asset.denom, totalOI)}
+      />
+      <span className='text-sm hidden md:inline'>/</span>
+      <FormattedNumber
+        className='text-sm'
+        amount={openInterest.skewPercentage.toNumber()}
+        options={{
+          suffix: '%',
+          minDecimals: 2,
+          maxDecimals: 2,
+        }}
+      />
+    </div>
+  )
+}
diff --git a/src/components/perps/PerpsInfo/index.tsx b/src/components/perps/PerpsInfo/index.tsx
index 1a9b78e8f..e9aa14f9a 100644
--- a/src/components/perps/PerpsInfo/index.tsx
+++ b/src/components/perps/PerpsInfo/index.tsx
@@ -6,6 +6,7 @@ import Text from 'components/common/Text'
 import FundingRate from 'components/perps/PerpsInfo/FundingRate'
 import usePerpsMarket from 'hooks/perps/usePerpsMarket'
 import { BNCoin } from 'types/classes/BNCoin'
+import Skew from 'components/perps/PerpsInfo/Skew'
 
 export function PerpsInfo() {
   const market = usePerpsMarket()
@@ -34,6 +35,7 @@ export function PerpsInfo() {
           />
         }
       />,
+      <InfoItem key='skew' label='Skew' item={<Skew />} />,
       <InfoItem key='fundingRate' label='Funding rate' item={<FundingRate />} />,
     ]
   }, [market])
@@ -41,11 +43,13 @@ export function PerpsInfo() {
   if (!market) return null
 
   return (
-    <div className='flex items-center md:gap-4 mb-2 sm:mb-0'>
+    <div className='flex flex-wrap items-center gap-2 md:gap-4 mb-2 sm:mb-0'>
       {items.map((item, index) => (
         <React.Fragment key={index}>
           {item}
-          {index !== items.length - 1 && <Divider orientation='vertical' className='h-9' />}
+          {index !== items.length - 1 && (
+            <Divider orientation='vertical' className='hidden md:block h-9' />
+          )}
         </React.Fragment>
       ))}
     </div>
diff --git a/src/components/portfolio/Account/Strategies.tsx b/src/components/portfolio/Account/Strategies.tsx
index 0c5611e67..f804ecc43 100644
--- a/src/components/portfolio/Account/Strategies.tsx
+++ b/src/components/portfolio/Account/Strategies.tsx
@@ -12,7 +12,7 @@ interface Props {
 function Content(props: Props) {
   const { account } = props
 
-  if (account.vaults.length === 0 && account.stakedAstroLps.length === 0) {
+  if (account.vaults.length === 0 && account.stakedAstroLps.length === 0 && !account.perpsVault) {
     return null
   }
 
diff --git a/src/components/portfolio/Overview/Summary.tsx b/src/components/portfolio/Overview/Summary.tsx
index f12bc3f85..13e94a1b2 100644
--- a/src/components/portfolio/Overview/Summary.tsx
+++ b/src/components/portfolio/Overview/Summary.tsx
@@ -16,7 +16,7 @@ import useVaultAprs from 'hooks/vaults/useVaultAprs'
 import useStore from 'store'
 import { getAccountSummaryStats } from 'utils/accounts'
 import { DEFAULT_PORTFOLIO_STATS } from 'utils/constants'
-import { mergeBNCoinArrays } from 'utils/helpers'
+import { mergeBNCoinArrays, mergePerpsVaults } from 'utils/helpers'
 
 export default function PortfolioSummary() {
   const { address: urlAddress } = useParams()
@@ -48,6 +48,7 @@ export default function PortfolioSummary() {
           combinedAccount.stakedAstroLps,
           account.stakedAstroLps,
         )
+
         return combinedAccount
       },
       {
@@ -62,6 +63,8 @@ export default function PortfolioSummary() {
         kind: 'default' as AccountKind,
       } as Account,
     )
+    const combinedPerpsVaults = mergePerpsVaults(allAccounts.map((account) => account.perpsVault))
+    combinedAccount.perpsVault = combinedPerpsVaults.denom !== '' ? combinedPerpsVaults : null
 
     const { positionValue, debts, netWorth, collateralValue, apy, leverage } =
       getAccountSummaryStats(
diff --git a/src/components/trade/TradeChart/constants.ts b/src/components/trade/TradeChart/constants.ts
index 2cab4f55a..a60c728ac 100644
--- a/src/components/trade/TradeChart/constants.ts
+++ b/src/components/trade/TradeChart/constants.ts
@@ -16,16 +16,17 @@ export const disabledFeatures: ChartingLibraryFeatureset[] = [
   'symbol_info',
   'go_to_date',
   'timeframes_toolbar',
+  'create_volume_indicator_by_default',
 ]
 
 export const enabledFeatures: ChartingLibraryFeatureset[] = [
   'timezone_menu',
   'header_settings',
-  'use_localstorage_for_settings',
   'chart_zoom',
   'horz_touch_drag_scroll',
   'vert_touch_drag_scroll',
   'control_bar',
+  'use_localstorage_for_settings',
 ]
 
 export const disabledFeaturesMobile: ChartingLibraryFeatureset[] = [
@@ -47,11 +48,12 @@ export const disabledFeaturesMobile: ChartingLibraryFeatureset[] = [
   'symbol_info',
   'go_to_date',
   'timeframes_toolbar',
+  'create_volume_indicator_by_default',
 ]
 
 export const enabledFeaturesMobile: ChartingLibraryFeatureset[] = [
   'horz_touch_drag_scroll',
-  'use_localstorage_for_settings',
   'chart_zoom',
   'hide_left_toolbar_by_default',
+  'use_localstorage_for_settings',
 ]
diff --git a/src/components/trade/TradeChart/index.tsx b/src/components/trade/TradeChart/index.tsx
index afa874ee7..77a31dcba 100644
--- a/src/components/trade/TradeChart/index.tsx
+++ b/src/components/trade/TradeChart/index.tsx
@@ -32,6 +32,7 @@ import {
 } from 'utils/charting_library'
 import { formatValue, getPerpsPriceDecimals, magnify } from 'utils/formatters'
 import { getTradingViewSettings } from 'utils/theme'
+import { BN } from 'utils/helpers'
 
 interface Props {
   buyAsset: Asset
@@ -41,7 +42,8 @@ interface Props {
   perpsPosition?: PerpsPosition
   liquidationPrice?: number
   limitOrders?: PerpPositionRow[]
-  onCreateLimitOrder?: (price: number) => void
+  onCreateLimitOrder?: (price: BigNumber) => void
+  onCreateStopOrder?: (price: BigNumber) => void
 }
 
 let chartWidget: IChartingLibraryWidget
@@ -52,8 +54,8 @@ function getLimitOrderText(
   currentPosition: 'long' | 'short' | null,
   positionAmount: BigNumber | null,
 ) {
-  let label = 'Limit'
-
+  let label = order.type === 'stop' ? 'Stop' : 'Limit'
+  console.log(order)
   if (positionAmount && order.amount.abs().isEqualTo(positionAmount.abs())) {
     const isClosing =
       (currentPosition === 'long' && order.tradeDirection === 'short') ||
@@ -78,6 +80,7 @@ function isAutomaticAddedLine(shapeName: string, shape: any) {
 
   return (
     shape.text.includes('Limit') ||
+    shape.text.includes('Stop') ||
     shape.text.includes('Entry') ||
     shape.text.includes('Liquidation') ||
     shape.text.includes('Close')
@@ -105,7 +108,7 @@ export default function TradeChart(props: Props) {
   )
   const chartName = useMemo(() => getChartName(props), [props])
 
-  const { onCreateLimitOrder, isPerps } = props
+  const { onCreateLimitOrder, onCreateStopOrder, isPerps } = props
 
   const [ratio, priceBuyAsset, priceSellAsset] = useMemo(() => {
     const priceBuyAsset = props.buyAsset?.price?.amount
@@ -133,9 +136,9 @@ export default function TradeChart(props: Props) {
       const chart = chartWidget.activeChart()
       if (!chart) return
       const chartStore = JSON.parse(localStorage.getItem(LocalStorageKeys.TV_CHART_STORE) ?? '{}')
-      const currentChartStore = chartStore[chartName]
-      if (!currentChartStore) return
-      currentChartStore.forEach((shape: TradingViewShape) => {
+      const currentChartShapeStore = chartStore[chartName]
+      if (!currentChartShapeStore) return
+      currentChartShapeStore.forEach((shape: TradingViewShape) => {
         if (Array.isArray(shape.points)) {
           if (shape.points.length === 0) return
           chart.createMultipointShape(shape.points, shape.shape)
@@ -143,14 +146,26 @@ export default function TradeChart(props: Props) {
           chart.createShape(shape.points, shape.shape)
         }
       })
-      if (!isPerps || !onCreateLimitOrder) return
+      const currentChartStudyStore = chartStore[`${chartName}-studies`]
+      if (!currentChartStudyStore) return
+      currentChartStudyStore.forEach((studyName: string) => {
+        chart.createStudy(studyName)
+      })
+      if (!isPerps || !onCreateLimitOrder || !onCreateStopOrder) return
       chartWidget.onContextMenu((unixTime, price) => {
         return [
           {
             position: 'top',
             text: 'Set Limit Order Price',
             click: () => {
-              onCreateLimitOrder(price)
+              onCreateLimitOrder?.(BN(price))
+            },
+          },
+          {
+            position: 'top',
+            text: 'Set Stop Order Price',
+            click: () => {
+              onCreateStopOrder?.(BN(price))
             },
           },
         ]
@@ -159,101 +174,114 @@ export default function TradeChart(props: Props) {
       console.info('Error on loading chart', e)
       return
     }
-  }, [chartName, onCreateLimitOrder, isPerps])
-
-  const updateShapes = useCallback(() => {
-    const chart = chartWidget.activeChart()
-    const settings = getTradingViewSettings(theme)
-    const oraclePriceDecimalDiff = props.buyAsset.decimals - PRICE_ORACLE_DECIMALS
-    const { downColor, upColor } = settings.chartStyle
-    const currentShapes = [] as TradingViewShape[]
-    const allShapes = chart.getAllShapes()
-    allShapes.forEach((shape) => {
-      const currentShape = chart.getShapeById(shape.id).getProperties()
-      const currentShapePoints = chart.getShapeById(shape.id).getPoints()
-      if (isAutomaticAddedLine(shape.name, currentShape)) {
-        chart.removeEntity(shape.id)
-      } else {
-        currentShapes.push({
-          points: currentShapePoints,
-          shape: { ...currentShape, shape: shape.name as TradingViewShapeNames },
-        })
-      }
-    })
+  }, [chartName, onCreateLimitOrder, onCreateStopOrder, isPerps])
 
-    const newTvChartStore = JSON.stringify({
-      ...JSON.parse(tvChartStore),
-      [chartName]: currentShapes,
-    })
-    setTvChartStore(newTvChartStore)
-
-    if (entryPrice) {
-      chart.createShape(
-        { price: entryPrice, time: moment().unix() },
-        {
-          shape: 'horizontal_line',
-          lock: true,
-          disableSelection: true,
-          zOrder: 'top',
-          text: 'Entry',
-          overrides: {
-            linecolor: tradeDirection === 'long' ? upColor : downColor,
-            textcolor: tradeDirection === 'long' ? upColor : downColor,
-            linestyle: 0,
-            linewidth: 1,
-            showLabel: true,
-          },
-        },
-      )
-    }
+  const updateShapesAndStudies = useCallback(() => {
+    try {
+      const chart = chartWidget.activeChart()
+      const settings = getTradingViewSettings(theme)
+      const oraclePriceDecimalDiff = props.buyAsset.decimals - PRICE_ORACLE_DECIMALS
+      const { downColor, upColor } = settings.chartStyle
+      const currentShapes = [] as TradingViewShape[]
+      const currentStudies = [] as string[]
+      const allShapes = chart.getAllShapes()
+      const allStudies = chart.getAllStudies()
+
+      allShapes.forEach((shape) => {
+        const currentShape = chart.getShapeById(shape.id).getProperties()
+        const currentShapePoints = chart.getShapeById(shape.id).getPoints()
+        if (isAutomaticAddedLine(shape.name, currentShape)) {
+          chart.removeEntity(shape.id)
+        } else {
+          currentShapes.push({
+            points: currentShapePoints,
+            shape: { ...currentShape, shape: shape.name as TradingViewShapeNames },
+          })
+        }
+      })
 
-    if (liquidationPrice) {
-      chart.createShape(
-        { price: liquidationPrice, time: moment().unix() },
-        {
-          shape: 'horizontal_line',
-          lock: true,
-          disableSelection: true,
-          text: 'Liquidation',
-          zOrder: 'top',
-          overrides: {
-            linecolor: '#fdb021',
-            linestyle: 0,
-            linewidth: 1,
-            textcolor: '#fdb021',
-            showLabel: true,
-          },
-        },
-      )
-    }
-    if (props.limitOrders) {
-      const currentPosition = props.perpsPosition?.amount.isGreaterThan(0) ? 'long' : 'short'
-      const positionAmount = props.perpsPosition?.amount || null
+      allStudies.forEach((study) => {
+        currentStudies.push(study.name)
+      })
 
-      props.limitOrders.forEach((order) => {
-        const price = order.entryPrice.shiftedBy(oraclePriceDecimalDiff).toNumber()
+      const newTvChartStore = JSON.stringify({
+        ...JSON.parse(tvChartStore),
+        [chartName]: currentShapes,
+        [`${chartName}-studies`]: currentStudies,
+      })
+      setTvChartStore(newTvChartStore)
 
+      if (entryPrice) {
         chart.createShape(
+          { price: entryPrice, time: moment().unix() },
           {
-            price: price,
-            time: moment().unix(),
+            shape: 'horizontal_line',
+            lock: true,
+            disableSelection: true,
+            zOrder: 'top',
+            text: 'Entry',
+            overrides: {
+              linecolor: tradeDirection === 'long' ? upColor : downColor,
+              textcolor: tradeDirection === 'long' ? upColor : downColor,
+              linestyle: 0,
+              linewidth: 1,
+              showLabel: true,
+            },
           },
+        )
+      }
+
+      if (liquidationPrice) {
+        chart.createShape(
+          { price: liquidationPrice, time: moment().unix() },
           {
             shape: 'horizontal_line',
             lock: true,
             disableSelection: true,
+            text: 'Liquidation',
             zOrder: 'top',
-            text: getLimitOrderText(order, props.buyAsset, currentPosition, positionAmount),
             overrides: {
-              linecolor: order.tradeDirection === 'long' ? upColor : downColor,
-              textcolor: order.tradeDirection === 'long' ? upColor : downColor,
-              showLabel: true,
-              linestyle: 2,
+              linecolor: '#fdb021',
+              linestyle: 0,
               linewidth: 1,
+              textcolor: '#fdb021',
+              showLabel: true,
             },
           },
         )
-      })
+      }
+      if (props.limitOrders) {
+        const currentPosition = props.perpsPosition?.amount.isGreaterThan(0) ? 'long' : 'short'
+        const positionAmount = props.perpsPosition?.amount || null
+
+        props.limitOrders.forEach((order) => {
+          const price = order.entryPrice.shiftedBy(oraclePriceDecimalDiff).toNumber()
+
+          chart.createShape(
+            {
+              price: price,
+              time: moment().unix(),
+            },
+            {
+              shape: 'horizontal_line',
+              lock: true,
+              disableSelection: true,
+              zOrder: 'top',
+              text: getLimitOrderText(order, props.buyAsset, currentPosition, positionAmount),
+              overrides: {
+                linecolor: order.tradeDirection === 'long' ? upColor : downColor,
+                textcolor: order.tradeDirection === 'long' ? upColor : downColor,
+                showLabel: true,
+                linestyle: 2,
+                linewidth: 1,
+              },
+            },
+          )
+        })
+      }
+    } catch (e) {
+      console.info('Error on updating chart', e)
+      return
     }
   }, [
     chartName,
@@ -335,15 +363,15 @@ export default function TradeChart(props: Props) {
   useEffect(() => {
     if (!chartWidget) return
     chartWidget.onChartReady(() => {
-      updateShapes()
+      updateShapesAndStudies()
       chartWidget
         .activeChart()
         .onIntervalChanged()
         .subscribe(null, () => {
-          updateShapes()
+          updateShapesAndStudies()
         })
     })
-  }, [updateShapes])
+  }, [updateShapesAndStudies])
 
   return (
     <Card
diff --git a/src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx b/src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx
index d1229c37b..1afb29af1 100644
--- a/src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx
+++ b/src/components/trade/TradeModule/AssetSelector/AssetOverlay/index.tsx
@@ -2,6 +2,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react'
 import { isMobile } from 'react-device-detect'
 
 import EscButton from 'components/common/Button/EscButton'
+import { CircularProgress } from 'components/common/CircularProgress'
 import Divider from 'components/common/Divider'
 import Overlay from 'components/common/Overlay'
 import SearchBar from 'components/common/SearchBar'
@@ -12,7 +13,6 @@ import PairsList from 'components/trade/TradeModule/AssetSelector/PairsList'
 import useCurrentAccount from 'hooks/accounts/useCurrentAccount'
 import useDepositEnabledAssets from 'hooks/assets/useDepositEnabledAssets'
 import useFilteredAssets from 'hooks/assets/useFilteredAssets'
-import { CircularProgress } from 'components/common/CircularProgress'
 
 interface Props {
   state: OverlayState
@@ -90,11 +90,10 @@ export default function AssetOverlay(props: Props) {
     },
     [onChangeSearch, props],
   )
-
   const [activePerpsPositions, availablePerpsMarkets] = useMemo(() => {
-    if (!account) return [[], []]
+    if (!account) return [[], assets]
     const activePerpsPositions = assets.filter((assets) =>
-      account?.perps?.find((perp) => perp.denom === assets.denom),
+      account.perps?.find((perp) => perp.denom === assets.denom),
     )
     const availablePerpsMarkets = assets.filter(
       (assets) => !activePerpsPositions.find((perp) => perp.denom === assets.denom),
diff --git a/src/constants/defaultSettings.ts b/src/constants/defaultSettings.ts
index 863b68c62..ac4c28cd2 100644
--- a/src/constants/defaultSettings.ts
+++ b/src/constants/defaultSettings.ts
@@ -1,6 +1,4 @@
-import { BN_ZERO_ONE } from 'constants/math'
 import { ORACLE_DENOM } from 'constants/oracle'
-import { BNCoin } from 'types/classes/BNCoin'
 import { RewardsCenterType } from 'types/enums'
 import { ResolutionString } from 'utils/charting_library'
 
@@ -22,7 +20,8 @@ export const getDefaultChainSettings = (chainConfig: ChainConfig) => {
     theme: 'default',
     rewardsCenterType: RewardsCenterType.Token,
     showSummary: true,
-    perpsKeeperFee: BNCoin.fromDenomAndBigNumber('usd', BN_ZERO_ONE).toCoin(),
     tvChartStore: JSON.stringify({}),
+    showPerpsVaultBanner: true,
+    fundingRateInterval: '1H',
   }
 }
diff --git a/src/constants/localStorageKeys.ts b/src/constants/localStorageKeys.ts
index 86e0b9308..90699946e 100644
--- a/src/constants/localStorageKeys.ts
+++ b/src/constants/localStorageKeys.ts
@@ -26,4 +26,6 @@ export enum LocalStorageKeys {
   REWARDS_CENTER_TYPE = 'rewardsCenterType',
   SHOW_SUMMARY = 'showSummary',
   TV_CHART_STORE = 'tvChartStore',
+  SHOW_PERPS_VAULT_BANNER = 'showPerpsVaultBanner',
+  FUNDING_RATE_INTERVAL = 'fundingRateInterval',
 }
diff --git a/src/constants/math.ts b/src/constants/math.ts
index 16601f990..914cb1c9b 100644
--- a/src/constants/math.ts
+++ b/src/constants/math.ts
@@ -2,7 +2,6 @@ import { BN } from 'utils/helpers'
 
 export const BN_ZERO = BN(0)
 export const BN_ONE = BN(1)
-export const BN_ZERO_ONE = BN(0.1)
 
 export const MIN_AMOUNT = 0.000001
 export const MAX_AMOUNT_DECIMALS = 6
diff --git a/src/hooks/chain/useChainConfig.ts b/src/hooks/chain/useChainConfig.ts
index 1e3f8cd77..4c00b0e95 100644
--- a/src/hooks/chain/useChainConfig.ts
+++ b/src/hooks/chain/useChainConfig.ts
@@ -1,23 +1,47 @@
 import chains from 'chains'
 import { LocalStorageKeys } from 'constants/localStorageKeys'
 import { getCurrentChainId } from 'utils/getCurrentChainId'
+import useCreditManagerConfig from 'hooks/chain/useCreditManagerConfig'
+import { setNodeError } from 'utils/error'
 
 export default function useChainConfig() {
   const chainId = getCurrentChainId()
+  const baseConfig = chains[chainId]
+  const { data: creditManagerConfig, error } = useCreditManagerConfig()
 
   const rpcEndpoint =
-    localStorage.getItem(`${chainId}/${LocalStorageKeys.RPC_ENDPOINT}`) ??
-    chains[chainId].endpoints.rpc
+    localStorage.getItem(`${chainId}/${LocalStorageKeys.RPC_ENDPOINT}`) ?? baseConfig.endpoints.rpc
   const restEndpoint =
     localStorage.getItem(`${chainId}/${LocalStorageKeys.REST_ENDPOINT}`) ??
-    chains[chainId].endpoints.rest
+    baseConfig.endpoints.rest
+
+  if (error || !creditManagerConfig) {
+    return {
+      ...baseConfig,
+      endpoints: {
+        ...baseConfig.endpoints,
+        rpc: rpcEndpoint,
+        rest: restEndpoint,
+      },
+      contracts: baseConfig.contracts,
+    }
+  }
 
   return {
-    ...chains[chainId],
+    ...baseConfig,
     endpoints: {
-      ...chains[chainId].endpoints,
+      ...baseConfig.endpoints,
       rpc: rpcEndpoint,
       rest: restEndpoint,
     },
+    contracts: {
+      ...baseConfig.contracts,
+      accountNft: creditManagerConfig.account_nft,
+      oracle: creditManagerConfig.oracle,
+      params: creditManagerConfig.params,
+      redBank: creditManagerConfig.red_bank,
+      incentives: creditManagerConfig.incentives,
+      perps: creditManagerConfig.perps,
+    },
   }
 }
diff --git a/src/hooks/chain/useCreditManagerConfig.ts b/src/hooks/chain/useCreditManagerConfig.ts
new file mode 100644
index 000000000..bc77418da
--- /dev/null
+++ b/src/hooks/chain/useCreditManagerConfig.ts
@@ -0,0 +1,61 @@
+import { CosmWasmClient } from '@cosmjs/cosmwasm-stargate'
+import useSWRImmutable from 'swr/immutable'
+import { getUrl } from 'utils/url'
+import useStore from 'store'
+import { getCurrentChainId } from 'utils/getCurrentChainId'
+import chains from 'chains'
+import { setNodeError } from 'utils/error'
+
+export default function useCreditManagerConfig() {
+  const chainId = getCurrentChainId()
+  const baseConfig = chains[chainId]
+
+  if (!baseConfig.contracts.creditManager) {
+    throw new Error('Credit manager contract address is required')
+  }
+
+  return useSWRImmutable(
+    baseConfig.contracts.creditManager && `chains/${chainId}/creditManager/config`,
+    async () => {
+      try {
+        const client = await CosmWasmClient.connect(getUrl(baseConfig.endpoints.rpc))
+        const config = await client.queryContractSmart(baseConfig.contracts.creditManager, {
+          config: {},
+        })
+
+        if (!config.account_nft || !config.oracle || !config.params || !config.red_bank) {
+          const error = new Error('Credit manager config missing required fields')
+          setNodeError(getUrl(baseConfig.endpoints.rpc), error.message)
+          throw error
+        }
+
+        useStore.setState({
+          creditManagerConfig: {
+            ...config,
+            credit_manager_contract_addr: baseConfig.contracts.creditManager,
+            account_nft: config.account_nft,
+            oracle: config.oracle,
+            params: config.params,
+            red_bank: config.red_bank,
+            incentives: config.incentives,
+            perps: config.perps,
+          },
+          errorStore: { nodeError: null, apiError: null },
+        })
+
+        return config
+      } catch (ex) {
+        const error = ex instanceof Error ? ex : new Error('Unknown Error')
+        setNodeError(getUrl(baseConfig.endpoints.rpc), error.message)
+        throw error
+      }
+    },
+    {
+      suspense: true,
+      revalidateOnFocus: false,
+      revalidateOnReconnect: false,
+      revalidateIfStale: false,
+      keepPreviousData: false,
+    },
+  )
+}
diff --git a/src/hooks/health-computer/useHealthComputer.ts b/src/hooks/health-computer/useHealthComputer.ts
index 074b590c4..b8e95dfc3 100644
--- a/src/hooks/health-computer/useHealthComputer.ts
+++ b/src/hooks/health-computer/useHealthComputer.ts
@@ -300,7 +300,7 @@ export default function useHealthComputer(account?: Account) {
         return null
       }
     },
-    [healthComputer, perpsAssets],
+    [healthComputer, perpsAssets, whitelistedAssets],
   )
 
   const computeMaxPerpAmount = useCallback(
diff --git a/src/hooks/perps/usePerpsLimitOrdersRows.ts b/src/hooks/perps/usePerpsLimitOrdersRows.ts
index 8628050e5..6c6b7e879 100644
--- a/src/hooks/perps/usePerpsLimitOrdersRows.ts
+++ b/src/hooks/perps/usePerpsLimitOrdersRows.ts
@@ -11,7 +11,6 @@ export default function usePerpsLimitOrderRows() {
   const perpAssets = usePerpsEnabledAssets()
   const { data: limitOrders } = usePerpsLimitOrders()
   const { data: perpsConfig } = usePerpsConfig()
-
   const { computeLiquidationPrice } = useHealthComputer(currentAccount)
 
   return useMemo<PerpPositionRow[]>(() => {
diff --git a/src/hooks/perps/usePerpsMarket.ts b/src/hooks/perps/usePerpsMarket.ts
index db9a47633..6273d2b44 100644
--- a/src/hooks/perps/usePerpsMarket.ts
+++ b/src/hooks/perps/usePerpsMarket.ts
@@ -3,21 +3,32 @@ import { useMemo } from 'react'
 import usePerpsAsset from 'hooks/perps/usePerpsAsset'
 import usePerpsMarketState from 'hooks/perps/usePerpsMarketState'
 import { BN } from 'utils/helpers'
+import { BN_ZERO } from 'constants/math'
 
 export default function usePerpsMarket() {
   const { perpsAsset } = usePerpsAsset()
-
   const perpsMarketState = usePerpsMarketState()
 
   return useMemo(() => {
     if (!perpsMarketState) return null
+
+    const longOI = BN(perpsMarketState.long_oi)
+    const shortOI = BN(perpsMarketState.short_oi)
+    const totalOI = longOI.plus(shortOI)
+
+    const skewPercentage = totalOI.isZero()
+      ? BN_ZERO
+      : longOI.minus(shortOI).div(totalOI).shiftedBy(2)
+
     return {
       // Funding rate is per 24h
-      fundingRate: BN(perpsMarketState.current_funding_rate as any).times(100),
+      fundingRate: BN(perpsMarketState.current_funding_rate as any).shiftedBy(2),
       asset: perpsAsset,
       openInterest: {
-        long: BN(perpsMarketState.long_oi),
-        short: BN(perpsMarketState.short_oi),
+        long: longOI,
+        short: shortOI,
+        total: totalOI,
+        skewPercentage: skewPercentage,
       },
     } as PerpsMarket
   }, [perpsAsset, perpsMarketState])
diff --git a/src/hooks/perps/usePerpsOrderForm.ts b/src/hooks/perps/usePerpsOrderForm.ts
index f0c8fc31d..c9f250927 100644
--- a/src/hooks/perps/usePerpsOrderForm.ts
+++ b/src/hooks/perps/usePerpsOrderForm.ts
@@ -4,27 +4,37 @@ import { OrderType } from 'types/enums'
 
 interface PerpsOrderFormState {
   limitPrice: BigNumber
+  stopPrice: BigNumber
   orderType: 'market' | 'limit' | 'stop'
   selectedOrderType: OrderType
   setLimitPrice: (price: BigNumber, fromTradingView?: boolean) => void
-  setOrderType: (type: 'market' | 'limit') => void
+  setStopPrice: (price: BigNumber, fromTradingView?: boolean) => void
+  setOrderType: (type: 'market' | 'limit' | 'stop') => void
+  setSelectedOrderType: (type: OrderType) => void
+}
+
+interface PerpsOrderFormState {
+  limitPrice: BigNumber
+  stopPrice: BigNumber
+  orderType: 'market' | 'limit' | 'stop'
+  selectedOrderType: OrderType
+  setLimitPrice: (price: BigNumber, fromTradingView?: boolean) => void
+  setStopPrice: (price: BigNumber, fromTradingView?: boolean) => void
+  setOrderType: (type: 'market' | 'limit' | 'stop') => void
   setSelectedOrderType: (type: OrderType) => void
 }
 
 export const usePerpsOrderForm = create<PerpsOrderFormState>((set) => ({
   limitPrice: new BigNumber(0),
+  stopPrice: new BigNumber(0),
   orderType: 'market',
   selectedOrderType: OrderType.MARKET,
   setLimitPrice: (price, fromTradingView = false) => {
     if (fromTradingView) {
       set({
         limitPrice: price,
-        ...(fromTradingView
-          ? {
-              orderType: 'limit',
-              selectedOrderType: OrderType.LIMIT,
-            }
-          : {}),
+        orderType: 'limit',
+        selectedOrderType: OrderType.LIMIT,
       })
     } else {
       set({
@@ -32,12 +42,30 @@ export const usePerpsOrderForm = create<PerpsOrderFormState>((set) => ({
       })
     }
   },
+  setStopPrice: (price, fromTradingView = false) => {
+    if (fromTradingView) {
+      set({
+        stopPrice: price,
+        orderType: 'stop',
+        selectedOrderType: OrderType.STOP,
+      })
+    } else {
+      set({
+        stopPrice: price,
+      })
+    }
+  },
   setOrderType: (type) => set({ orderType: type }),
   setSelectedOrderType: (type) => {
     set((state) => ({
       selectedOrderType: type,
-      orderType: type === OrderType.MARKET ? 'market' : 'limit',
-      ...(type === OrderType.MARKET ? { limitPrice: new BigNumber(0) } : {}),
+      orderType: type === OrderType.MARKET ? 'market' : type === OrderType.LIMIT ? 'limit' : 'stop',
+      ...(type === OrderType.MARKET
+        ? {
+            limitPrice: new BigNumber(0),
+            stopPrice: new BigNumber(0),
+          }
+        : {}),
     }))
   },
 }))
diff --git a/src/hooks/perps/useSubmitLimitOrder.ts b/src/hooks/perps/useSubmitLimitOrder.ts
index bec5b14be..b2795b3de 100644
--- a/src/hooks/perps/useSubmitLimitOrder.ts
+++ b/src/hooks/perps/useSubmitLimitOrder.ts
@@ -86,7 +86,7 @@ export function useSubmitLimitOrder() {
             keeperFee,
             tradeDirection,
             price: adjustedLimitPrice,
-            reduceOnly: isReduceOnly,
+            isReduceOnly,
             comparison,
           }
         },
diff --git a/src/pages/PortfolioAccountPage.tsx b/src/pages/PortfolioAccountPage.tsx
index 6f0836fa3..8cbe9a81a 100644
--- a/src/pages/PortfolioAccountPage.tsx
+++ b/src/pages/PortfolioAccountPage.tsx
@@ -34,7 +34,7 @@ export default function PortfolioAccountPage() {
       <Summary account={account} />
       {isUsersAccount && <ManageAccount account={account} />}
       <Balances account={account} isUsersAccount={isUsersAccount} />
-      {chainConfig.farm && <Strategies account={account} />}
+      {(chainConfig.farm || chainConfig.perps) && <Strategies account={account} />}
       {chainConfig.perps && <PerpPositions account={account} />}
       <ShareBar text={`Have a look at Credit Account ${accountId} on @mars_protocol!`} />
     </div>
diff --git a/src/store/slices/broadcast.ts b/src/store/slices/broadcast.ts
index 2edfdd045..dd1439ff0 100644
--- a/src/store/slices/broadcast.ts
+++ b/src/store/slices/broadcast.ts
@@ -244,6 +244,7 @@ export default function createBroadcastSlice(
       const cmContract = get().chainConfig.contracts.creditManager
       const nftContract = get().chainConfig.contracts.accountNft
 
+      if (!nftContract) return false
       const response = get().executeMsg({
         messages: [
           generateExecutionMessage(get().address, cmContract, refundMessage, []),
@@ -329,6 +330,7 @@ export default function createBroadcastSlice(
         ? get().chainConfig.contracts.incentives
         : get().chainConfig.contracts.creditManager
 
+      if (!contract) return false
       const response = get().executeMsg({
         messages: [
           generateExecutionMessage(
@@ -1173,6 +1175,7 @@ export default function createBroadcastSlice(
 
       const redBankContract = get().chainConfig.contracts.redBank
 
+      if (!redBankContract) return false
       const response = get().executeMsg({
         messages: [generateExecutionMessage(get().address, redBankContract, msg, sortFunds(funds))],
       })
diff --git a/src/store/slices/common.ts b/src/store/slices/common.ts
index bb1977124..5d6abacc7 100644
--- a/src/store/slices/common.ts
+++ b/src/store/slices/common.ts
@@ -22,5 +22,6 @@ export default function createCommonSlice(set: SetState<CommonSlice>, get: GetSt
     assets: [],
     hlsBorrowAmount: null,
     errorStore: { apiError: null, nodeError: null },
+    creditManagerConfig: null,
   }
 }
diff --git a/src/types/app.d.ts b/src/types/app.d.ts
index 8caa45ee2..c528143bd 100644
--- a/src/types/app.d.ts
+++ b/src/types/app.d.ts
@@ -21,7 +21,7 @@ type ActionCoin = import('types/generated/mars-credit-manager/MarsCreditManager.
 type Action = import('types/generated/mars-credit-manager/MarsCreditManager.types').Action
 type BNCoin = import('types/classes/BNCoin').BNCoin
 
-type PositionType = 'deposit' | 'borrow' | 'lend' | 'vault' | 'perp' | 'market' | 'limit'
+type PositionType = 'deposit' | 'borrow' | 'lend' | 'vault' | 'perp' | 'market' | 'limit' | 'stop'
 type TableType = 'balances' | 'strategies' | 'perps'
 type AccountKind = import('types/generated/mars-credit-manager/MarsCreditManager.types').AccountKind
 
@@ -216,6 +216,8 @@ interface PerpsMarket {
   openInterest: {
     long: BigNumber
     short: BigNumber
+    total: BigNumber
+    skewPercentage: BigNumber
   }
 }
 
@@ -234,13 +236,13 @@ interface ChainConfig {
   defaultTradingPair: TradingPair
   bech32Config: import('@keplr-wallet/types').Bech32Config
   contracts: {
-    redBank: string
-    incentives: string
-    oracle: string
-    params: string
+    redBank?: string
+    incentives?: string
+    oracle?: string
+    params?: string
+    accountNft?: string
+    perps?: string
     creditManager: string
-    accountNft: string
-    perps: string
     pyth: string
   }
   defaultCurrency: {
@@ -338,6 +340,7 @@ interface PerpsPosition {
   currentPrice: BigNumber
   entryPrice: BigNumber
   type: PositionType
+  reduce_only?: boolean
 }
 
 interface PerpsLimitOrder {
@@ -354,6 +357,7 @@ interface PerpPositionRow extends PerpsPosition {
   orderId?: string
   hasStopLoss?: boolean
   hasTakeProfit?: boolean
+  reduce_only?: boolean
 }
 
 interface PerpsPnL {
@@ -1222,6 +1226,7 @@ interface CommonSlice {
   perpsBaseDenom?: string
   hlsBorrowAmount: BigNumber | null
   errorStore: ErrorStore
+  creditManagerConfig: ConfigResponse | null
 }
 
 interface ErrorStore {
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 7aefd2aaf..be5f3e0e6 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -47,6 +47,35 @@ export function mergeBNCoinArrays(array1: BNCoin[], array2: BNCoin[]) {
   return merged
 }
 
+export function mergePerpsVaults(perpVaults: (PerpsVaultPositions | null)[]) {
+  const merged: PerpsVaultPositions = {
+    active: {
+      amount: BN_ZERO,
+      shares: BN_ZERO,
+    },
+    denom: '',
+    unlocked: BN_ZERO,
+    unlocking: [] as PerpsVaultUnlockingPosition[],
+  }
+
+  perpVaults.forEach((vault) => {
+    if (!vault || !merged) return
+    if (merged.active && vault.active) {
+      merged.active.amount = merged.active.amount.plus(vault.active.amount)
+      merged.active.shares = merged.active.shares.plus(vault.active.shares)
+    }
+    if (merged.unlocked && vault.unlocked) {
+      merged.unlocked = merged.unlocked.plus(vault.unlocked)
+    }
+    vault.unlocking.forEach((unlocking) => {
+      merged.unlocking.push(unlocking)
+    })
+    merged.denom = vault.denom
+  })
+
+  return merged
+}
+
 export function getValueFromBNCoins(coins: BNCoin[], assets: Asset[]): BigNumber {
   let totalValue = BN_ZERO
 
diff --git a/src/utils/perps.ts b/src/utils/perps.ts
index 29f3f528b..7bf0dffea 100644
--- a/src/utils/perps.ts
+++ b/src/utils/perps.ts
@@ -32,6 +32,19 @@ export const checkStopLossAndTakeProfit = (
   return { hasStopLoss, hasTakeProfit }
 }
 
+export const isStopOrder = (perpOrder: any, perpTrigger: any): PositionType => {
+  const isLong = BN(perpOrder.order_size).isGreaterThanOrEqualTo(0)
+
+  if (isLong) {
+    return perpTrigger.comparison !== 'less_than'
+      ? ('stop' as PositionType)
+      : ('limit' as PositionType)
+  }
+  return perpTrigger.comparison !== 'greater_than'
+    ? ('stop' as PositionType)
+    : ('limit' as PositionType)
+}
+
 export const convertTriggerOrderResponseToPerpPosition = (
   limitOrder: TriggerOrderResponse,
   perpAssets: Asset[],
@@ -61,7 +74,8 @@ export const convertTriggerOrderResponseToPerpPosition = (
     baseDenom: perpsConfig.base_denom,
     tradeDirection,
     amount: amount.abs(),
-    type: 'limit' as PositionType,
+    type: isStopOrder(perpOrder, perpTrigger),
+    reduce_only: perpOrder.reduce_only ?? false,
     pnl: {
       net: BNCoin.fromCoin(limitOrder.order.keeper_fee).negated(),
       realized: {
@@ -89,19 +103,22 @@ export const validateStopOrderPrice = (
   currentPrice: BigNumber,
   tradeDirection: TradeDirection,
 ): { isValid: boolean; errorMessage: string | null } => {
-  if (stopPrice.isZero() || currentPrice.isZero()) {
+  const formattedStopPrice = BN(stopPrice.toFixed(18, 1))
+  const formattedCurrentPrice = BN(currentPrice.toFixed(18, 1))
+
+  if (formattedStopPrice.isZero() || formattedCurrentPrice.isZero()) {
     return { isValid: false, errorMessage: null }
   }
 
   if (tradeDirection === 'long') {
-    if (stopPrice.isLessThanOrEqualTo(currentPrice)) {
+    if (formattedStopPrice.isLessThanOrEqualTo(formattedCurrentPrice)) {
       return {
         isValid: false,
         errorMessage: 'Stop price must be below current price for long positions',
       }
     }
   } else {
-    if (stopPrice.isGreaterThanOrEqualTo(currentPrice)) {
+    if (formattedStopPrice.isGreaterThanOrEqualTo(formattedCurrentPrice)) {
       return {
         isValid: false,
         errorMessage: 'Stop price must be above current price for short positions',