diff --git a/src/assets/styles/components/_liquidity.scss b/src/assets/styles/components/_liquidity.scss
index 2589d06..833940b 100644
--- a/src/assets/styles/components/_liquidity.scss
+++ b/src/assets/styles/components/_liquidity.scss
@@ -11,8 +11,8 @@
     font-family: $font-secondary;
 
     @media(min-width: $breakpoint-md) {
-      font-size: 23px;
-      line-height: 28px;
+      font-size: 16px;
+      line-height: 20px;
     }
   }
 }
diff --git a/src/assets/styles/components/_swap.scss b/src/assets/styles/components/_swap.scss
index 15215a7..6122bab 100644
--- a/src/assets/styles/components/_swap.scss
+++ b/src/assets/styles/components/_swap.scss
@@ -45,11 +45,11 @@ $swap-input-focused-color: rgba($secondary, 0.7) !important;
     height: 48px;
     padding: 0;
     background-color: $primary;
-    font-size: 23px;
+    font-size: 16px;
     text-transform: uppercase;
     font-family: $font-secondary;
     font-weight: 500;
-    line-height: 28px;
+    line-height: 20px;
     color: #ffffff;
     display: flex;
     align-items: center;
diff --git a/src/components/CreatePool/CreateSwapCard.vue b/src/components/CreatePool/CreateSwapCard.vue
index 7a3b2b3..eb7ff2e 100644
--- a/src/components/CreatePool/CreateSwapCard.vue
+++ b/src/components/CreatePool/CreateSwapCard.vue
@@ -3,7 +3,14 @@
 import { Keypair, PublicKey } from '@solana/web3.js'
 import type { TokenData } from '@/config'
 
-const { state, createTokenSwap, createPoolAccounts, generateSwapKeypair, createPoolMint } = useCreateSwap()
+const {
+  state,
+  createTokenSwap,
+  createPoolAccounts,
+  generateSwapKeypair,
+  createPoolMint,
+  metadataState,
+} = useCreateSwap()
 const { handleSearchToken, tokens } = useToken()
 
 const userStore = useUserStore()
@@ -16,6 +23,7 @@ function setToken(field: 'tokenA' | 'tokenB', t: TokenData) {
 }
 
 const expandedTokenSwap = ref(false)
