diff --git a/apps/main/src/lend/components/AlertNoLoanFound.tsx b/apps/main/src/lend/components/AlertNoLoanFound.tsx
index d37cb33e5d..246931bbfa 100644
--- a/apps/main/src/lend/components/AlertNoLoanFound.tsx
+++ b/apps/main/src/lend/components/AlertNoLoanFound.tsx
@@ -25,7 +25,7 @@ const AlertNoLoanFound = ({ alertType, owmId }: { alertType?: AlertType; owmId:
           size="large"
           onClick={() => {
             setStateByKeyMarkets('marketDetailsView', 'market')
-            push(getLoanCreatePathname(params, owmId))
+            push(getLoanCreatePathname(params, owmId, 'create'))
           }}
         >
           Create loan
diff --git a/apps/main/src/lend/components/PageLoanCreate/LoanCreateTabs.tsx b/apps/main/src/lend/components/PageLoanCreate/LoanCreateTabs.tsx
deleted file mode 100644
index c9bd29fe8a..0000000000
--- a/apps/main/src/lend/components/PageLoanCreate/LoanCreateTabs.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { useCallback } from 'react'
-import LoanFormCreate from '@/lend/components/PageLoanCreate/LoanFormCreate'
-import type { FormValues } from '@/lend/components/PageLoanCreate/types'
-import { DEFAULT_FORM_VALUES } from '@/lend/components/PageLoanCreate/utils'
-import networks from '@/lend/networks'
-import useStore from '@/lend/store/useStore'
-import { type MarketUrlParams, type PageContentProps } from '@/lend/types/lend.types'
-import { CreateLoanForm } from '@/llamalend/features/borrow/components/CreateLoanForm'
-import type { OnBorrowFormUpdate } from '@/llamalend/features/borrow/types'
-import { hasLeverage } from '@/llamalend/llama.utils'
-import { useCreateLoanMuiForm } from '@ui-kit/hooks/useFeatureFlags'
-import { t } from '@ui-kit/lib/i18n'
-import { type FormTab, FormTabs } from '@ui-kit/shared/ui/FormTabs/FormTabs'
-
-type CreateLoanProps = PageContentProps<MarketUrlParams>
-
-/**
- * Callback that synchronizes the `ChartOhlc` component with the `RangeSlider` component in the new `BorrowTabContents`.
- */
-const useOnFormUpdate = ({ api, market }: Pick<CreateLoanProps, 'api' | 'market'>): OnBorrowFormUpdate =>
-  useCallback(
-    async ({ debt, userCollateral, range, slippage, leverageEnabled }) => {
-      const { setFormValues, setStateByKeys } = useStore.getState().loanCreate
-      const formValues: FormValues = {
-        ...DEFAULT_FORM_VALUES,
-        n: range,
-        debt: `${debt ?? ''}`,
-        userCollateral: `${userCollateral ?? ''}`,
-      }
-      await setFormValues(api, market, formValues, `${slippage}`, leverageEnabled)
-      setStateByKeys({ isEditLiqRange: true })
-    },
-    [api, market],
-  )
-
-function CreateLoanTab({ market, api, rChainId }: CreateLoanProps) {
-  const onLoanCreated = useStore((state) => state.loanCreate.onLoanCreated)
-  const onCreated = useCallback(
-    async () => api && market && (await onLoanCreated(api, market)),
-    [api, market, onLoanCreated],
-  )
-  const onUpdate = useOnFormUpdate({ market, api })
-  return (
-    <CreateLoanForm networks={networks} chainId={rChainId} market={market} onUpdate={onUpdate} onCreated={onCreated} />
-  )
-}
-
-const LendCreateTabsNewMenu = [
-  { value: 'create', label: t`Borrow`, component: CreateLoanTab },
-] satisfies FormTab<CreateLoanProps>[]
-
-const LendCreateTabsOldMenu = [
-  { value: 'create', label: t`Create Loan`, component: LoanFormCreate },
-  {
-    value: 'leverage',
-    label: t`Leverage`,
-    component: (p) => <LoanFormCreate {...p} isLeverage />,
-    visible: ({ market }) => market && hasLeverage(market),
-  },
-] satisfies FormTab<CreateLoanProps>[]
-
-export const LoanCreateTabs = (pageProps: CreateLoanProps) => {
-  const menu = useCreateLoanMuiForm() ? LendCreateTabsNewMenu : LendCreateTabsOldMenu
-  const shouldWrap = menu === LendCreateTabsOldMenu
-  return <FormTabs params={pageProps} menu={menu} shouldWrap={shouldWrap} />
-}
diff --git a/apps/main/src/lend/components/PageLoanCreate/LoanFormCreate/index.tsx b/apps/main/src/lend/components/PageLoanCreate/LoanFormCreate/index.tsx
index f9f4426a09..05549d74ad 100644
--- a/apps/main/src/lend/components/PageLoanCreate/LoanFormCreate/index.tsx
+++ b/apps/main/src/lend/components/PageLoanCreate/LoanFormCreate/index.tsx
@@ -412,7 +412,7 @@ const LoanCreate = ({
             size="large"
             onClick={() => {
               setStateByKeyMarkets('marketDetailsView', 'user')
-              push(getLoanManagePathname(params, rOwmId))
+              push(getLoanManagePathname(params, rOwmId, 'loan'))
             }}
           >
             Manage loan
@@ -431,7 +431,7 @@ const LoanCreate = ({
           )}
           {steps && <Stepper steps={steps} />}
           {formStatus.isComplete && market && (
-            <LinkButton variant="filled" size="large" href={getLoanManagePathname(params, market.id)}>
+            <LinkButton variant="filled" size="large" href={getLoanManagePathname(params, market.id, 'loan')}>
               Manage loan
             </LinkButton>
           )}
diff --git a/apps/main/src/lend/components/PageLoanCreate/Page.tsx b/apps/main/src/lend/components/PageLoanCreate/Page.tsx
index 64d881c17b..3841891282 100644
--- a/apps/main/src/lend/components/PageLoanCreate/Page.tsx
+++ b/apps/main/src/lend/components/PageLoanCreate/Page.tsx
@@ -3,7 +3,7 @@ import type { Address } from 'viem'
 import CampaignRewardsBanner from '@/lend/components/CampaignRewardsBanner'
 import { MarketInformationComp } from '@/lend/components/MarketInformationComp'
 import { MarketInformationTabs } from '@/lend/components/MarketInformationTabs'
-import { LoanCreateTabs } from '@/lend/components/PageLoanCreate/LoanCreateTabs'
+import LoanCreate from '@/lend/components/PageLoanCreate/index'
 import { useOneWayMarket } from '@/lend/entities/chain'
 import { useLendPageTitle } from '@/lend/hooks/useLendPageTitle'
 import { useMarketDetails } from '@/lend/hooks/useMarketDetails'
@@ -35,7 +35,7 @@ const { Spacing } = SizesAndSpaces
 
 const Page = () => {
   const params = useParams<MarketUrlParams>()
-  const { rMarket, rChainId } = parseMarketParams(params)
+  const { rMarket, rChainId, rFormType } = parseMarketParams(params)
 
   const { data: market, isSuccess } = useOneWayMarket(rChainId, rMarket)
   const { llamaApi: api = null, connectState } = useConnection()
@@ -88,6 +88,7 @@ const Page = () => {
     params,
     rChainId,
     rOwmId,
+    rFormType,
     api,
     market,
     titleMapper,
@@ -96,7 +97,7 @@ const Page = () => {
   }
   const positionDetailsHrefs = {
     borrow: '',
-    supply: getVaultPathname(params, rOwmId),
+    supply: getVaultPathname(params, rOwmId, 'deposit'),
   }
 
   return isSuccess && !market ? (
@@ -105,7 +106,7 @@ const Page = () => {
     <>
       <DetailPageStack>
         <AppPageFormsWrapper data-testid="form-wrapper">
-          {rChainId && rOwmId && <LoanCreateTabs {...pageProps} params={params} />}
+          {rChainId && rOwmId && <LoanCreate {...pageProps} params={params} />}
         </AppPageFormsWrapper>
         <Stack flexDirection="column" flexGrow={1} sx={{ gap: Spacing.md }}>
           <CampaignRewardsBanner
diff --git a/apps/main/src/lend/components/PageLoanCreate/index.tsx b/apps/main/src/lend/components/PageLoanCreate/index.tsx
new file mode 100644
index 0000000000..520c539ba4
--- /dev/null
+++ b/apps/main/src/lend/components/PageLoanCreate/index.tsx
@@ -0,0 +1,103 @@
+import { useCallback, useMemo } from 'react'
+import LoanFormCreate from '@/lend/components/PageLoanCreate/LoanFormCreate'
+import type { FormValues } from '@/lend/components/PageLoanCreate/types'
+import { DEFAULT_FORM_VALUES } from '@/lend/components/PageLoanCreate/utils'
+import networks from '@/lend/networks'
+import useStore from '@/lend/store/useStore'
+import { type MarketUrlParams, type PageContentProps } from '@/lend/types/lend.types'
+import { getLoanCreatePathname } from '@/lend/utils/utilsRouter'
+import { CreateLoanForm } from '@/llamalend/features/borrow/components/CreateLoanForm'
+import type { OnBorrowFormUpdate } from '@/llamalend/features/borrow/types'
+import Stack from '@mui/material/Stack'
+import { AppFormContentWrapper } from '@ui/AppForm'
+import { useNavigate } from '@ui-kit/hooks/router'
+import { useCreateLoanMuiForm } from '@ui-kit/hooks/useFeatureFlags'
+import { t } from '@ui-kit/lib/i18n'
+import { TabsSwitcher, type TabOption } from '@ui-kit/shared/ui/TabsSwitcher'
+import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
+
+const { MaxWidth } = SizesAndSpaces
+
+/**
+ * Callback that synchronizes the `ChartOhlc` component with the `RangeSlider` component in the new `BorrowTabContents`.
+ */
+const useOnFormUpdate = ({ api, market }: PageContentProps): OnBorrowFormUpdate =>
+  useCallback(
+    async ({ debt, userCollateral, range, slippage, leverageEnabled }) => {
+      const { setFormValues, setStateByKeys } = useStore.getState().loanCreate
+      const formValues: FormValues = {
+        ...DEFAULT_FORM_VALUES,
+        n: range,
+        debt: `${debt ?? ''}`,
+        userCollateral: `${userCollateral ?? ''}`,
+      }
+      await setFormValues(api, market, formValues, `${slippage}`, leverageEnabled)
+      setStateByKeys({ isEditLiqRange: true })
+    },
+    [api, market],
+  )
+
+const LoanCreate = (pageProps: PageContentProps & { params: MarketUrlParams }) => {
+  const { rChainId, rOwmId, rFormType, market, params, api } = pageProps
+  const push = useNavigate()
+  const shouldUseBorrowUnifiedForm = useCreateLoanMuiForm()
+  const onUpdate = useOnFormUpdate(pageProps)
+
+  const onLoanCreated = useStore((state) => state.loanCreate.onLoanCreated)
+  const resetState = useStore((state) => state.loanCreate.resetState)
+
+  type Tab = 'create' | 'leverage'
+  const tabs: TabOption<Tab>[] = useMemo(
+    () =>
+      shouldUseBorrowUnifiedForm
+        ? // the new borrow form contains both create and leverage functionality
+          [{ value: 'create' as const, label: t`Borrow` }]
+        : [
+            { value: 'create' as const, label: t`Create Loan` },
+            ...(market?.leverage.hasLeverage() ? [{ value: 'leverage' as const, label: t`Leverage` }] : []),
+          ],
+    [market?.leverage, shouldUseBorrowUnifiedForm],
+  )
+
+  const onCreated = useCallback(
+    async () => api && market && (await onLoanCreated(api, market)),
+    [api, market, onLoanCreated],
+  )
+
+  return (
+    <Stack
+      sx={{
+        width: { mobile: '100%', tablet: MaxWidth.actionCard },
+        marginInline: { mobile: 'auto', desktop: 0 },
+      }}
+    >
+      <TabsSwitcher
+        variant="contained"
+        size="medium"
+        value={!rFormType ? 'create' : rFormType}
+        onChange={(key) => {
+          resetState({ rChainId, rOwmId, key })
+          push(getLoanCreatePathname(params, rOwmId, key))
+        }}
+        options={tabs}
+      />
+      {shouldUseBorrowUnifiedForm ? (
+        <CreateLoanForm
+          networks={networks}
+          chainId={rChainId}
+          market={market ?? undefined}
+          onUpdate={onUpdate}
+          onCreated={onCreated}
+        />
+      ) : (
+        <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+          <AppFormContentWrapper>
+            <LoanFormCreate isLeverage={rFormType === 'leverage'} {...pageProps} />
+          </AppFormContentWrapper>
+        </Stack>
+      )}
+    </Stack>
+  )
+}
+
+export default LoanCreate
diff --git a/apps/main/src/lend/components/PageLoanCreate/types.ts b/apps/main/src/lend/components/PageLoanCreate/types.ts
index 4293951e40..b49d280ce8 100644
--- a/apps/main/src/lend/components/PageLoanCreate/types.ts
+++ b/apps/main/src/lend/components/PageLoanCreate/types.ts
@@ -10,6 +10,7 @@ import {
 import type { HealthMode } from '@/llamalend/llamalend.types'
 import type { Step } from '@ui/Stepper/types'
 
+export type FormType = 'create' | 'vault' | 'leverage'
 export type StepKey = 'APPROVAL' | 'CREATE' | ''
 export type InpError = 'too-much' | 'too-much-max' | ''
 
diff --git a/apps/main/src/lend/components/PageLoanManage/LoanBorrowMore/index.tsx b/apps/main/src/lend/components/PageLoanManage/LoanBorrowMore/index.tsx
index 0c655bf6f7..91ea35d726 100644
--- a/apps/main/src/lend/components/PageLoanManage/LoanBorrowMore/index.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/LoanBorrowMore/index.tsx
@@ -21,13 +21,11 @@ import useStore from '@/lend/store/useStore'
 import { Api, OneWayMarketTemplate, PageContentProps } from '@/lend/types/lend.types'
 import { _showNoLoanFound } from '@/lend/utils/helpers'
 import { DEFAULT_HEALTH_MODE } from '@/llamalend/constants'
-import { hasLeverage } from '@/llamalend/llama.utils'
 import type { HealthMode } from '@/llamalend/llamalend.types'
 import { useLoanExists } from '@/llamalend/queries/loan-exists'
 import Stack from '@mui/material/Stack'
 import Typography from '@mui/material/Typography'
 import AlertBox from '@ui/AlertBox'
-import { AppFormContentWrapper } from '@ui/AppForm'
 import { getActiveStep } from '@ui/Stepper/helpers'
 import Stepper from '@ui/Stepper/Stepper'
 import type { Step } from '@ui/Stepper/types'
@@ -42,9 +40,17 @@ import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
 
 const { Spacing } = SizesAndSpaces
 
-const LoanBorrowMore = ({ rChainId, rOwmId, isLoaded, api, market, userActiveKey }: PageContentProps) => {
+const LoanBorrowMore = ({
+  rChainId,
+  rOwmId,
+  isLeverage = false,
+  isLoaded,
+  api,
+  market,
+  userActiveKey,
+}: PageContentProps & { isLeverage?: boolean }) => {
   const isSubscribed = useRef(false)
-  const isLeverage = !!market && hasLeverage(market)
+
   const activeKey = useStore((state) => state.loanBorrowMore.activeKey)
   const activeKeyMax = useStore((state) => state.loanBorrowMore.activeKeyMax)
   const detailInfoLeverage = useStore((state) => state.loanBorrowMore.detailInfoLeverage[activeKey])
@@ -430,14 +436,3 @@ const LoanBorrowMore = ({ rChainId, rOwmId, isLoaded, api, market, userActiveKey
 }
 
 export default LoanBorrowMore
-
-/**
- * The new implementation of LoanBorrowMore with mui isn't ready yet. For now, we wrap the old one for styling.
- */
-export const LoanBorrowMoreWrapped = (props: PageContentProps) => (
-  <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
-    <AppFormContentWrapper>
-      <LoanBorrowMore {...props} />
-    </AppFormContentWrapper>
-  </Stack>
-)
diff --git a/apps/main/src/lend/components/PageLoanManage/LoanCollateralAdd/index.tsx b/apps/main/src/lend/components/PageLoanManage/LoanCollateralAdd/index.tsx
index eea70678a7..7fb4485c0b 100644
--- a/apps/main/src/lend/components/PageLoanManage/LoanCollateralAdd/index.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/LoanCollateralAdd/index.tsx
@@ -19,7 +19,6 @@ import useStore from '@/lend/store/useStore'
 import { Api, OneWayMarketTemplate, PageContentProps } from '@/lend/types/lend.types'
 import { _showNoLoanFound } from '@/lend/utils/helpers'
 import { DEFAULT_HEALTH_MODE } from '@/llamalend/constants'
-import { AddCollateralForm } from '@/llamalend/features/manage-loan/components/AddCollateralForm'
 import { useLoanExists } from '@/llamalend/queries/loan-exists'
 import AlertBox from '@ui/AlertBox'
 import { getActiveStep } from '@ui/Stepper/helpers'
@@ -259,7 +258,3 @@ const LoanCollateralAdd = ({ rChainId, rOwmId, api, isLoaded, market, userActive
 }
 
 export default LoanCollateralAdd
-
-export const LoanAddCollateralTab = ({ rChainId, market, isLoaded }: PageContentProps) => (
-  <AddCollateralForm networks={networks} chainId={rChainId} market={market} enabled={isLoaded} />
-)
diff --git a/apps/main/src/lend/components/PageLoanManage/LoanCollateralRemove/index.tsx b/apps/main/src/lend/components/PageLoanManage/LoanCollateralRemove/index.tsx
index 0a2e54f410..aa959653e8 100644
--- a/apps/main/src/lend/components/PageLoanManage/LoanCollateralRemove/index.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/LoanCollateralRemove/index.tsx
@@ -21,7 +21,6 @@ import useStore from '@/lend/store/useStore'
 import { Api, OneWayMarketTemplate, PageContentProps } from '@/lend/types/lend.types'
 import { _showNoLoanFound } from '@/lend/utils/helpers'
 import { DEFAULT_HEALTH_MODE } from '@/llamalend/constants'
-import { RemoveCollateralForm } from '@/llamalend/features/manage-loan/components/RemoveCollateralForm'
 import type { HealthMode } from '@/llamalend/llamalend.types'
 import { useLoanExists } from '@/llamalend/queries/loan-exists'
 import AlertBox from '@ui/AlertBox'
@@ -297,7 +296,3 @@ const LoanCollateralRemove = ({ rChainId, rOwmId, isLoaded, api, market, userAct
 }
 
 export default LoanCollateralRemove
-
-export const LoanRemoveCollateralTab = ({ rChainId, market, isLoaded }: PageContentProps) => (
-  <RemoveCollateralForm networks={networks} chainId={rChainId} market={market} enabled={isLoaded} />
-)
diff --git a/apps/main/src/lend/components/PageLoanManage/LoanRepay/index.tsx b/apps/main/src/lend/components/PageLoanManage/LoanRepay/index.tsx
index 8c4c51015e..aa58edd63f 100644
--- a/apps/main/src/lend/components/PageLoanManage/LoanRepay/index.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/LoanRepay/index.tsx
@@ -20,7 +20,6 @@ import { Api, FormError, type MarketUrlParams, OneWayMarketTemplate, PageContent
 import { _showNoLoanFound } from '@/lend/utils/helpers'
 import { getCollateralListPathname } from '@/lend/utils/utilsRouter'
 import { DEFAULT_HEALTH_MODE } from '@/llamalend/constants'
-import { RepayForm } from '@/llamalend/features/manage-loan/components/RepayForm'
 import type { HealthMode } from '@/llamalend/llamalend.types'
 import { useLoanExists } from '@/llamalend/queries/loan-exists'
 import Stack from '@mui/material/Stack'
@@ -538,11 +537,3 @@ const LoanRepay = ({
 }
 
 export default LoanRepay
-
-export const LoanRepayFromWalletTab = ({ rChainId, market, isLoaded }: PageContentProps) => (
-  <RepayForm fromWallet networks={networks} chainId={rChainId} market={market} enabled={isLoaded} />
-)
-
-export const LoanRepayFromCollateralTab = ({ rChainId, market, isLoaded }: PageContentProps) => (
-  <RepayForm fromCollateral networks={networks} chainId={rChainId} market={market} enabled={isLoaded} />
-)
diff --git a/apps/main/src/lend/components/PageLoanManage/LoanSelfLiquidation/index.tsx b/apps/main/src/lend/components/PageLoanManage/LoanSelfLiquidation/index.tsx
index 15efbecd39..b1647b2693 100644
--- a/apps/main/src/lend/components/PageLoanManage/LoanSelfLiquidation/index.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/LoanSelfLiquidation/index.tsx
@@ -45,7 +45,7 @@ const LoanSelfLiquidation = ({
   market,
   userActiveKey,
   params,
-}: PageContentProps<MarketUrlParams>) => {
+}: PageContentProps & { params: MarketUrlParams }) => {
   const isSubscribed = useRef(false)
   const formEstGas = useStore((state) => state.loanSelfLiquidation.formEstGas)
   const formStatus = useStore((state) => state.loanSelfLiquidation.formStatus)
diff --git a/apps/main/src/lend/components/PageLoanManage/ManageLoanTabs.tsx b/apps/main/src/lend/components/PageLoanManage/ManageLoanTabs.tsx
deleted file mode 100644
index ee4e2ad5a4..0000000000
--- a/apps/main/src/lend/components/PageLoanManage/ManageLoanTabs.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import LoanBorrowMore, { LoanBorrowMoreWrapped } from '@/lend/components/PageLoanManage/LoanBorrowMore'
-import LoanCollateralAdd, { LoanAddCollateralTab } from '@/lend/components/PageLoanManage/LoanCollateralAdd'
-import LoanCollateralRemove, { LoanRemoveCollateralTab } from '@/lend/components/PageLoanManage/LoanCollateralRemove'
-import LoanRepay, {
-  LoanRepayFromCollateralTab,
-  LoanRepayFromWalletTab,
-} from '@/lend/components/PageLoanManage/LoanRepay'
-import LoanSelfLiquidation from '@/lend/components/PageLoanManage/LoanSelfLiquidation'
-import networks from '@/lend/networks'
-import { type MarketUrlParams, PageContentProps } from '@/lend/types/lend.types'
-import { useClosePositionTab } from '@/llamalend/features/manage-soft-liquidation/hooks/useClosePositionTab'
-import { useImproveHealthTab } from '@/llamalend/features/manage-soft-liquidation/hooks/useImproveHealthTab'
-import { ClosePosition } from '@/llamalend/features/manage-soft-liquidation/ui/tabs/ClosePosition'
-import { ImproveHealth } from '@/llamalend/features/manage-soft-liquidation/ui/tabs/ImproveHealth'
-import { useManageLoanMuiForm, useManageSoftLiquidation } from '@ui-kit/hooks/useFeatureFlags'
-import { t } from '@ui-kit/lib/i18n'
-import { type FormTab, FormTabs } from '@ui-kit/shared/ui/FormTabs/FormTabs'
-
-type ManageLoanProps = PageContentProps<MarketUrlParams>
-
-const ImproveHealthTab = ({ rChainId, rOwmId }: ManageLoanProps) => (
-  <ImproveHealth {...useImproveHealthTab({ chainId: rChainId, network: networks[rChainId], marketId: rOwmId })} />
-)
-
-const ClosePositionTab = ({ rChainId, rOwmId }: ManageLoanProps) => (
-  <ClosePosition {...useClosePositionTab({ chainId: rChainId, network: networks[rChainId], marketId: rOwmId })} />
-)
-
-const LendManageLegacyMenu = [
-  {
-    value: 'loan',
-    label: t`Borrow`,
-    subTabs: [
-      { value: 'loan-increase', label: t`Borrow more`, component: LoanBorrowMore },
-      { value: 'loan-decrease', label: t`Repay`, component: LoanRepay },
-      { value: 'loan-liquidate', label: t`Self-liquidate`, component: LoanSelfLiquidation },
-    ],
-  },
-  {
-    value: 'collateral',
-    label: t`Borrow`,
-    subTabs: [
-      { value: 'collateral-increase', label: t`Add collateral`, component: LoanCollateralAdd },
-      { value: 'collateral-decrease', label: t`Remove collateral`, component: LoanCollateralRemove },
-    ],
-  },
-  {
-    value: 'leverage',
-    label: t`Leverage`,
-    visible: ({ market }) => market?.leverage?.hasLeverage(),
-    component: LoanBorrowMore,
-  },
-] satisfies FormTab<ManageLoanProps>[]
-
-const LendManageNewMenu = [
-  {
-    value: 'borrow',
-    label: ({ market }) => (market?.leverage?.hasLeverage() ? t`Leverage` : t`Borrow`),
-    component: LoanBorrowMoreWrapped,
-  },
-  {
-    value: 'repay',
-    label: t`Repay`,
-    subTabs: [
-      { value: 'from-wallet', label: t`From wallet`, component: LoanRepayFromWalletTab },
-      { value: 'from-collateral', label: t`From collateral`, component: LoanRepayFromCollateralTab },
-    ],
-  },
-  {
-    value: 'collateral',
-    label: t`Collateral`,
-    subTabs: [
-      { value: 'add', label: t`Add`, component: LoanAddCollateralTab },
-      { value: 'remove', label: t`Remove`, component: LoanRemoveCollateralTab },
-    ],
-  },
-] satisfies FormTab<ManageLoanProps>[]
-
-const LendManageSoftLiquidationMenu = [
-  {
-    value: 'soft-liquidation',
-    label: t`Manage soft liquidation`,
-    subTabs: [
-      { value: 'improve-health', label: t`Improve health`, component: ImproveHealthTab },
-      { value: 'close-position', label: t`Close position`, component: ClosePositionTab },
-    ],
-  },
-] satisfies FormTab<ManageLoanProps>[]
-
-export const ManageLoanTabs = ({
-  isInSoftLiquidation,
-  ...pageProps
-}: ManageLoanProps & { isInSoftLiquidation: boolean | undefined }) => {
-  const shouldUseSoftLiquidation = useManageSoftLiquidation() && isInSoftLiquidation
-  const shouldUseManageLoanMuiForm = useManageLoanMuiForm()
-  const menu = shouldUseSoftLiquidation
-    ? LendManageSoftLiquidationMenu
-    : shouldUseManageLoanMuiForm
-      ? LendManageNewMenu
-      : LendManageLegacyMenu
-  const shouldWrap = menu === LendManageLegacyMenu
-  return <FormTabs params={pageProps} menu={menu} shouldWrap={shouldWrap} />
-}
diff --git a/apps/main/src/lend/components/PageLoanManage/Page.tsx b/apps/main/src/lend/components/PageLoanManage/Page.tsx
index 0ca3e148c9..4613d40239 100644
--- a/apps/main/src/lend/components/PageLoanManage/Page.tsx
+++ b/apps/main/src/lend/components/PageLoanManage/Page.tsx
@@ -3,7 +3,8 @@ import type { Address } from 'viem'
 import CampaignRewardsBanner from '@/lend/components/CampaignRewardsBanner'
 import { MarketInformationComp } from '@/lend/components/MarketInformationComp'
 import { MarketInformationTabs } from '@/lend/components/MarketInformationTabs'
-import { ManageLoanTabs } from '@/lend/components/PageLoanManage/ManageLoanTabs'
+import LoanMange from '@/lend/components/PageLoanManage/index'
+import type { DetailInfoTypes } from '@/lend/components/PageLoanManage/types'
 import { useOneWayMarket } from '@/lend/entities/chain'
 import { useBorrowPositionDetails } from '@/lend/hooks/useBorrowPositionDetails'
 import { useLendPageTitle } from '@/lend/hooks/useLendPageTitle'
@@ -15,6 +16,7 @@ import useStore from '@/lend/store/useStore'
 import { type MarketUrlParams } from '@/lend/types/lend.types'
 import { getVaultPathname, parseMarketParams } from '@/lend/utils/helpers'
 import { getCollateralListPathname } from '@/lend/utils/utilsRouter'
+import { ManageSoftLiquidation } from '@/llamalend/features/manage-soft-liquidation'
 import { MarketDetails } from '@/llamalend/features/market-details'
 import { BorrowPositionDetails, NoPosition } from '@/llamalend/features/market-position-details'
 import { UserPositionHistory } from '@/llamalend/features/user-position-history'
@@ -28,6 +30,7 @@ import Box from '@ui/Box'
 import { ConnectWalletPrompt, isLoading, useConnection, useWallet } from '@ui-kit/features/connect-wallet'
 import { useLayoutStore } from '@ui-kit/features/layout'
 import { useParams } from '@ui-kit/hooks/router'
+import { useManageSoftLiquidation } from '@ui-kit/hooks/useFeatureFlags'
 import { t } from '@ui-kit/lib/i18n'
 import { REFRESH_INTERVAL } from '@ui-kit/lib/model'
 import { ErrorPage } from '@ui-kit/pages/ErrorPage'
@@ -37,12 +40,13 @@ const { Spacing } = SizesAndSpaces
 
 const Page = () => {
   const params = useParams<MarketUrlParams>()
-  const { rMarket, rChainId } = parseMarketParams(params)
+  const { rMarket, rChainId, rFormType } = parseMarketParams(params)
   const { llamaApi: api = null, connectState } = useConnection()
   const titleMapper = useTitleMapper()
   const { data: market, isSuccess } = useOneWayMarket(rChainId, rMarket)
   const rOwmId = market?.id ?? ''
   const userActiveKey = helpers.getUserActiveKey(api, market!)
+  const isMdUp = useLayoutStore((state) => state.isMdUp)
   const isPageVisible = useLayoutStore((state) => state.isPageVisible)
   const fetchAllMarketDetails = useStore((state) => state.markets.fetchAll)
   const fetchAllUserMarketDetails = useStore((state) => state.user.fetchAll)
@@ -84,8 +88,15 @@ const Page = () => {
     network,
   })
 
-  const isInSoftLiquidation =
-    borrowPositionDetails.liquidationAlert.softLiquidation || borrowPositionDetails.liquidationAlert.hardLiquidation
+  const isManageSoftLiq =
+    useManageSoftLiquidation() &&
+    (borrowPositionDetails.liquidationAlert.softLiquidation || borrowPositionDetails.liquidationAlert.hardLiquidation)
+
+  // set tabs
+  const DETAIL_INFO_TYPES: { key: DetailInfoTypes; label: string }[] = [{ label: t`Market Details`, key: 'market' }]
+  if (signerAddress) {
+    DETAIL_INFO_TYPES.push({ label: t`Your Details`, key: 'user' })
+  }
 
   useEffect(() => {
     if (api && market && isPageVisible) {
@@ -112,6 +123,7 @@ const Page = () => {
     params,
     rChainId,
     rOwmId,
+    rFormType,
     isLoaded,
     api,
     market,
@@ -121,7 +133,7 @@ const Page = () => {
 
   const positionDetailsHrefs = {
     borrow: '',
-    supply: getVaultPathname(params, rOwmId),
+    supply: getVaultPathname(params, rOwmId, 'deposit'),
   }
 
   return isSuccess && !market ? (
@@ -130,7 +142,13 @@ const Page = () => {
     <>
       <DetailPageStack>
         <AppPageFormsWrapper>
-          {rChainId && rOwmId && <ManageLoanTabs isInSoftLiquidation={isInSoftLiquidation} {...pageProps} />}
+          {rChainId &&
+            rOwmId &&
+            (isManageSoftLiq ? (
+              <ManageSoftLiquidation marketId={rOwmId} chainId={rChainId} network={network} />
+            ) : (
+              <LoanMange {...pageProps} />
+            ))}
         </AppPageFormsWrapper>
         <Stack flexDirection="column" flexGrow={1} sx={{ gap: Spacing.md }}>
           <CampaignRewardsBanner
diff --git a/apps/main/src/lend/components/PageLoanManage/index.tsx b/apps/main/src/lend/components/PageLoanManage/index.tsx
new file mode 100644
index 0000000000..6fbdbfb48c
--- /dev/null
+++ b/apps/main/src/lend/components/PageLoanManage/index.tsx
@@ -0,0 +1,157 @@
+import { useEffect, useMemo, useState } from 'react'
+import LoanBorrowMore from '@/lend/components/PageLoanManage/LoanBorrowMore'
+import LoanCollateralAdd from '@/lend/components/PageLoanManage/LoanCollateralAdd'
+import LoanCollateralRemove from '@/lend/components/PageLoanManage/LoanCollateralRemove'
+import LoanRepay from '@/lend/components/PageLoanManage/LoanRepay'
+import LoanSelfLiquidation from '@/lend/components/PageLoanManage/LoanSelfLiquidation'
+import type { CollateralFormType, LeverageFormType, LoanFormType } from '@/lend/components/PageLoanManage/types'
+import networks from '@/lend/networks'
+import { type MarketUrlParams, PageContentProps } from '@/lend/types/lend.types'
+import { getLoanManagePathname } from '@/lend/utils/utilsRouter'
+import { AddCollateralForm } from '@/llamalend/features/manage-loan/components/AddCollateralForm'
+import { RemoveCollateralForm } from '@/llamalend/features/manage-loan/components/RemoveCollateralForm'
+import { RepayForm } from '@/llamalend/features/manage-loan/components/RepayForm'
+import Stack from '@mui/material/Stack'
+import { AppFormContentWrapper } from '@ui/AppForm'
+import { useNavigate } from '@ui-kit/hooks/router'
+import { useManageLoanMuiForm } from '@ui-kit/hooks/useFeatureFlags'
+import { t } from '@ui-kit/lib/i18n'
+import { type TabOption, TabsSwitcher } from '@ui-kit/shared/ui/TabsSwitcher'
+import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
+
+const { MaxWidth } = SizesAndSpaces
+
+const tabsLoan: TabOption<LoanFormType>[] = [
+  { value: 'loan-increase', label: t`Borrow more` },
+  { value: 'loan-decrease', label: t`Repay` },
+  { value: 'loan-liquidate', label: t`Self-liquidate` },
+]
+
+const tabsCollateral: TabOption<CollateralFormType>[] = [
+  { value: 'collateral-increase', label: t`Add collateral` },
+  { value: 'collateral-decrease', label: t`Remove collateral` },
+]
+
+const ManageLoan = (pageProps: PageContentProps & { params: MarketUrlParams }) => {
+  const { rChainId, rOwmId, rFormType, market, params, isLoaded } = pageProps
+  const push = useNavigate()
+  const shouldUseManageLoanMuiForm = useManageLoanMuiForm()
+  const useMuiForm = shouldUseManageLoanMuiForm && !!market
+
+  type Tab = 'loan' | 'collateral' | 'leverage'
+  const tabs: TabOption<Tab>[] = useMemo(
+    () => [
+      { value: 'loan' as const, label: t`Loan` },
+      { value: 'collateral' as const, label: t`Collateral` },
+      ...(market?.leverage?.hasLeverage() ? [{ value: 'leverage' as const, label: t`Leverage` }] : []),
+    ],
+    [market?.leverage],
+  )
+
+  type SubTab = LoanFormType | CollateralFormType | LeverageFormType
+  const [subTab, setSubTab] = useState<SubTab | undefined>('loan-increase')
+
+  const subTabs = useMemo(
+    () => (!rFormType || rFormType === 'loan' ? tabsLoan : rFormType === 'collateral' ? tabsCollateral : []),
+    [rFormType],
+  )
+
+  useEffect(() => setSubTab(subTabs[0]?.value), [subTabs])
+
+  return (
+    <Stack
+      sx={{
+        width: { mobile: '100%', tablet: MaxWidth.actionCard },
+        marginInline: { mobile: 'auto', desktop: 0 },
+      }}
+    >
+      <TabsSwitcher
+        variant="contained"
+        size="medium"
+        value={!rFormType ? 'loan' : rFormType}
+        onChange={(key) => push(getLoanManagePathname(params, rOwmId, key))}
+        options={tabs}
+      />
+      {useMuiForm ? (
+        <>
+          <TabsSwitcher
+            variant="underlined"
+            size="small"
+            value={subTab}
+            onChange={setSubTab}
+            options={subTabs}
+            fullWidth
+          />
+
+          {subTab === 'loan-increase' && (
+            <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+              <AppFormContentWrapper>
+                <LoanBorrowMore {...pageProps} />
+              </AppFormContentWrapper>
+            </Stack>
+          )}
+          {subTab === 'loan-decrease' && market && (
+            <RepayForm
+              networks={networks}
+              chainId={rChainId}
+              market={market}
+              enabled={isLoaded}
+              // No extra side effects required for legacy store; llamalend hooks handle cache invalidation.
+              onRepaid={async () => {}}
+            />
+          )}
+          {subTab === 'loan-liquidate' && <LoanSelfLiquidation {...pageProps} />}
+          {subTab === 'collateral-increase' && market && (
+            <AddCollateralForm
+              networks={networks}
+              chainId={rChainId}
+              market={market}
+              enabled={isLoaded}
+              onAdded={async () => {}}
+            />
+          )}
+          {subTab === 'collateral-decrease' && market && (
+            <RemoveCollateralForm
+              networks={networks}
+              chainId={rChainId}
+              market={market}
+              enabled={isLoaded}
+              onRemoved={async () => {}}
+            />
+          )}
+          {/** Leverage has no subtabs */}
+          {rFormType === 'leverage' && (
+            <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+              <AppFormContentWrapper>
+                <LoanBorrowMore isLeverage {...pageProps} />
+              </AppFormContentWrapper>
+            </Stack>
+          )}
+        </>
+      ) : (
+        <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+          <TabsSwitcher
+            variant="underlined"
+            size="small"
+            value={subTab}
+            onChange={setSubTab}
+            options={subTabs}
+            fullWidth
+          />
+
+          <AppFormContentWrapper>
+            {subTab === 'loan-increase' && <LoanBorrowMore {...pageProps} />}
+            {subTab === 'loan-decrease' && <LoanRepay {...pageProps} />}
+            {subTab === 'loan-liquidate' && <LoanSelfLiquidation {...pageProps} />}
+            {subTab === 'collateral-increase' && <LoanCollateralAdd {...pageProps} />}
+            {subTab === 'collateral-decrease' && <LoanCollateralRemove {...pageProps} />}
+            {/** Leverage has no subtabs */}
+            {rFormType === 'leverage' && <LoanBorrowMore isLeverage {...pageProps} />}
+          </AppFormContentWrapper>
+        </Stack>
+      )}
+    </Stack>
+  )
+}
+
+export default ManageLoan
diff --git a/apps/main/src/lend/components/PageLoanManage/types.ts b/apps/main/src/lend/components/PageLoanManage/types.ts
index a1a7aef085..b57bb5ee69 100644
--- a/apps/main/src/lend/components/PageLoanManage/types.ts
+++ b/apps/main/src/lend/components/PageLoanManage/types.ts
@@ -1,6 +1,10 @@
 import { FutureRates } from '@/lend/types/lend.types'
 
 export type DetailInfoTypes = 'user' | 'market'
+export type FormType = 'loan' | 'collateral' | 'leverage'
+export type LoanFormType = 'loan-increase' | 'loan-decrease' | 'loan-liquidate'
+export type CollateralFormType = 'collateral-increase' | 'collateral-decrease'
+export type LeverageFormType = 'leverage-borrow-more'
 
 export type FormStatus = {
   isApproved: boolean
diff --git a/apps/main/src/lend/components/PageVault/Page.tsx b/apps/main/src/lend/components/PageVault/Page.tsx
index 8aa4162fa3..c93412ea6b 100644
--- a/apps/main/src/lend/components/PageVault/Page.tsx
+++ b/apps/main/src/lend/components/PageVault/Page.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from 'react'
 import CampaignRewardsBanner from '@/lend/components/CampaignRewardsBanner'
 import { MarketInformationComp } from '@/lend/components/MarketInformationComp'
 import { MarketInformationTabs } from '@/lend/components/MarketInformationTabs'
-import { VaultTabs } from '@/lend/components/PageVault/VaultTabs'
+import Vault from '@/lend/components/PageVault/index'
 import { useOneWayMarket } from '@/lend/entities/chain'
 import { useLendPageTitle } from '@/lend/hooks/useLendPageTitle'
 import { useMarketDetails } from '@/lend/hooks/useMarketDetails'
@@ -36,7 +36,7 @@ const { Spacing } = SizesAndSpaces
 
 const Page = () => {
   const params = useParams<MarketUrlParams>()
-  const { rMarket, rChainId } = parseMarketParams(params)
+  const { rMarket, rChainId, rFormType } = parseMarketParams(params)
   const { connect, provider } = useWallet()
   const { llamaApi: api = null, connectState } = useConnection()
   const titleMapper = useTitleMapper()
@@ -99,6 +99,7 @@ const Page = () => {
     params,
     rChainId,
     rOwmId,
+    rFormType,
     isLoaded,
     api,
     market,
@@ -107,7 +108,10 @@ const Page = () => {
   }
 
   const borrowPathnameFn = loanExists ? getLoanManagePathname : getLoanCreatePathname
-  const positionDetailsHrefs = { borrow: borrowPathnameFn(params, rOwmId), supply: '' }
+  const positionDetailsHrefs = {
+    borrow: borrowPathnameFn(params, rOwmId, ''),
+    supply: '',
+  }
   const hasSupplyPosition = (supplyPositionDetails.shares.value ?? 0) > 0
 
   return isSuccess && !market ? (
@@ -115,7 +119,7 @@ const Page = () => {
   ) : provider ? (
     <>
       <DetailPageStack>
-        <AppPageFormsWrapper>{rChainId && rOwmId && <VaultTabs {...pageProps} params={params} />}</AppPageFormsWrapper>
+        <AppPageFormsWrapper>{rChainId && rOwmId && <Vault {...pageProps} params={params} />}</AppPageFormsWrapper>
         <Stack flexDirection="column" flexGrow={1} sx={{ gap: Spacing.md }}>
           <CampaignRewardsBanner
             chainId={rChainId}
diff --git a/apps/main/src/lend/components/PageVault/VaultDepositMint/index.tsx b/apps/main/src/lend/components/PageVault/VaultDepositMint/index.tsx
index 695a6f43b6..1d8ec1b20b 100644
--- a/apps/main/src/lend/components/PageVault/VaultDepositMint/index.tsx
+++ b/apps/main/src/lend/components/PageVault/VaultDepositMint/index.tsx
@@ -29,8 +29,7 @@ import { LargeTokenInput } from '@ui-kit/shared/ui/LargeTokenInput'
 import { TokenLabel } from '@ui-kit/shared/ui/TokenLabel'
 import { decimal, type Decimal } from '@ui-kit/utils'
 
-const VaultDepositMint = ({ rChainId, rOwmId, isLoaded, api, market, userActiveKey }: PageContentProps) => {
-  const rFormType = 'deposit'
+const VaultDepositMint = ({ rChainId, rOwmId, rFormType, isLoaded, api, market, userActiveKey }: PageContentProps) => {
   const isSubscribed = useRef(false)
   const marketAlert = useMarketAlert(rChainId, rOwmId)
 
@@ -177,7 +176,7 @@ const VaultDepositMint = ({ rChainId, rOwmId, isLoaded, api, market, userActiveK
 
   // steps
   useEffect(() => {
-    if (isLoaded && api && market) {
+    if (isLoaded && api && market && rFormType) {
       const updatedSteps = getSteps(activeKey, rFormType, api, market, formStatus, formValues, steps)
       setSteps(updatedSteps)
     }
diff --git a/apps/main/src/lend/components/PageVault/VaultStake/index.tsx b/apps/main/src/lend/components/PageVault/VaultStake/index.tsx
index c88b03bf1c..7a20024fdd 100644
--- a/apps/main/src/lend/components/PageVault/VaultStake/index.tsx
+++ b/apps/main/src/lend/components/PageVault/VaultStake/index.tsx
@@ -24,8 +24,7 @@ import { t } from '@ui-kit/lib/i18n'
 import { LargeTokenInput } from '@ui-kit/shared/ui/LargeTokenInput'
 import { decimal, type Decimal } from '@ui-kit/utils'
 
-const VaultStake = ({ rChainId, rOwmId, isLoaded, api, market, userActiveKey }: PageContentProps) => {
-  const rFormType = 'stake'
+const VaultStake = ({ rChainId, rOwmId, rFormType, isLoaded, api, market, userActiveKey }: PageContentProps) => {
   const isSubscribed = useRef(false)
 
   const activeKey = useStore((state) => state.vaultStake.activeKey)
diff --git a/apps/main/src/lend/components/PageVault/VaultTabs.tsx b/apps/main/src/lend/components/PageVault/VaultTabs.tsx
deleted file mode 100644
index 49e8e0ba1f..0000000000
--- a/apps/main/src/lend/components/PageVault/VaultTabs.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import VaultClaim from '@/lend/components/PageVault/VaultClaim'
-import VaultDepositMint from '@/lend/components/PageVault/VaultDepositMint'
-import VaultStake from '@/lend/components/PageVault/VaultStake'
-import VaultUnstake from '@/lend/components/PageVault/VaultUnstake'
-import VaultWithdrawRedeem from '@/lend/components/PageVault/VaultWithdrawRedeem'
-import { type MarketUrlParams, PageContentProps } from '@/lend/types/lend.types'
-import { t } from '@ui-kit/lib/i18n'
-import { FormTab, FormTabs } from '@ui-kit/shared/ui/FormTabs/FormTabs'
-
-type VaultProps = PageContentProps<MarketUrlParams>
-
-const menu = [
-  {
-    value: 'deposit',
-    label: t`Deposit`,
-    subTabs: [
-      { value: 'deposit', label: t`Deposit`, component: VaultDepositMint },
-      { value: 'stake', label: t`Stake`, component: VaultStake },
-    ],
-  },
-  {
-    value: 'withdraw',
-    label: t`Withdraw`,
-    subTabs: [
-      { value: 'withdraw', label: t`Withdraw`, component: VaultWithdrawRedeem },
-      { value: 'unstake', label: t`Unstake`, component: VaultUnstake },
-      { value: 'claim', label: t`Claim Rewards`, component: VaultClaim },
-    ],
-  },
-] satisfies FormTab<VaultProps>[]
-
-export const VaultTabs = (pageProps: VaultProps) => <FormTabs params={pageProps} menu={menu} shouldWrap />
diff --git a/apps/main/src/lend/components/PageVault/VaultUnstake/index.tsx b/apps/main/src/lend/components/PageVault/VaultUnstake/index.tsx
index 4949ab340f..94278d61f5 100644
--- a/apps/main/src/lend/components/PageVault/VaultUnstake/index.tsx
+++ b/apps/main/src/lend/components/PageVault/VaultUnstake/index.tsx
@@ -23,8 +23,7 @@ import { t } from '@ui-kit/lib/i18n'
 import { LargeTokenInput } from '@ui-kit/shared/ui/LargeTokenInput'
 import { decimal, type Decimal } from '@ui-kit/utils'
 
-const VaultUnstake = ({ rChainId, rOwmId, isLoaded, api, market, userActiveKey }: PageContentProps) => {
-  const rFormType = 'unstake'
+const VaultUnstake = ({ rChainId, rOwmId, rFormType, isLoaded, api, market, userActiveKey }: PageContentProps) => {
   const isSubscribed = useRef(false)
 
   const activeKey = useStore((state) => state.vaultUnstake.activeKey)
diff --git a/apps/main/src/lend/components/PageVault/VaultWithdrawRedeem/index.tsx b/apps/main/src/lend/components/PageVault/VaultWithdrawRedeem/index.tsx
index e4a2d01044..b44ea416ba 100644
--- a/apps/main/src/lend/components/PageVault/VaultWithdrawRedeem/index.tsx
+++ b/apps/main/src/lend/components/PageVault/VaultWithdrawRedeem/index.tsx
@@ -27,8 +27,15 @@ import { t } from '@ui-kit/lib/i18n'
 import { LargeTokenInput } from '@ui-kit/shared/ui/LargeTokenInput'
 import { decimal, type Decimal } from '@ui-kit/utils'
 
-const VaultWithdrawRedeem = ({ rChainId, rOwmId, isLoaded, api, market, userActiveKey }: PageContentProps) => {
-  const rFormType = 'withdraw'
+const VaultWithdrawRedeem = ({
+  rChainId,
+  rOwmId,
+  rFormType,
+  isLoaded,
+  api,
+  market,
+  userActiveKey,
+}: PageContentProps) => {
   const isSubscribed = useRef(false)
 
   const activeKey = useStore((state) => state.vaultWithdrawRedeem.activeKey)
diff --git a/apps/main/src/lend/components/PageVault/index.tsx b/apps/main/src/lend/components/PageVault/index.tsx
new file mode 100644
index 0000000000..a9e44c57c5
--- /dev/null
+++ b/apps/main/src/lend/components/PageVault/index.tsx
@@ -0,0 +1,72 @@
+import { useEffect, useMemo, useState } from 'react'
+import VaultClaim from '@/lend/components/PageVault/VaultClaim'
+import VaultDepositMint from '@/lend/components/PageVault/VaultDepositMint'
+import VaultStake from '@/lend/components/PageVault/VaultStake'
+import VaultUnstake from '@/lend/components/PageVault/VaultUnstake'
+import VaultWithdrawRedeem from '@/lend/components/PageVault/VaultWithdrawRedeem'
+import {
+  type MarketUrlParams,
+  PageContentProps,
+  type VaultDepositFormType,
+  type VaultWithdrawFormType,
+} from '@/lend/types/lend.types'
+import { getVaultPathname } from '@/lend/utils/utilsRouter'
+import Stack from '@mui/material/Stack'
+import { AppFormContentWrapper } from '@ui/AppForm'
+import { useNavigate } from '@ui-kit/hooks/router'
+import { t } from '@ui-kit/lib/i18n'
+import { type TabOption, TabsSwitcher } from '@ui-kit/shared/ui/TabsSwitcher'
+
+type FormType = 'deposit' | 'withdraw'
+
+const tabs: TabOption<FormType>[] = [
+  { value: 'deposit', label: t`Deposit` },
+  { value: 'withdraw', label: t`Withdraw` },
+]
+
+const tabsDeposit: TabOption<VaultDepositFormType>[] = [
+  { value: 'deposit', label: t`Deposit` },
+  { value: 'stake', label: t`Stake` },
+]
+
+const tabsWithdraw: TabOption<VaultWithdrawFormType>[] = [
+  { value: 'withdraw', label: t`Withdraw` },
+  { value: 'unstake', label: t`Unstake` },
+  { value: 'claim', label: t`Claim Rewards` },
+]
+
+const Vault = (pageProps: PageContentProps & { params: MarketUrlParams }) => {
+  const { rOwmId, rFormType, params } = pageProps
+  const push = useNavigate()
+
+  type SubTab = VaultDepositFormType | VaultWithdrawFormType
+  const [subTab, setSubTab] = useState<SubTab>('deposit')
+
+  const subTabs = useMemo(() => (!rFormType || rFormType === 'deposit' ? tabsDeposit : tabsWithdraw), [rFormType])
+  useEffect(() => setSubTab(subTabs[0]?.value), [subTabs])
+
+  return (
+    <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
+      <TabsSwitcher
+        variant="contained"
+        size="medium"
+        value={!rFormType ? 'deposit' : rFormType}
+        onChange={(key) => push(getVaultPathname(params, rOwmId, key))}
+        options={tabs}
+        fullWidth
+      />
+
+      <TabsSwitcher variant="underlined" size="small" value={subTab} onChange={setSubTab} options={subTabs} fullWidth />
+
+      <AppFormContentWrapper>
+        {subTab === 'deposit' && <VaultDepositMint {...pageProps} rFormType="deposit" />}
+        {subTab === 'stake' && <VaultStake {...pageProps} rFormType="stake" />}
+        {subTab === 'withdraw' && <VaultWithdrawRedeem {...pageProps} rFormType="withdraw" />}
+        {subTab === 'unstake' && <VaultUnstake {...pageProps} rFormType="unstake" />}
+        {subTab === 'claim' && <VaultClaim {...pageProps} rFormType="claim" />}
+      </AppFormContentWrapper>
+    </Stack>
+  )
+}
+
+export default Vault
diff --git a/apps/main/src/lend/constants.ts b/apps/main/src/lend/constants.ts
index 06c99b8b98..cac97898b8 100644
--- a/apps/main/src/lend/constants.ts
+++ b/apps/main/src/lend/constants.ts
@@ -1,19 +1,13 @@
 import { LEND_ROUTES } from '@ui-kit/shared/routes'
 
-export const MARKET_ROUTES = {
-  PAGE_CREATE: '/create',
-  PAGE_MANAGE: '/manage',
-  PAGE_VAULT: '/vault',
-} as const
-
-export type LendMarketRoute = (typeof MARKET_ROUTES)[keyof typeof MARKET_ROUTES]
-
 export const ROUTE = {
   ...LEND_ROUTES,
   PAGE_INTEGRATIONS: '/integrations',
-  ...MARKET_ROUTES,
+  PAGE_CREATE: '/create',
+  PAGE_MANAGE: '/manage',
+  PAGE_VAULT: '/vault',
   PAGE_404: '/404',
-} as const
+}
 
 // TODO: translation
 export const NOFITY_MESSAGE = {
diff --git a/apps/main/src/lend/hooks/useBorrowPositionDetails.ts b/apps/main/src/lend/hooks/useBorrowPositionDetails.ts
index 653c9dff10..b465193a93 100644
--- a/apps/main/src/lend/hooks/useBorrowPositionDetails.ts
+++ b/apps/main/src/lend/hooks/useBorrowPositionDetails.ts
@@ -34,19 +34,11 @@ export const useBorrowPositionDetails = ({
 }: UseBorrowPositionDetailsProps): BorrowPositionDetailsProps => {
   const { controller } = market?.addresses ?? {}
   const { address: userAddress } = useAccount()
-  const { data: loanExists } = useLoanExists({
+  const { data: userLoanDetails, isLoading: isUserLoanDetailsLoading } = useUserLoanDetails({
     chainId,
     marketId,
     userAddress,
   })
-  const { data: userLoanDetails, isLoading: isUserLoanDetailsLoading } = useUserLoanDetails(
-    {
-      chainId,
-      marketId,
-      userAddress,
-    },
-    !!loanExists,
-  )
   const {
     bands,
     health,
@@ -57,6 +49,11 @@ export const useBorrowPositionDetails = ({
     state: { collateral, borrowed, debt } = {},
   } = userLoanDetails ?? {}
   const prices = useStore((state) => state.markets.pricesMapper[chainId]?.[marketId])
+  const { data: loanExists } = useLoanExists({
+    chainId,
+    marketId,
+    userAddress,
+  })
   const { data: userPnl, isLoading: isUserPnlLoading } = useUserPnl({
     chainId,
     marketId,
diff --git a/apps/main/src/lend/types/lend.types.ts b/apps/main/src/lend/types/lend.types.ts
index 9f3639f2af..3da350ce59 100644
--- a/apps/main/src/lend/types/lend.types.ts
+++ b/apps/main/src/lend/types/lend.types.ts
@@ -19,7 +19,7 @@ export type EstimatedGas = number | number[] | null
 export type OneWayMarketTemplate = LendMarketTemplate // todo: use LendMarketTemplate consistently
 
 export type NetworkUrlParams = { network: NetworkEnum }
-export type MarketUrlParams = NetworkUrlParams & { market: string }
+export type MarketUrlParams = NetworkUrlParams & { market: string; formType?: RFormType }
 export type UrlParams = NetworkUrlParams & Partial<MarketUrlParams>
 
 export interface NetworkConfig<TId extends string = string, TChainId extends number = number> extends BaseConfig<
@@ -80,10 +80,17 @@ export type ExpectedBorrowed = {
   avgPrice: string
 }
 
-export type PageContentProps<T = UrlParams> = {
-  params: T
+export type VaultCreateFormType = 'create' | 'leverage'
+export type VaultDepositFormType = 'deposit' | 'stake'
+export type VaultWithdrawFormType = 'withdraw' | 'unstake' | 'claim'
+export type VaultManageFormType = 'loan' | 'collateral'
+export type RFormType = VaultCreateFormType | VaultDepositFormType | VaultWithdrawFormType | VaultManageFormType | ''
+
+export type PageContentProps = {
+  params: UrlParams
   rChainId: ChainId
   rOwmId: string
+  rFormType: RFormType
   userActiveKey: string
   isLoaded: boolean
   api: LlamaApi | null
diff --git a/apps/main/src/lend/utils/helpers.ts b/apps/main/src/lend/utils/helpers.ts
index 141a72dd62..72f14081fe 100644
--- a/apps/main/src/lend/utils/helpers.ts
+++ b/apps/main/src/lend/utils/helpers.ts
@@ -30,6 +30,14 @@ export function getErrorMessage(error: CustomError, defaultErrorMessage: string)
   return errorMessage
 }
 
+export function scrollToTop() {
+  window.scroll({
+    top: 0,
+    left: 0,
+    behavior: 'smooth',
+  })
+}
+
 export function fulfilledValue<T>(result: PromiseSettledResult<T>) {
   if (result.status === 'fulfilled') {
     return result.value
diff --git a/apps/main/src/lend/utils/utilsRouter.ts b/apps/main/src/lend/utils/utilsRouter.ts
index ac2bbde7c8..2c490a76f1 100644
--- a/apps/main/src/lend/utils/utilsRouter.ts
+++ b/apps/main/src/lend/utils/utilsRouter.ts
@@ -1,4 +1,4 @@
-import { type LendMarketRoute, ROUTE } from '@/lend/constants'
+import { ROUTE } from '@/lend/constants'
 import { networksIdMapper } from '@/lend/networks'
 import { type MarketUrlParams, NetworkUrlParams, type UrlParams } from '@/lend/types/lend.types'
 import { getInternalUrl, LLAMALEND_ROUTES } from '@ui-kit/shared/routes'
@@ -9,19 +9,17 @@ export const getPath = ({ network }: UrlParams, route: string) => getInternalUrl
 export const getCollateralListPathname = ({ network }: NetworkUrlParams) =>
   getInternalUrl('llamalend', network, LLAMALEND_ROUTES.PAGE_MARKETS)
 
-const getMarketPathname = ({ network }: UrlParams, marketId: string, page: LendMarketRoute) =>
-  `${getInternalUrl('lend', network, ROUTE.PAGE_MARKETS)}/${marketId}${page}`
+export const getLoanCreatePathname = (params: UrlParams, owmId: string, formType: string) =>
+  getPath(params, `${ROUTE.PAGE_MARKETS}/${owmId}${ROUTE.PAGE_CREATE}${formType === 'create' ? '' : `/${formType}`}`)
 
-export const getLoanCreatePathname = (params: UrlParams, marketId: string) =>
-  getMarketPathname(params, marketId, ROUTE.PAGE_CREATE)
+export const getLoanManagePathname = (params: UrlParams, owmId: string, formType: string) =>
+  getPath(params, `${ROUTE.PAGE_MARKETS}/${owmId}${ROUTE.PAGE_MANAGE}/${formType}`)
 
-export const getLoanManagePathname = (params: UrlParams, marketId: string) =>
-  getMarketPathname(params, marketId, ROUTE.PAGE_MANAGE)
+export const getVaultPathname = (params: UrlParams, owmId: string, formType: string) =>
+  getPath(params, `${ROUTE.PAGE_MARKETS}/${owmId}${ROUTE.PAGE_VAULT}${formType === 'vault' ? '' : `/${formType}`}`)
 
-export const getVaultPathname = (params: UrlParams, marketId: string) =>
-  getMarketPathname(params, marketId, ROUTE.PAGE_VAULT)
-
-export const parseMarketParams = ({ market, network }: MarketUrlParams) => ({
+export const parseMarketParams = ({ formType, market, network }: MarketUrlParams) => ({
   rMarket: market.toLowerCase(),
   rChainId: networksIdMapper[network],
+  rFormType: formType ?? '',
 })
diff --git a/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx b/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx
index 2b7996d65b..e220cdcd39 100644
--- a/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx
+++ b/apps/main/src/llamalend/features/manage-loan/components/AddCollateralForm.tsx
@@ -25,7 +25,7 @@ export const AddCollateralForm = <ChainId extends IChainId>({
   networks: NetworkDict<ChainId>
   chainId: ChainId
   enabled?: boolean
-  onAdded?: NonNullable<AddCollateralOptions['onAdded']>
+  onAdded: NonNullable<AddCollateralOptions['onAdded']>
 }) => {
   const network = networks[chainId]
   const [isOpen, , , toggle] = useSwitch(false)
diff --git a/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx b/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx
index 9041ad73ab..627257bccf 100644
--- a/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx
+++ b/apps/main/src/llamalend/features/manage-loan/components/RemoveCollateralForm.tsx
@@ -27,7 +27,7 @@ export const RemoveCollateralForm = <ChainId extends IChainId>({
   networks: NetworkDict<ChainId>
   chainId: ChainId
   enabled?: boolean
-  onRemoved?: NonNullable<RemoveCollateralOptions['onRemoved']>
+  onRemoved: NonNullable<RemoveCollateralOptions['onRemoved']>
 }) => {
   const network = networks[chainId]
   const [isOpen, , , toggle] = useSwitch(false)
diff --git a/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx b/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx
index 2a3eead762..ea5a326864 100644
--- a/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx
+++ b/apps/main/src/llamalend/features/manage-loan/components/RepayForm.tsx
@@ -20,18 +20,12 @@ export const RepayForm = <ChainId extends IChainId>({
   chainId,
   enabled,
   onRepaid,
-  fromCollateral,
-  fromWallet,
-  fromBorrowed,
 }: {
   market: LlamaMarketTemplate | undefined
   networks: NetworkDict<ChainId>
   chainId: ChainId
   enabled?: boolean
-  onRepaid?: RepayOptions['onRepaid']
-  fromCollateral?: boolean
-  fromWallet?: boolean
-  fromBorrowed?: boolean
+  onRepaid: NonNullable<RepayOptions['onRepaid']>
 }) => {
   const network = networks[chainId]
   const [isOpen, , , toggle] = useSwitch(false)
@@ -92,39 +86,33 @@ export const RepayForm = <ChainId extends IChainId>({
       }
     >
       <Stack divider={<InputDivider />}>
-        {fromCollateral && (
-          <LoanFormTokenInput
-            label={t`From collateral (position)`}
-            token={collateralToken}
-            blockchainId={network.id}
-            name="stateCollateral"
-            form={form}
-            testId="repay-state-collateral-input"
-            network={network}
-          />
-        )}
-        {fromWallet && (
-          <LoanFormTokenInput
-            label={t`From collateral (wallet)`}
-            token={collateralToken}
-            blockchainId={network.id}
-            name="userCollateral"
-            form={form}
-            testId="repay-user-collateral-input"
-            network={network}
-          />
-        )}
-        {fromBorrowed && (
-          <LoanFormTokenInput
-            label={t`From borrowed token`}
-            token={borrowToken}
-            blockchainId={network.id}
-            name="userBorrowed"
-            form={form}
-            testId="repay-user-borrowed-input"
-            network={network}
-          />
-        )}
+        <LoanFormTokenInput
+          label={t`From collateral (position)`}
+          token={collateralToken}
+          blockchainId={network.id}
+          name="stateCollateral"
+          form={form}
+          testId="repay-state-collateral-input"
+          network={network}
+        />
+        <LoanFormTokenInput
+          label={t`From collateral (wallet)`}
+          token={collateralToken}
+          blockchainId={network.id}
+          name="userCollateral"
+          form={form}
+          testId="repay-user-collateral-input"
+          network={network}
+        />
+        <LoanFormTokenInput
+          label={t`From borrowed token`}
+          token={borrowToken}
+          blockchainId={network.id}
+          name="userBorrowed"
+          form={form}
+          testId="repay-user-borrowed-input"
+          network={network}
+        />
       </Stack>
 
       <Button type="submit" loading={isPending || !market} disabled={isDisabled} data-testid="repay-submit-button">
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts
index 26ee807448..2aebb351fb 100644
--- a/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useAddCollateralForm.ts
@@ -36,7 +36,7 @@ export const useAddCollateralForm = <ChainId extends LlamaChainId>({
   network: LlamaNetwork<ChainId>
   networks: NetworkDict<ChainId>
   enabled?: boolean
-  onAdded?: NonNullable<AddCollateralOptions['onAdded']>
+  onAdded: NonNullable<AddCollateralOptions['onAdded']>
 }) => {
   const { address: userAddress } = useAccount()
   const { chainId } = network
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts
index 50735074b6..2328dd7aa2 100644
--- a/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useRemoveCollateralForm.ts
@@ -43,7 +43,7 @@ export const useRemoveCollateralForm = <
   network: BaseConfig<NetworkName, ChainId>
   networks: NetworkDict<ChainId>
   enabled?: boolean
-  onRemoved?: NonNullable<RemoveCollateralOptions['onRemoved']>
+  onRemoved: NonNullable<RemoveCollateralOptions['onRemoved']>
 }) => {
   const { address: userAddress } = useAccount()
   const { chainId } = network
diff --git a/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts b/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts
index 946c29aa21..067ed4054e 100644
--- a/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts
+++ b/apps/main/src/llamalend/features/manage-loan/hooks/useRepayForm.ts
@@ -37,7 +37,7 @@ export const useRepayForm = <ChainId extends LlamaChainId, NetworkName extends L
   network: { id: LlamaNetworkId; chainId: ChainId }
   networks: NetworkDict<ChainId>
   enabled?: boolean
-  onRepaid?: RepayOptions['onRepaid']
+  onRepaid: NonNullable<RepayOptions['onRepaid']>
 }) => {
   const { address: userAddress } = useAccount()
   const { chainId } = network
diff --git a/apps/main/src/llamalend/mutations/repay.mutation.ts b/apps/main/src/llamalend/mutations/repay.mutation.ts
index 1aba4a27c9..44fc7c3156 100644
--- a/apps/main/src/llamalend/mutations/repay.mutation.ts
+++ b/apps/main/src/llamalend/mutations/repay.mutation.ts
@@ -20,7 +20,7 @@ type RepayMutation = { stateCollateral: Decimal; userCollateral: Decimal; userBo
 export type RepayOptions = {
   marketId: string | undefined
   network: { id: LlamaNetworkId; chainId: LlamaChainId }
-  onRepaid?: LlammaMutationOptions<RepayMutation>['onSuccess']
+  onRepaid: LlammaMutationOptions<RepayMutation>['onSuccess']
   onReset?: () => void
   userAddress: Address | undefined
 }
diff --git a/apps/main/src/llamalend/mutations/useLlammaMutation.ts b/apps/main/src/llamalend/mutations/useLlammaMutation.ts
index 4abb634f60..261dbb1335 100644
--- a/apps/main/src/llamalend/mutations/useLlammaMutation.ts
+++ b/apps/main/src/llamalend/mutations/useLlammaMutation.ts
@@ -70,7 +70,7 @@ export type LlammaMutationOptions<TVariables extends object, TData extends Resul
   /** Message to display on success */
   successMessage: (variables: TVariables, context: Context) => string
   /** Callback executed on successful mutation */
-  onSuccess?: (
+  onSuccess: (
     data: TData,
     receipt: FormattedTransactionReceipt,
     variables: TVariables,
@@ -130,7 +130,7 @@ export function useLlammaMutation<TVariables extends object, TData extends Resul
       updateUserEventsApi(wallet!, { id: networkId }, context.market, receipt.transactionHash)
       await invalidateAllUserMarketDetails({ chainId, marketId, userAddress })
       onReset?.()
-      await onSuccess?.(data, receipt, variables, context)
+      await onSuccess(data, receipt, variables, context)
     },
     onError: (error, variables, context) => {
       logError(mutationKey, { error, variables, marketId: context?.market.id })
diff --git a/apps/main/src/loan/components/PageLoanCreate/index.tsx b/apps/main/src/loan/components/PageLoanCreate/index.tsx
index 6a27973b91..c2c7851abd 100644
--- a/apps/main/src/loan/components/PageLoanCreate/index.tsx
+++ b/apps/main/src/loan/components/PageLoanCreate/index.tsx
@@ -55,7 +55,7 @@ const LoanCreate = ({
   const onUpdate = useOnFormUpdate(props)
   const onLoanCreated = useStore((state) => state.loanCreate.onLoanCreated)
 
-  const onCreated: NonNullable<CreateLoanOptions['onCreated']> = useCallback(
+  const onCreated: CreateLoanOptions['onCreated'] = useCallback(
     async (_data, _receipt, { slippage, leverageEnabled }: BorrowMutation) =>
       curve && llamma && (await onLoanCreated(curve, leverageEnabled, llamma, slippage)),
     [curve, llamma, onLoanCreated],
diff --git a/apps/main/src/loan/components/PageLoanManage/index.tsx b/apps/main/src/loan/components/PageLoanManage/index.tsx
index 481e69d179..991b5dd60e 100644
--- a/apps/main/src/loan/components/PageLoanManage/index.tsx
+++ b/apps/main/src/loan/components/PageLoanManage/index.tsx
@@ -103,9 +103,6 @@ const LoanManage = ({ curve, isReady, llamma, llammaId, params, rChainId, rColla
               market={llamma}
               enabled={isReady}
               onRepaid={async () => {}}
-              fromBorrowed
-              fromCollateral
-              fromWallet
             />
           )}
           {subTab === 'loan-liquidate' && <LoanLiquidate {...formProps} params={params} />}
diff --git a/apps/main/src/routes/lend.routes.tsx b/apps/main/src/routes/lend.routes.tsx
index 6b0a942f70..4d729d6638 100644
--- a/apps/main/src/routes/lend.routes.tsx
+++ b/apps/main/src/routes/lend.routes.tsx
@@ -32,7 +32,7 @@ export const lendRoutes = lendLayoutRoute.addChildren([
   }),
   createRoute({
     path: '$network',
-    loader: ({ params: { network } }) => redirectTo(`/lend/${network}/markets`),
+    loader: ({ params: { network } }) => redirectTo(`/lend/${network}/markets/`),
     ...layoutProps,
   }),
   createRoute({
@@ -58,17 +58,20 @@ export const lendRoutes = lendLayoutRoute.addChildren([
   }),
   createRoute({
     path: '$network/markets',
-    loader: ({ params: { network } }) => redirectTo(`/llamalend/${network}/markets`),
+    loader: ({ params: { network } }) => redirectTo(`/llamalend/${network}/markets/`),
     ...layoutProps,
   }),
   createRoute({
     path: '$network/markets/$market',
-    loader: ({ params: { network, market } }) => redirectTo(`/lend/${network}/markets/${market}/manage`),
+    loader: ({ params: { network, market } }) => redirectTo(`/lend/${network}/markets/${market}/manage/`),
     ...layoutProps,
   }),
   createRoute({
     path: '$network/markets/$market/create/$formType',
-    loader: ({ params: { network, market } }) => redirectTo(`/lend/${network}/markets/${market}/create`),
+    component: PageLoanCreate,
+    head: ({ params }) => ({
+      meta: [{ title: `Create - ${params.market} - Curve Llamalend` }],
+    }),
     ...layoutProps,
   }),
   createRoute({
@@ -81,7 +84,10 @@ export const lendRoutes = lendLayoutRoute.addChildren([
   }),
   createRoute({
     path: '$network/markets/$market/manage/$formType',
-    loader: ({ params: { network, market } }) => redirectTo(`/lend/${network}/markets/${market}/manage`),
+    component: PageLoanManage,
+    head: ({ params }) => ({
+      meta: [{ title: `Manage - ${params.market} - Curve Llamalend` }],
+    }),
     ...layoutProps,
   }),
   createRoute({
@@ -94,7 +100,10 @@ export const lendRoutes = lendLayoutRoute.addChildren([
   }),
   createRoute({
     path: '$network/markets/$market/vault/$formType',
-    loader: ({ params: { network, market } }) => redirectTo(`/lend/${network}/markets/${market}/vault`),
+    component: PageVault,
+    head: ({ params }) => ({
+      meta: [{ title: `Supply - ${params.market} - Curve Llamalend` }],
+    }),
     ...layoutProps,
   }),
   createRoute({
diff --git a/packages/curve-ui-kit/src/shared/ui/FormTabs/FormTabs.tsx b/packages/curve-ui-kit/src/shared/ui/FormTabs/FormTabs.tsx
deleted file mode 100644
index 26d56d4d73..0000000000
--- a/packages/curve-ui-kit/src/shared/ui/FormTabs/FormTabs.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { type ComponentType, type ReactNode, useState } from 'react'
-import { notFalsy } from '@curvefi/prices-api/objects.util'
-import Stack from '@mui/material/Stack'
-import { AppFormContentWrapper } from '@ui/AppForm'
-import { type TabOption, TabsSwitcher } from '@ui-kit/shared/ui/TabsSwitcher'
-import { WithWrapper } from '@ui-kit/shared/ui/WithWrapper'
-import { SizesAndSpaces } from '@ui-kit/themes/design/1_sizes_spaces'
-
-const { MaxWidth } = SizesAndSpaces
-
-type FnOrValue<Props extends object, Result> = ((props: Props) => Result | undefined) | Result
-
-const applyFnOrValue = <Props extends object, R extends string | boolean>(
-  fnOrValue: FnOrValue<Props, R> | undefined,
-  props: Props,
-): R | undefined => (typeof fnOrValue === 'function' ? fnOrValue(props) : fnOrValue)
-
-type FormSubTab<Props extends object> = Omit<FormTab<Props>, 'subTabs'>
-
-export type FormTab<Props extends object> = {
-  /** Unique value of the tab, it might be used in the URL later */
-  value: string
-  /** Label of the tab, can be a function that receives the form props */
-  label: FnOrValue<Props, string>
-  /** Optional sub-tabs of the tab */
-  subTabs?: FormSubTab<Props>[]
-  /** Function or value to determine if the tab is visible */
-  visible?: FnOrValue<Props, boolean>
-  /** Function or value to determine if the tab is disabled */
-  disabled?: FnOrValue<Props, boolean>
-  /** Component to render when the tab is selected */
-  component?: ComponentType<Props>
-}
-
-const createOptions = <Props extends object>(
-  tabs: FormSubTab<Props>[] | undefined,
-  params: Props,
-): TabOption<string>[] =>
-  tabs
-    ?.filter(({ visible }) => applyFnOrValue(visible, params) !== false)
-    .map(({ value, label, disabled }) => ({
-      value,
-      label: applyFnOrValue(label, params),
-      disabled: applyFnOrValue(disabled, params),
-    })) ?? []
-
-const selectVisible = <Props extends object, Tab extends FormSubTab<Props>>(
-  tabs: Tab[],
-  key: string | undefined,
-  params: Props,
-) => {
-  const visible = tabs.filter(({ visible }) => applyFnOrValue(visible, params) !== false)
-  const result = visible.find(({ value }) => value === key) ?? visible[0]
-  if (!result) throw new Error(`No visible tab found for key ${key} in menu ${tabs.map((t) => t.value).join(', ')}`)
-  return result
-}
-
-type UseFormTabOptions<T extends object> = {
-  menu: FormTab<T>[]
-  params: T
-}
-
-/** Hook to manage form tabs and sub-tabs. */
-function useFormTabs<T extends object>({ menu, params }: UseFormTabOptions<T>) {
-  const [tabKey, onChangeTab] = useState<string>()
-  const [subTabKey, onChangeSubTab] = useState<string>()
-  const tab = selectVisible(menu, tabKey, params)
-  const tabs = createOptions(menu, params)
-  const subTab = tab.subTabs && selectVisible(tab.subTabs, subTabKey, params)
-  const subTabs = createOptions(tab.subTabs, params)
-
-  const components = notFalsy(subTab?.component, tab.component)
-  if (components.length != 1) throw new Error(`${components.length} components found for [${tabKey}, ${subTabKey}]`)
-
-  return { tab, tabs, subTabs, subTab, Component: components[0], onChangeTab, onChangeSubTab }
-}
-
-/**
- * Adds a background to the form content. In the new forms we don't show the background at this level,
- * we still render AppFormContentWrapper there. However, in the new forms the accordion stays outside the background,
- * but is still co-located with the form content.
- */
-const LegacyFormWrapper = ({ children }: { children: ReactNode }) => (
-  <Stack sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}>
-    <AppFormContentWrapper>{children}</AppFormContentWrapper>
-  </Stack>
-)
-
-/**
- * Form wrapper that displays tabs and handles tab switching. It supports sub-tabs as well.
- */
-export function FormTabs<T extends object>({ shouldWrap, ...options }: UseFormTabOptions<T> & { shouldWrap: boolean }) {
-  const { tab, tabs, subTabs, subTab, Component, onChangeTab, onChangeSubTab } = useFormTabs(options)
-  return (
-    <Stack
-      sx={{ width: { mobile: '100%', tablet: MaxWidth.actionCard }, marginInline: { mobile: 'auto', desktop: 0 } }}
-    >
-      <TabsSwitcher variant="contained" size="medium" value={tab.value} options={tabs} onChange={onChangeTab} />
-
-      {subTab && (
-        <TabsSwitcher
-          variant="underlined"
-          size="small"
-          value={subTab.value}
-          options={subTabs}
-          fullWidth
-          sx={{ backgroundColor: (t) => t.design.Layer[1].Fill }}
-          onChange={onChangeSubTab}
-        />
-      )}
-
-      <WithWrapper shouldWrap={shouldWrap} Wrapper={LegacyFormWrapper}>
-        <Component {...options.params} />
-      </WithWrapper>
-    </Stack>
-  )
-}
diff --git a/packages/curve-ui-kit/src/shared/ui/stories/FormTabs.stories.tsx b/packages/curve-ui-kit/src/shared/ui/stories/FormTabs.stories.tsx
deleted file mode 100644
index ac00e77f21..0000000000
--- a/packages/curve-ui-kit/src/shared/ui/stories/FormTabs.stories.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-import { Stack, Typography } from '@mui/material'
-import type { Meta, StoryObj } from '@storybook/react-vite'
-import { FormTabs } from '../FormTabs/FormTabs'
-
-type DemoParams = {
-  availableBalance: number
-  canWithdraw: boolean
-  showAdvanced: boolean
-  userAddress: string
-}
-
-const Panel = ({ title, body }: { title: string; body: string }) => (
-  <Stack gap={1} sx={{ padding: 3, borderRadius: 2, border: (t) => `1px solid ${t.palette.divider}` }}>
-    <Typography variant="headingSBold">{title}</Typography>
-    <Typography variant="bodyMRegular">{body}</Typography>
-  </Stack>
-)
-
-const OverviewTab = ({ availableBalance, userAddress }: DemoParams) => (
-  <Panel
-    title="Overview"
-    body={`Connected as ${userAddress}. Available balance: ${availableBalance.toLocaleString()} crvUSD.`}
-  />
-)
-
-const DepositTab = ({ availableBalance }: DemoParams) => (
-  <Panel
-    title="Deposit"
-    body={`Use this tab for simple flows. Balance shown in labels comes from props (${availableBalance.toLocaleString()} crvUSD).`}
-  />
-)
-
-const WithdrawTab = ({ canWithdraw }: DemoParams) => (
-  <Panel
-    title="Withdraw"
-    body={
-      canWithdraw
-        ? 'Withdraw actions are available and the sub-tab is enabled.'
-        : 'This sub-tab shows the disabled state when withdrawals are locked.'
-    }
-  />
-)
-
-const AdvancedTab = () => <Panel title="Advanced" body="Conditional tab that appears when enabled." />
-
-type StoryArgs = DemoParams & { shouldWrap: boolean }
-
-const FormTabsStory = ({ shouldWrap, ...params }: StoryArgs) => (
-  <FormTabs<DemoParams>
-    params={params}
-    shouldWrap={shouldWrap}
-    menu={[
-      {
-        value: 'overview',
-        label: 'Overview',
-        visible: () => true,
-        component: OverviewTab,
-      },
-      {
-        value: 'manage',
-        label: ({ availableBalance }) => `Manage (${availableBalance.toLocaleString()} crvUSD)`,
-        visible: () => true,
-        subTabs: [
-          { value: 'deposit', label: 'Deposit', visible: () => true, component: DepositTab },
-          {
-            value: 'withdraw',
-            label: ({ canWithdraw }) => (canWithdraw ? 'Withdraw' : 'Withdraw (locked)'),
-            visible: () => true,
-            disabled: ({ canWithdraw }) => !canWithdraw,
-            component: WithdrawTab,
-          },
-        ],
-      },
-      {
-        value: 'advanced',
-        label: 'Advanced',
-        visible: ({ showAdvanced }) => showAdvanced,
-        component: AdvancedTab,
-      },
-    ]}
-  />
-)
-
-const meta: Meta<typeof FormTabsStory> = {
-  title: 'UI Kit/Widgets/FormTabs',
-  component: FormTabsStory,
-  args: {
-    availableBalance: 1250,
-    canWithdraw: true,
-    showAdvanced: false,
-    userAddress: '0x1234...cafe',
-    shouldWrap: false,
-  },
-  argTypes: {
-    availableBalance: {
-      control: { type: 'number', min: 0 },
-      description: 'Value forwarded to labels and tab content.',
-    },
-    canWithdraw: {
-      control: 'boolean',
-      description: 'Toggles the disabled state of the Withdraw sub-tab.',
-    },
-    showAdvanced: {
-      control: 'boolean',
-      description: 'Controls visibility of the Advanced tab.',
-    },
-    userAddress: {
-      control: 'text',
-      description: 'Sample address injected into tab content.',
-    },
-    shouldWrap: {
-      control: 'boolean',
-      description: 'Renders content with the legacy AppForm wrapper background.',
-    },
-  },
-  parameters: {
-    docs: {
-      description: {
-        component:
-          'FormTabs renders primary and nested tabs with optional visibility and disabled states. This story showcases the possible states with sample content.',
-      },
-    },
-  },
-}
-
-type Story = StoryObj<typeof FormTabsStory>
-
-export const BasicTabs: Story = {
-  parameters: {
-    docs: {
-      description: {
-        story: 'Default layout with nested Manage sub-tabs and dynamic labels.',
-      },
-    },
-  },
-}
-
-export const WithConditionalTab: Story = {
-  args: { showAdvanced: true },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Advanced tab appears when visibility is enabled.',
-      },
-    },
-  },
-}
-
-export const WithDisabledSubTab: Story = {
-  args: { canWithdraw: false },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Withdraw sub-tab rendered disabled to highlight the disabled state handling.',
-      },
-    },
-  },
-}
-
-export const LegacyWrapped: Story = {
-  args: { shouldWrap: true },
-  parameters: {
-    docs: {
-      description: {
-        story: 'Illustrates the legacy AppForm background applied via shouldWrap.',
-      },
-    },
-  },
-}
-
-export default meta