+const expandedPoolMint = ref(false)
 const tokenSwapSecret = ref('')
 function setTokenSwap() {
   if (tokenSwapSecret.value) {
@@ -61,7 +69,7 @@ function setPoolMint() {
           option-value="mint" option-label="name"
         >
           <template #selected>
-            <select-policy-item v-if="state.policy" :key="state.policy.pubkey" :policy="state.policy.pubkey" :policy-data="state.policy.data" />
+            <select-policy-item v-if="state.policy" :key="state.policy.pubkey?.toBase58()" :policy="state.policy.pubkey" :policy-data="state.policy.data" />
           </template>
           <template #option="scope">
             <q-item v-bind="scope.itemProps" class="token-select__token">
@@ -118,8 +126,15 @@ function setPoolMint() {
         </div>
       </q-expansion-item>
 
-      <div class="q-mt-xl row">
-        <q-btn class="q-ml-auto" :disable="!!state.poolMint" @click="createPoolMint">
+      <div class="q-mt-xl column">
+        <div>LP token metadata</div>
+        <q-input v-model="metadataState.name" class="q-mr-md" label="name" />
+        <q-input v-model="metadataState.symbol" class="q-mr-md" label="symbol" />
+        <q-input v-model="metadataState.metadataUrl" class="q-mr-md" label="url" />
+        <q-toggle v-model="metadataState.isMutable" class="q-mr-md q-mt-sm" size="lg" label="is Mutable" />
+      </div>
+      <div class="q-mt-xs row">
+        <q-btn class="q-ml-auto" :disable="!!state.poolMint" :loading="state.creating" @click="createPoolMint">
           Create Pool Mint
         </q-btn>
       </div>
@@ -129,7 +144,7 @@ function setPoolMint() {
         Copy Pool Mint public key
       </div>
       <q-expansion-item
-        v-model="expandedTokenSwap"
+        v-model="expandedPoolMint"
         label="Set pool mint manually"
       >
         <q-input v-model="poolMint" class="q-mr-md" label="Pool Mint" />
@@ -141,7 +156,7 @@ function setPoolMint() {
       </q-expansion-item>
 
       <div class="q-mt-xl row">
-        <q-btn class="q-ml-auto" @click="createPoolAccounts">
+        <q-btn class="q-ml-auto" :loading="state.creating" @click="createPoolAccounts">
           Create Pool token accounts
         </q-btn>
       </div>
@@ -153,7 +168,7 @@ function setPoolMint() {
       </div>
 
       <div class="q-mt-xl row">
-        <q-btn class="q-ml-auto" @click="createTokenSwap">
+        <q-btn class="q-ml-auto" :loading="state.creating" @click="createTokenSwap">
           Create Pool
         </q-btn>
       </div>
diff --git a/src/hooks/create-swap-pool.ts b/src/hooks/create-swap-pool.ts
index 8c522ed..a5c7720 100644
--- a/src/hooks/create-swap-pool.ts
+++ b/src/hooks/create-swap-pool.ts
@@ -1,6 +1,9 @@
 import { useAnchorWallet, useWallet } from 'solana-wallets-vue'
 import { Keypair, PublicKey, Transaction } from '@solana/web3.js'
 import { CurveType } from '@albus-finance/swap-sdk'
+import type { DataV2 } from '@metaplex-foundation/mpl-token-metadata'
+import { PROGRAM_ID, createCreateMetadataAccountV3Instruction, createUpdateMetadataAccountV2Instruction } from '@metaplex-foundation/mpl-token-metadata'
+import { createSetAuthorityInstruction } from '@solana/spl-token'
 import { getCreateMintTx, getOrInitAssociatedTokenAddress, sendTransaction } from '@/utils'
 import { LP_DECIMALS, type PolicyItem, type TokenData } from '@/config'
 
@@ -33,6 +36,13 @@ export function useCreateSwap() {
     swapTokenB: undefined,
   })
 
+  const metadataState = reactive<LPTMetadataState>({
+    name: '',
+    symbol: '',
+    metadataUrl: '',
+    isMutable: false,
+  })
+
   async function generateSwapKeypair() {
     if (!publicKey.value || !wallet.value) {
       return
@@ -48,29 +58,117 @@ export function useCreateSwap() {
     }
     const swapAuthority = swapStore.swapClient.swapAuthority(state.tokenSwap.publicKey)
     const tx = new Transaction()
-    const poolMint = await getCreateMintTx(connectionStore.connection, tx, publicKey.value, swapAuthority, LP_DECIMALS)
-    console.log('[create swap] poolMint = ', poolMint.publicKey.toBase58())
-    if (tx.instructions.length > 0) {
-      await monitorTransaction(
-        sendTransaction(connectionStore.connection, wallet.value!, tx.instructions, [poolMint]),
+
+    state.creating = true
+    try {
+      const poolMint = await getCreateMintTx(connectionStore.connection, tx, publicKey.value, publicKey.value, LP_DECIMALS)
+
+      const metadata = PublicKey.findProgramAddressSync(
+        [
+        // eslint-disable-next-line n/prefer-global/buffer
+          Buffer.from('metadata'),
+          PROGRAM_ID.toBuffer(),
+          poolMint.publicKey.toBuffer(),
+        ],
+        PROGRAM_ID,
+      )[0]
+
+      const tokenMetadata = {
+        name: metadataState.name,
+        symbol: metadataState.symbol,
+        uri: metadataState.metadataUrl,
+        sellerFeeBasisPoints: 0,
+        creators: null,
+        collection: null,
+        uses: null,
+      } as DataV2
+
+      const createMetadataInstruction = createCreateMetadataAccountV3Instruction(
+        {
+          metadata,
+          mint: poolMint.publicKey,
+          mintAuthority: publicKey.value,
+          payer: publicKey.value,
+          updateAuthority: publicKey.value,
+        },
+        {
+          createMetadataAccountArgsV3: {
+            data: tokenMetadata,
+            isMutable: metadataState.isMutable,
+            collectionDetails: null,
+          },
+        },
+      )
+      tx.add(createMetadataInstruction)
+
+      const setAuthorityInstruction = createSetAuthorityInstruction(
+        poolMint.publicKey,
+        publicKey.value,
+        0,
+        swapAuthority,
+      )
+      tx.add(setAuthorityInstruction)
+
+      const updateMetadataInstruction = createUpdateMetadataAccountV2Instruction(
+        {
+          metadata,
+          updateAuthority: publicKey.value,
+        },
         {
-          onSuccess: () => {
-            state.poolMint = poolMint.publicKey
-            notify({
-              type: 'positive',
-              message: 'Pool mint created successfully.',
-            })
+          updateMetadataAccountArgsV2: {
+            data: tokenMetadata,
+            updateAuthority: swapAuthority,
+            primarySaleHappened: true,
+            isMutable: true,
           },
         },
       )
-    } else {
-      state.poolMint = poolMint.publicKey
+      tx.add(updateMetadataInstruction)
+
+      console.log('[create swap] poolMint = ', poolMint.publicKey.toBase58())
+      if (tx.instructions.length > 0) {
+        await monitorTransaction(
+          sendTransaction(connectionStore.connection, wallet.value!, tx.instructions, [poolMint]),
+          {
+            onSuccess: () => {
+              state.poolMint = poolMint.publicKey
+              notify({
+                type: 'positive',
+                message: 'Pool mint created successfully.',
+              })
+            },
+          },
+        )
+      }
+    } catch (e) {
+      console.error(e)
+      notify({
+        type: 'negative',
+        message: `${e}`,
+      })
+    } finally {
+      state.creating = false
     }
   }
 
   async function createPoolAccounts() {
-    if (!publicKey.value || !wallet.value || !state.tokenSwap || !state.poolMint) {
-      return
+    if (!publicKey.value || !wallet.value) {
+      return notify({
+        type: 'negative',
+        message: 'Connect wallet',
+      })
+    }
+    if (!state.tokenSwap) {
+      return notify({
+        type: 'negative',
+        message: 'Define tokenSwap',
+      })
+    }
+    if (!state.poolMint) {
+      return notify({
+        type: 'negative',
+        message: 'Define pool mint',
+      })
     }
     if (!state.tokenA || !state.tokenB) {
       return notify({
@@ -80,32 +178,44 @@ export function useCreateSwap() {
     }
     const swapAuthority = swapStore.swapClient.swapAuthority(state.tokenSwap.publicKey)
     const tx = new Transaction()
-    const poolFeeAccount = await getOrInitAssociatedTokenAddress(connectionStore.connection, tx, state.poolMint, publicKey.value)
-    const swapTokenA = await getOrInitAssociatedTokenAddress(connectionStore.connection, tx, new PublicKey(state.tokenA.mint), swapAuthority, publicKey.value, true)
-    const swapTokenB = await getOrInitAssociatedTokenAddress(connectionStore.connection, tx, new PublicKey(state.tokenB.mint), swapAuthority, publicKey.value, true)
-    console.log('[create swap] poolFeeAccount = ', poolFeeAccount.toBase58())
-    console.log('[create swap] swapTokenA = ', swapTokenA.toBase58())
-    console.log('[create swap] swapTokenB = ', swapTokenB.toBase58())
-    if (tx.instructions.length > 0) {
-      await monitorTransaction(
-        sendTransaction(connectionStore.connection, wallet.value!, tx.instructions),
-        {
-          commitment: 'finalized',
-          onSuccess: () => {
-            state.poolFeeAccount = poolFeeAccount
-            state.swapTokenA = swapTokenA
-            state.swapTokenB = swapTokenB
-            notify({
-              type: 'positive',
-              message: 'Pool accounts created successfully.',
-            })
+
+    state.creating = true
+    try {
+      const poolFeeAccount = await getOrInitAssociatedTokenAddress(connectionStore.connection, tx, state.poolMint, publicKey.value)
+      const swapTokenA = await getOrInitAssociatedTokenAddress(connectionStore.connection, tx, new PublicKey(state.tokenA.mint), swapAuthority, publicKey.value, true)
+      const swapTokenB = await getOrInitAssociatedTokenAddress(connectionStore.connection, tx, new PublicKey(state.tokenB.mint), swapAuthority, publicKey.value, true)
+      console.log('[create swap] poolFeeAccount = ', poolFeeAccount.toBase58())
+      console.log('[create swap] swapTokenA = ', swapTokenA.toBase58())
+      console.log('[create swap] swapTokenB = ', swapTokenB.toBase58())
+      if (tx.instructions.length > 0) {
+        await monitorTransaction(
+          sendTransaction(connectionStore.connection, wallet.value!, tx.instructions),
+          {
+            commitment: 'finalized',
+            onSuccess: () => {
+              state.poolFeeAccount = poolFeeAccount
+              state.swapTokenA = swapTokenA
+              state.swapTokenB = swapTokenB
+              notify({
+                type: 'positive',
+                message: 'Pool accounts created successfully.',
+              })
+            },
           },
-        },
-      )
-    } else {
-      state.poolFeeAccount = poolFeeAccount
-      state.swapTokenA = swapTokenA
-      state.swapTokenB = swapTokenB
+        )
+      } else {
+        state.poolFeeAccount = poolFeeAccount
+        state.swapTokenA = swapTokenA
+        state.swapTokenB = swapTokenB
+      }
+    } catch (e) {
+      console.error(e)
+      notify({
+        type: 'negative',
+        message: `${e}`,
+      })
+    } finally {
+      state.creating = false
     }
     /**
      * transfer tokens to pool token accounts
@@ -157,32 +267,44 @@ export function useCreateSwap() {
         hostFeeDenominator: state.hostFeeDenominator,
       },
     })
-    const tokenSwapRes = await swapStore.swapClient.createTokenSwap({
-      tokenSwap: state.tokenSwap,
-      poolMint: state.poolMint,
-      poolFee: state.poolFeeAccount,
-      destination: state.poolFeeAccount,
-      tokenA: state.swapTokenA,
-      tokenB: state.swapTokenB,
-      policy: state.policy.pubkey,
-      curveType: CurveType.ConstantProduct,
-      curveParameters: [],
-      fees: {
-        tradeFeeNumerator: state.tradeFeeNumerator,
-        tradeFeeDenominator: state.tradeFeeDenominator,
-        ownerTradeFeeNumerator: state.ownerTradeFeeNumerator,
-        ownerTradeFeeDenominator: state.ownerTradeFeeDenominator,
-        ownerWithdrawFeeNumerator: state.ownerWithdrawFeeNumerator,
-        ownerWithdrawFeeDenominator: state.ownerWithdrawFeeDenominator,
-        hostFeeNumerator: state.hostFeeNumerator,
-        hostFeeDenominator: state.hostFeeDenominator,
-      },
-    })
-    notify({
-      type: 'positive',
-      message: `Swap Pool created successfully. ${state.tokenSwap?.publicKey.toBase58()}`,
-    })
-    console.log('[create swap] tokenSwap result = ', tokenSwapRes)
+
+    state.creating = true
+    try {
+      const tokenSwapRes = await swapStore.swapClient.createTokenSwap({
+        tokenSwap: state.tokenSwap,
+        poolMint: state.poolMint,
+        poolFee: state.poolFeeAccount,
+        destination: state.poolFeeAccount,
+        tokenA: state.swapTokenA,
+        tokenB: state.swapTokenB,
+        policy: state.policy.pubkey,
+        curveType: CurveType.ConstantProduct,
+        curveParameters: [],
+        fees: {
+          tradeFeeNumerator: state.tradeFeeNumerator,
+          tradeFeeDenominator: state.tradeFeeDenominator,
+          ownerTradeFeeNumerator: state.ownerTradeFeeNumerator,
+          ownerTradeFeeDenominator: state.ownerTradeFeeDenominator,
+          ownerWithdrawFeeNumerator: state.ownerWithdrawFeeNumerator,
+          ownerWithdrawFeeDenominator: state.ownerWithdrawFeeDenominator,
+          hostFeeNumerator: state.hostFeeNumerator,
+          hostFeeDenominator: state.hostFeeDenominator,
+        },
+      })
+      notify({
+        type: 'positive',
+        message: `Swap Pool created successfully. ${state.tokenSwap?.publicKey.toBase58()}`,
+      })
+      console.log('[create swap] tokenSwap result = ', tokenSwapRes)
+    } catch (e) {
+      console.error(e)
+      notify({
+        type: 'negative',
+        message: `${e}`,
+      })
+    } finally {
+      state.creating = false
+    }
   }
 
   function reset() {
@@ -197,10 +319,15 @@ export function useCreateSwap() {
     state.policy = undefined
     state.tokenA = undefined
     state.tokenB = undefined
+
+    metadataState.name = ''
+    metadataState.symbol = ''
+    metadataState.metadataUrl = ''
   }
 
   return {
     state,
+    metadataState,
     reset,
     generateSwapKeypair,
     createPoolMint,
@@ -229,3 +356,10 @@ interface CreateSwapState {
   swapTokenA: PublicKey | undefined
   swapTokenB: PublicKey | undefined
 }
+
+interface LPTMetadataState {
+  name: string
+  symbol: string
+  metadataUrl: string
+  isMutable: boolean
+}