diff --git a/src/components/Organization/Invite.tsx b/src/components/Organization/Invite.tsx
index 9b38f0996..8f7d3be56 100644
--- a/src/components/Organization/Invite.tsx
+++ b/src/components/Organization/Invite.tsx
@@ -33,6 +33,7 @@ import { HSeparator } from '~components/Auth/SignIn'
 import { useSubscription } from '~components/Auth/Subscription'
 import { useAuth } from '~components/Auth/useAuth'
 import InputBasic from '~components/Layout/InputBasic'
+import { usePricingModal } from '~components/Pricing/Modals'
 import { SubscriptionPermission } from '~constants'
 import { CallbackProvider, useCallbackContext } from '~utils/callback-provider'
 import { useTeamMembers } from './Team'
@@ -184,18 +185,34 @@ export const InviteToTeamModal = (props: ButtonProps) => {
   const { permission } = useSubscription()
   const { t } = useTranslation()
   const { data: members, isLoading } = useTeamMembers()
+  const { openModal } = usePricingModal()
 
-  const canInvite = permission(SubscriptionPermission.Memberships) > (members?.length || 0)
+  const memberships = permission(SubscriptionPermission.Memberships)
+  const canInvite = memberships > (members?.length || 0)
 
   return (
     <>
-      {canInvite ? (
-        <Button onClick={onOpen} {...props} isLoading={isLoading} loadingText={t('loading')}>
-          <Trans i18nKey='invite_people'>Invite People</Trans>
-        </Button>
-      ) : (
-        <Text>You must upgrade!</Text>
-      )}
+      <Button
+        onClick={() => {
+          if (canInvite) {
+            onOpen()
+          } else {
+            openModal('planUpgrade', {
+              feature: 'organization.memberships',
+              text: t('more_than_memberships', {
+                defaultValue: 'more than {count} memberships',
+                count: memberships,
+              }),
+              value: members?.length + 1,
+            })
+          }
+        }}
+        {...props}
+        isLoading={isLoading}
+        loadingText={t('loading')}
+      >
+        <Trans i18nKey='invite_people'>Invite People</Trans>
+      </Button>
       <CallbackProvider success={() => onClose()}>
         <Modal isOpen={isOpen} onClose={onClose} size='xl' closeOnOverlayClick>
           <ModalOverlay />
diff --git a/src/components/Organization/Subscription.tsx b/src/components/Organization/Subscription.tsx
index 01bcbfc14..b47aaffec 100644
--- a/src/components/Organization/Subscription.tsx
+++ b/src/components/Organization/Subscription.tsx
@@ -22,7 +22,7 @@ export const Subscription = () => {
 
   return (
     <>
-      <SubscriptionModal isOpenModal={isOpen} onCloseModal={onClose} title={t('pricing.title')} />
+      <SubscriptionModal isOpen={isOpen} onClose={onClose} title={t('pricing.title')} />
       <Button onClick={onOpen} alignSelf='end'>
         View Plans & Pricing
       </Button>
diff --git a/src/components/Pricing/Card.tsx b/src/components/Pricing/Card.tsx
index 38b83a1db..68446dc1b 100644
--- a/src/components/Pricing/Card.tsx
+++ b/src/components/Pricing/Card.tsx
@@ -75,7 +75,7 @@ const PricingCard = ({
       </CardHeader>
       <CardBody>
         <Button isDisabled={isDisabled || false}>
-          <Trans i18nKey='subscribe'>Subscribe</Trans>
+          <Trans i18nKey='view_pricing_plan'>View Pricing Plan</Trans>
         </Button>
         <Text>
           <Trans i18nKey='pricing_card.from' values={{ price }}>
diff --git a/src/components/Pricing/Modals.tsx b/src/components/Pricing/Modals.tsx
new file mode 100644
index 000000000..d14f3503b
--- /dev/null
+++ b/src/components/Pricing/Modals.tsx
@@ -0,0 +1,52 @@
+import { useDisclosure } from '@chakra-ui/hooks'
+import { createContext } from '@chakra-ui/react-utils'
+import React, { ReactNode, useState } from 'react'
+import { SubscriptionModal } from './Plans'
+import { PlanUpgradeData, PlanUpgradeModal, TierUpgradeModal } from './Upgrading'
+
+// Define types for the context
+type PricingModalType = 'tierUpgrade' | 'planUpgrade' | 'subscription' | null
+
+type PricingModalContextState = {
+  openModal: (type: PricingModalType, modalData?: PlanUpgradeData | null) => void
+  closeModal: () => void
+  modalType: PricingModalType
+  modalData: any
+}
+
+const [PricingModalProviderContext, usePricingModal] = createContext<PricingModalContextState>({
+  name: 'PricingModalProvider',
+  errorMessage: 'usePricingModal must be used within a PricingModalProvider',
+  strict: true,
+})
+
+export const PricingModalProvider: React.FC<{ children?: ReactNode }> = ({ children }) => {
+  const { isOpen, onOpen, onClose } = useDisclosure()
+  const [modalType, setModalType] = useState<PricingModalType>(null)
+  const [modalData, setModalData] = useState<PlanUpgradeData | null>(null)
+
+  const openModal = (type: PricingModalType, data?: PlanUpgradeData | null) => {
+    setModalType(type)
+    setModalData(data || null)
+    onOpen()
+  }
+
+  const closeModal = () => {
+    setModalType(null)
+    setModalData(null)
+    onClose()
+  }
+
+  return (
+    <PricingModalProviderContext value={{ openModal, closeModal, modalType, modalData }}>
+      {children}
+
+      {/* Render modals dynamically based on the modalType */}
+      {modalType === 'tierUpgrade' && isOpen && <TierUpgradeModal isOpen onClose={closeModal} {...modalData} />}
+      {modalType === 'planUpgrade' && isOpen && <PlanUpgradeModal isOpen onClose={closeModal} {...modalData} />}
+      {modalType === 'subscription' && isOpen && <SubscriptionModal isOpen onClose={closeModal} />}
+    </PricingModalProviderContext>
+  )
+}
+
+export { usePricingModal }
diff --git a/src/components/Pricing/Plans.tsx b/src/components/Pricing/Plans.tsx
index 912c2550b..2ab90c379 100644
--- a/src/components/Pricing/Plans.tsx
+++ b/src/components/Pricing/Plans.tsx
@@ -20,7 +20,7 @@ import { Link as ReactRouterLink } from 'react-router-dom'
 import { ApiEndpoints } from '~components/Auth/api'
 import { useSubscription } from '~components/Auth/Subscription'
 import { useAuth } from '~components/Auth/useAuth'
-import { StripeId } from '~constants'
+import { PlanId } from '~constants'
 import PricingCard from './Card'
 
 export type Plan = {
@@ -64,15 +64,10 @@ export const usePlans = () => {
   })
 }
 
-export const SubscriptionPlans = () => {
+export const usePlanTranslations = () => {
   const { t } = useTranslation()
-  const { data: plans, isLoading } = usePlans()
-  const { permission } = useSubscription()
-
-  const [selectedCensusSize, setSelectedCensusSize] = useState<number | null>(null)
-
   const translations = {
-    [StripeId.Free]: {
+    [PlanId.Free]: {
       title: t('pricing.free_title', { defaultValue: 'Free' }),
       subtitle: t('pricing.free_subtitle', {
         defaultValue: 'Small organizations or community groups with basic voting needs.',
@@ -90,7 +85,7 @@ export const SubscriptionPlans = () => {
         t('pricing.gpdr_compilance', { defaultValue: 'GDPR compliance' }),
       ],
     },
-    [StripeId.Essential]: {
+    [PlanId.Essential]: {
       title: t('pricing.essential_title', { defaultValue: 'Essential' }),
       subtitle: t('pricing.essential_subtitle', {
         defaultValue: 'Small or medium-sized orgs or community groups with basic voting needs.',
@@ -104,7 +99,7 @@ export const SubscriptionPlans = () => {
         t('pricing.gpdr_compilance'),
       ],
     },
-    [StripeId.Premium]: {
+    [PlanId.Premium]: {
       title: t('pricing.premium_title', { defaultValue: 'Premium' }),
       subtitle: t('pricing.premium_subtitle', {
         defaultValue: 'Larger amount that require more advanced features.',
@@ -118,30 +113,69 @@ export const SubscriptionPlans = () => {
         t('pricing.gpdr_compilance'),
       ],
     },
+    [PlanId.Custom]: {
+      title: t('pricing.custom_title', { defaultValue: 'Custom' }),
+      subtitle: t('pricing.custom_subtitle', {
+        defaultValue:
+          'Large organizations, enterprises, and institutions requiring extensive customization and support',
+      }),
+      features: [
+        t('pricing.all_features', { defaultValue: 'All features & voting types' }),
+        t('pricing.up_to_admins', { admin: 10, org: 5 }),
+        t('pricing.unlimited_yearly_processes', { defaultValue: 'Unlimited yearly voting processes' }),
+        t('pricing.white_label', { defaultValue: 'White label solution' }),
+        t('pricing.advanced_analytitcs', { defaultValue: 'Advanced reporting and analytics' }),
+        t('pricing.dedicated_manager', { defaultValue: 'Dedicated account manager' }),
+        t('pricing.priority_support', { defaultValue: 'Priority ticket support' }),
+        t('pricing.gpdr_compilance'),
+      ],
+    },
   }
 
+  return translations
+}
+
+export const SubscriptionPlans = () => {
+  const { t } = useTranslation()
+  const { data: plans, isLoading } = usePlans()
+  const { permission } = useSubscription()
+  const translations = usePlanTranslations()
+
+  const [selectedCensusSize, setSelectedCensusSize] = useState<number | null>(null)
+
   const censusSizeOptions = useMemo(() => {
-    const allTiers = plans
-      // Exclude plans with null censusSizeTiers
-      ?.filter((plan) => plan.censusSizeTiers)
-      .flatMap((plan) =>
-        plan.censusSizeTiers!.map((tier) => {
-          const from = tier.upTo === 100 ? 1 : tier.upTo - 99
-          return {
-            label: t('pricing.members_size', { defaultValue: '{{ from }}-{{ to }} members', from, to: tier.upTo }),
-            value: tier.upTo,
-          }
-        })
-      )
-    const uniqueTiers = Array.from(new Map(allTiers?.map((tier) => [tier.value, tier])).values())
-    return uniqueTiers || []
-  }, [plans])
+    if (!plans) return []
+
+    // Step 1: Merge censusSizeTiers from all plans, removing duplicates
+    const mergedTiers = plans
+      .flatMap((plan) => plan.censusSizeTiers || []) // Combine all tiers
+      .reduce((acc, tier) => {
+        if (!acc.has(tier.upTo)) {
+          acc.set(tier.upTo, tier) // Keep unique `upTo` values
+        }
+        return acc
+      }, new Map<number, { upTo: number }>())
+
+    // Step 2: Create options array from merged and sorted tiers
+    const sortedTiers = Array.from(mergedTiers.values()).sort((a, b) => a.upTo - b.upTo)
+
+    const options = sortedTiers.map((tier, idx) => {
+      const previous = sortedTiers[idx - 1] || { upTo: 0 }
+      const from = previous.upTo + 1
+      return {
+        label: t('pricing.members_size', { defaultValue: '{{ from }}-{{ to }} members', from, to: tier.upTo }),
+        value: tier.upTo,
+      }
+    })
+
+    return options
+  }, [plans, t])
 
   const cards = useMemo(() => {
     if (!plans) return []
 
     return plans.map((plan) => ({
-      popular: plan.default,
+      popular: plan.id === PlanId.Essential,
       title: translations[plan.id]?.title || plan.name,
       subtitle: translations[plan.id]?.subtitle || '',
       price: plan.startingPrice / 100,
@@ -159,7 +193,7 @@ export const SubscriptionPlans = () => {
         <Select options={censusSizeOptions} onChange={(selected) => setSelectedCensusSize(selected?.value || null)} />
       </Flex>
       {isLoading && <Progress colorScheme='brand' size='xs' isIndeterminate />}
-      <Flex gap={5} alignItems='start'>
+      <Flex gap={5} justifyContent='space-evenly' flexWrap='wrap'>
         {cards.map((card, idx) => (
           <PricingCard key={idx} plan={plans[idx]} {...card} />
         ))}
@@ -169,15 +203,15 @@ export const SubscriptionPlans = () => {
 }
 
 export const SubscriptionModal = ({
-  isOpenModal,
-  onCloseModal,
+  isOpen,
+  onClose,
   title,
 }: {
-  isOpenModal: boolean
-  onCloseModal: () => void
+  isOpen: boolean
+  onClose: () => void
   title?: ReactNode
 }) => (
-  <Modal isOpen={isOpenModal} onClose={onCloseModal} variant='pricing-modal' size='full'>
+  <Modal isOpen={isOpen} onClose={onClose} variant='pricing-modal' size='full'>
     <ModalOverlay />
     <ModalContent>
       <ModalHeader>
diff --git a/src/components/Pricing/Upgrading.tsx b/src/components/Pricing/Upgrading.tsx
index 0dcbc3704..da90c26b5 100644
--- a/src/components/Pricing/Upgrading.tsx
+++ b/src/components/Pricing/Upgrading.tsx
@@ -10,56 +10,54 @@ import {
   ModalCloseButton,
   ModalContent,
   ModalOverlay,
+  Spinner,
   Text,
   VStack,
-  useDisclosure,
 } from '@chakra-ui/react'
 import { CheckCircle, ClockRefresh, XCircle } from '@untitled-ui/icons-react'
 import { Trans } from 'react-i18next'
 import { FaUser } from 'react-icons/fa'
+import { Fragment } from 'react/jsx-runtime'
+import { useSubscription } from '~components/Auth/Subscription'
+import { usePricingModal } from './Modals'
+import { usePlanTranslations, usePlans } from './Plans'
+import { isFeatureAvailable } from './utils'
 
-export const TierUpgradeModal = () => {
-  const { isOpen, onOpen, onClose } = useDisclosure()
-  return (
-    <>
-      <Button onClick={onOpen}>Tier upgrade</Button>
-      <Modal isOpen={isOpen} onClose={onClose}>
-        <ModalOverlay />
-        <ModalContent>
-          <ModalCloseButton />
-          <ModalBody>
-            <TierUpgrade />
-          </ModalBody>
-        </ModalContent>
-      </Modal>
-    </>
-  )
+type ModalProps = {
+  isOpen: boolean
+  onClose: () => void
 }
 
-export const PlanUpgradeModal = () => {
-  const { isOpen, onOpen, onClose } = useDisclosure()
-  return (
-    <>
-      <Button onClick={onOpen}>Plan upgrade</Button>
-      <Modal isOpen={isOpen} onClose={onClose}>
-        <ModalOverlay />
-        <ModalContent>
-          <ModalCloseButton />
-          <ModalBody>
-            <PlanUpgrade />
-          </ModalBody>
-        </ModalContent>
-      </Modal>
-    </>
-  )
-}
+export const TierUpgradeModal = ({ isOpen, onClose }: ModalProps) => (
+  <Modal isOpen={isOpen} onClose={onClose}>
+    <ModalOverlay />
+    <ModalContent>
+      <ModalCloseButton />
+      <ModalBody>
+        <TierUpgrade />
+      </ModalBody>
+    </ModalContent>
+  </Modal>
+)
+
+export const PlanUpgradeModal = ({ isOpen, onClose, ...props }: ModalProps & PlanUpgradeData) => (
+  <Modal isOpen={isOpen} onClose={onClose}>
+    <ModalOverlay />
+    <ModalContent>
+      <ModalCloseButton />
+      <ModalBody>
+        <PlanUpgrade {...props} />
+      </ModalBody>
+    </ModalContent>
+  </Modal>
+)
 
 const FeaturesBox = (props: FlexProps) => (
   <Flex
     flexDirection='column'
     bg='gray.100'
     _dark={{ bg: 'gray.700' }}
-    px={12}
+    px={10}
     py={6}
     w={{ base: 'modal-stretch', lg: 'modal-stretch-lg' }}
     gap={5}
@@ -68,170 +66,149 @@ const FeaturesBox = (props: FlexProps) => (
   />
 )
 
-export const PlanUpgrade = () => (
-  <VStack spacing={4} w='full'>
-    {/* Header */}
-    <Icon as={ClockRefresh} boxSize={6} color='blue.400' w='100%' h='50px' />
-    <Text fontSize='lg' fontWeight='semibold' textAlign='center'>
-      <Trans i18nKey='plan_upgrade.feature_unavailable'>
-        Oops ... your{' '}
-        <Text as='span' color='red.500'>
-          free plan
-        </Text>{' '}
-        doesn't support customization.
-      </Trans>
-    </Text>
-    <Text fontSize='sm' color='gray.500' textAlign='center'>
-      <Trans i18nKey='plan_upgrade.dont_limit_yourself'>
-        Don't limit yourself. Join the family of 725 orgs that trust{' '}
-        <Text as='span' fontStyle='italic'>
-          Vocdoni
+export type PlanUpgradeData = {
+  feature: string
+  text: string
+  value?: number | { operator: '===' | '>' | '>=' | '<' | '<='; value: number }
+}
+
+export const PlanUpgrade = ({ feature, text, value }: PlanUpgradeData) => {
+  const { subscription } = useSubscription()
+  const translations = usePlanTranslations()
+  const { openModal } = usePricingModal()
+  const { data: plans, isLoading } = usePlans()
+  const plan = translations[subscription.plan.id].title
+
+  return (
+    <VStack spacing={4} w='full'>
+      {/* Header */}
+      <Icon as={ClockRefresh} boxSize={6} color='blue.400' w='100%' h='50px' />
+      <Text fontSize='lg' fontWeight='semibold' textAlign='center'>
+        <Trans i18nKey='plan_upgrade.feature_unavailable' values={{ feature: text, plan }}>
+          Oops ... your{' '}
+          <Text as='span' color='red.500'>
+            {plan}
+          </Text>{' '}
+          doesn't support {{ feature }}.
+        </Trans>
+      </Text>
+      <Text fontSize='sm' color='gray.500' textAlign='center'>
+        <Trans i18nKey='plan_upgrade.dont_limit_yourself'>
+          Don't limit yourself. Join the family of 725 orgs that trust{' '}
+          <Text as='span' fontStyle='italic'>
+            Vocdoni
+          </Text>
+          .
+        </Trans>
+      </Text>
+
+      {/* Feature Availability */}
+      <FeaturesBox>
+        <Text fontSize='xs' fontWeight='semibold' textAlign='center' textTransform='uppercase' color='gray.500'>
+          <Trans i18nKey='plan_upgrade.feature_available_in'>Feature available in:</Trans>
+        </Text>
+        <Flex justify='space-evenly' fontSize='sm' fontWeight='semibold' height={6}>
+          {isLoading && <Spinner />}
+          {plans?.map((plan) => (
+            <Fragment key={plan.id}>
+              <Flex align='center' gap={1}>
+                {(!value && isFeatureAvailable(plan, feature)) ||
+                (value && isFeatureAvailable(plan, feature, value)) ? (
+                  <Icon as={CheckCircle} color='green.500' fontSize='xl' />
+                ) : (
+                  <Icon as={XCircle} color='red.500' fontSize='xl' />
+                )}
+                <Text>{translations[plan.id].title}</Text>
+              </Flex>
+              <Divider orientation='vertical' />
+            </Fragment>
+          ))}
+        </Flex>
+      </FeaturesBox>
+
+      {/* Call to Action */}
+      <Box>
+        <Button variant='solid' colorScheme='brand' w='full' size='lg' onClick={() => openModal('subscription')}>
+          <Trans i18nKey='view_pricing_plans'>View Pricing Plans</Trans>
+        </Button>
+        <Text fontSize='xs' color='gray.500' textAlign='center'>
+          <Trans i18nKey='plan_upgrade.satisfaction_rate'>97% satisfaction rate, for only 9€/month.</Trans>
         </Text>
-        .
-      </Trans>
-    </Text>
+      </Box>
+    </VStack>
+  )
+}
 
-    {/* Feature Availability */}
-    <FeaturesBox>
-      <Text fontSize='xs' fontWeight='semibold' textAlign='center' textTransform='uppercase' color='gray.500'>
-        <Trans i18nKey='plan_upgrade.feature_available_in'>Feature available in:</Trans>
+export const TierUpgrade = () => {
+  const { subscription } = useSubscription()
+  return (
+    <VStack spacing={4} w='full'>
+      {/* Header */}
+      <Flex align='center' justify='center' borderRadius='full' w='50px' h='50px'>
+        <Icon as={FaUser} boxSize={6} />
+      </Flex>
+      <Text fontSize='lg' fontWeight='semibold' textAlign='center'>
+        <Trans i18nKey='tier_upgrade.current_plan'>
+          Your current{' '}
+          <Text as='span' color='green.500'>
+            free plan
+          </Text>{' '}
+          is limited to selecting up to{' '}
+          <Text as='span' color='green.500'>
+            50 voters
+          </Text>
+          .
+        </Trans>
+      </Text>
+      <Text fontSize='sm' color='gray.500' textAlign='center'>
+        <Trans i18nKey='tier_upgrade.dont_limit_yourself'>
+          Don't limit yourself. Join the family of 725 orgs that trust{' '}
+          <Text as='span' fontStyle='italic'>
+            Vocdoni
+          </Text>
+          .
+        </Trans>
       </Text>
-      <Flex justify='space-between' fontSize='sm' fontWeight='semibold' height={6}>
-        <Flex align='center' gap={1}>
-          <Icon as={XCircle} color='red.500' fontSize='xl' />
+
+      {/* Plans Limits */}
+      <FeaturesBox>
+        <Flex justify='space-between' fontSize='sm' fontWeight='semibold'>
           <Text>
-            <Trans i18nKey='plan_upgrade.plan.free'>Free</Trans>
+            <Trans i18nKey='tier_upgrade.plan.free'>Free</Trans>
           </Text>
-        </Flex>
-        <Divider orientation='vertical' />
-        <Flex align='center' gap={1}>
-          <Icon as={CheckCircle} color='green.500' fontSize='xl' />
           <Text>
-            <Trans i18nKey='plan_upgrade.plan.basic'>Basic</Trans>
+            <Trans i18nKey='tier_upgrade.plan.basic'>Basic</Trans>
           </Text>
-        </Flex>
-        <Divider orientation='vertical' />
-
-        <Flex align='center' gap={1}>
-          <Icon as={CheckCircle} color='green.500' fontSize='xl' />
           <Text>
-            <Trans i18nKey='plan_upgrade.plan.pro'>Pro</Trans>
+            <Trans i18nKey='tier_upgrade.plan.pro'>Pro</Trans>
+          </Text>
+          <Text>
+            <Trans i18nKey='tier_upgrade.plan.custom'>Custom</Trans>
           </Text>
         </Flex>
-        <Divider orientation='vertical' />
-
-        <Flex align='center' gap={1}>
-          <Icon as={CheckCircle} color='green.500' fontSize='xl' />
+        <Flex justify='space-between' fontSize='xs' color='gray.500'>
+          <Text>
+            <Trans i18nKey='tier_upgrade.plan.limit.free'>50 voters</Trans>
+          </Text>
+          <Text>
+            <Trans i18nKey='tier_upgrade.plan.limit.basic'>Up to 1500</Trans>
+          </Text>
           <Text>
-            <Trans i18nKey='plan_upgrade.plan.custom'>Custom</Trans>
+            <Trans i18nKey='tier_upgrade.plan.limit.pro'>Up to 3000</Trans>
+          </Text>
+          <Text>
+            <Trans i18nKey='tier_upgrade.plan.limit.custom'>Unlimited</Trans>
           </Text>
         </Flex>
-      </Flex>
-    </FeaturesBox>
+      </FeaturesBox>
 
-    {/* Call to Action */}
-    <Box>
+      {/* Call to Action */}
       <Button variant='solid' colorScheme='brand' w='full' size='lg'>
         <Trans i18nKey='view_pricing_plans'>View Pricing Plans</Trans>
       </Button>
       <Text fontSize='xs' color='gray.500' textAlign='center'>
-        <Trans i18nKey='plan_upgrade.satisfaction_rate'>97% satisfaction rate, for only 9€/month.</Trans>
+        <Trans i18nKey='tier_upgrade.satisfaction_rate'>97% satisfaction rate, starting at 9€/month.</Trans>
       </Text>
-    </Box>
-    <Text fontSize='sm' fontWeight='semibold' textAlign='center'>
-      <Trans i18nKey='or'>or</Trans>
-    </Text>
-    <Text>
-      <Trans i18nKey='plan_upgrade.pay_once'>
-        Pay{' '}
-        <Text as='span' fontWeight='bold'>
-          9,99€
-        </Text>{' '}
-        for one-time usage
-      </Trans>
-    </Text>
-    <Button variant='outline' colorScheme='brand'>
-      <Trans i18nKey='add'>Add</Trans>
-    </Button>
-  </VStack>
-)
-
-export const TierUpgrade = () => (
-  <VStack spacing={4} w='full'>
-    {/* Header */}
-    <Flex align='center' justify='center' borderRadius='full' w='50px' h='50px'>
-      <Icon as={FaUser} boxSize={6} />
-    </Flex>
-    <Text fontSize='lg' fontWeight='semibold' textAlign='center'>
-      <Trans i18nKey='tier_upgrade.current_plan'>
-        Your current{' '}
-        <Text as='span' color='green.500'>
-          free plan
-        </Text>{' '}
-        is limited to selecting up to{' '}
-        <Text as='span' color='green.500'>
-          50 voters
-        </Text>
-        .
-      </Trans>
-    </Text>
-    <Text fontSize='sm' color='gray.500' textAlign='center'>
-      <Trans i18nKey='tier_upgrade.dont_limit_yourself'>
-        Don't limit yourself. Join the family of 725 orgs that trust{' '}
-        <Text as='span' fontStyle='italic'>
-          Vocdoni
-        </Text>
-        .
-      </Trans>
-    </Text>
-
-    {/* Plans Limits */}
-    <FeaturesBox>
-      <Flex justify='space-between' fontSize='sm' fontWeight='semibold'>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.free'>Free</Trans>
-        </Text>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.basic'>Basic</Trans>
-        </Text>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.pro'>Pro</Trans>
-        </Text>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.custom'>Custom</Trans>
-        </Text>
-      </Flex>
-      <Flex justify='space-between' fontSize='xs' color='gray.500'>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.limit.free'>50 voters</Trans>
-        </Text>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.limit.basic'>Up to 1500</Trans>
-        </Text>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.limit.pro'>Up to 3000</Trans>
-        </Text>
-        <Text>
-          <Trans i18nKey='tier_upgrade.plan.limit.custom'>Unlimited</Trans>
-        </Text>
-      </Flex>
-    </FeaturesBox>
-
-    {/* Call to Action */}
-    <Button variant='solid' colorScheme='brand' w='full' size='lg'>
-      <Trans i18nKey='view_pricing_plans'>View Pricing Plans</Trans>
-    </Button>
-    <Text fontSize='xs' color='gray.500' textAlign='center'>
-      <Trans i18nKey='tier_upgrade.satisfaction_rate'>97% satisfaction rate, starting at 9€/month.</Trans>
-    </Text>
-    <Text fontSize='sm' fontWeight='semibold' textAlign='center'>
-      <Trans i18nKey='or'>or</Trans>
-    </Text>
-    <Text>
-      <Trans i18nKey='tier_upgrade.use_tokens'>Use tokens for one-time usage</Trans>
-    </Text>
-    <Button variant='outline' colorScheme='brand' w='full'>
-      <Trans i18nKey='continue'>Continue</Trans>
-    </Button>
-  </VStack>
-)
+    </VStack>
+  )
+}
diff --git a/src/components/Pricing/utils.ts b/src/components/Pricing/utils.ts
new file mode 100644
index 000000000..ceca5afcf
--- /dev/null
+++ b/src/components/Pricing/utils.ts
@@ -0,0 +1,55 @@
+import { dotobject } from '@vocdoni/sdk'
+import type { Plan } from './Plans'
+
+/**
+ * Checks if a given feature exists and meets the required condition in a plan.
+ *
+ * @param plan - The plan object to check.
+ * @param featurePath - Dot notation path to the feature (e.g., 'organization.memberships').
+ * @param expectedValue - Expected value or comparison object.
+ *                         - If a number, checks for >= comparison.
+ *                         - If an object, supports { operator, value } (e.g., { operator: '>=', value: 10 }).
+ * @returns boolean - `true` if the feature meets the condition, `false` otherwise.
+ */
+export const isFeatureAvailable = (
+  plan: Plan,
+  featurePath: string,
+  expectedValue?: number | { operator: '===' | '>' | '>=' | '<' | '<='; value: number }
+): boolean => {
+  const featureValue = dotobject(plan, featurePath) // Get the feature value using dot notation
+
+  if (typeof featureValue === 'undefined') {
+    return false // If the feature doesn't exist, return false
+  }
+
+  // If no expected value is provided, return true if the feature exists
+  if (typeof expectedValue === 'undefined') {
+    return true
+  }
+
+  // Handle exact match or comparison
+  if (typeof expectedValue === 'number') {
+    return featureValue >= expectedValue // Default to "greater than or equal to" for numbers
+  }
+
+  if (typeof expectedValue === 'object' && expectedValue.operator && expectedValue.value !== undefined) {
+    const { operator, value } = expectedValue
+
+    switch (operator) {
+      case '===':
+        return featureValue === value
+      case '>':
+        return featureValue > value
+      case '>=':
+        return featureValue >= value
+      case '<':
+        return featureValue < value
+      case '<=':
+        return featureValue <= value
+      default:
+        throw new Error(`Unsupported operator: ${operator}`)
+    }
+  }
+
+  throw new Error('Invalid expectedValue type')
+}
diff --git a/src/constants/index.ts b/src/constants/index.ts
index b71ebaf37..3c36b3855 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -27,10 +27,11 @@ export enum SubscriptionPermission {
   SmsNotification = 'features.smsNotification',
 }
 
-export enum StripeId {
+export enum PlanId {
   Essential = 0,
   Premium = 1,
   Free = 2,
+  Custom = 3,
 }
 
 const evocdoni = import.meta.env.VOCDONI_ENVIRONMENT
diff --git a/src/elements/LayoutDashboard.tsx b/src/elements/LayoutDashboard.tsx
index abad5b4ed..d20e16a2d 100644
--- a/src/elements/LayoutDashboard.tsx
+++ b/src/elements/LayoutDashboard.tsx
@@ -1,11 +1,12 @@
 import { HamburgerIcon } from '@chakra-ui/icons'
 import { Box, Grid, Heading, IconButton, useDisclosure } from '@chakra-ui/react'
 import { OrganizationProvider, useClient } from '@vocdoni/react-providers'
-import { useState } from 'react'
+import { PropsWithChildren, useState } from 'react'
 import { MdKeyboardArrowLeft } from 'react-icons/md'
 import { Outlet, Link as ReactRouterLink } from 'react-router-dom'
 import AccountMenu from '~components/Account/Menu'
 import DashboardMenu from '~components/Dashboard/Menu'
+import { PricingModalProvider } from '~components/Pricing/Modals'
 
 export type DashboardLayoutContext = {
   setTitle: (title: string) => void
@@ -13,14 +14,12 @@ export type DashboardLayoutContext = {
 }
 
 const LayoutDashboard: React.FC = () => {
-  const { account } = useClient()
-
   const [title, setTitle] = useState<string | null>(null)
   const [back, setBack] = useState<string | null>(null)
   const { isOpen, onOpen, onClose } = useDisclosure() // For mobile sidebar toggle
 
   return (
-    <OrganizationProvider organization={account}>
+    <DashboardLayoutProviders>
       <Grid
         templateAreas={{
           base: `"header" "main"`,
@@ -72,6 +71,15 @@ const LayoutDashboard: React.FC = () => {
           <Outlet context={{ setTitle, setBack } satisfies DashboardLayoutContext} />
         </Box>
       </Grid>
+    </DashboardLayoutProviders>
+  )
+}
+
+const DashboardLayoutProviders = (props: PropsWithChildren) => {
+  const { account } = useClient()
+  return (
+    <OrganizationProvider organization={account}>
+      <PricingModalProvider {...props} />
     </OrganizationProvider>
   )
 }
diff --git a/src/elements/PublicContents.tsx b/src/elements/PublicContents.tsx
index bdd66b1aa..1be523cb3 100644
--- a/src/elements/PublicContents.tsx
+++ b/src/elements/PublicContents.tsx
@@ -1,7 +1,7 @@
 import { Flex } from '@chakra-ui/react'
 import { Outlet } from 'react-router-dom'
 
-const PublicContentsLayout = () => (
+export const StretchPublicContentsLayout = () => (
   <Flex
     flexDirection='column'
     gap={5}
@@ -20,4 +20,39 @@ const PublicContentsLayout = () => (
   </Flex>
 )
 
-export default PublicContentsLayout
+export const PublicContentsLayout = () => (
+  <Flex
+    flexDirection='column'
+    gap={5}
+    width='full'
+    mx='auto'
+    maxW='1920px'
+    px={{
+      base: '10px',
+      sm: '20px',
+      md: '80px',
+    }}
+    mb={44}
+    mt={6}
+  >
+    <Outlet />
+  </Flex>
+)
+
+export const PlansLayout = () => (
+  <Flex
+    flexDirection='column'
+    gap={5}
+    width='full'
+    mx='auto'
+    maxW='1400px'
+    px={{
+      base: '10px',
+      sm: '20px',
+      md: '80px',
+    }}
+    mb={44}
+  >
+    <Outlet />
+  </Flex>
+)
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index a63ca9b83..d5024db65 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -766,6 +766,9 @@
   "meta": {
     "helper": "Provide a clear title and description to help voters understand the vote"
   },
+  "more_than_memberships_one": "més d'{{count}} membre",
+  "more_than_memberships_many": "",
+  "more_than_memberships_other": "més de {{count}} membres",
   "multiple": "multiple",
   "name": "Name",
   "new_organization": {
@@ -813,11 +816,27 @@
   },
   "passwords_do_not_match": "",
   "personalization": "personalization",
+  "plan_upgrade": {
+    "dont_limit_yourself": "Don't limit yourself. Join the family of 725 orgs that trust <2>Vocdoni</2>.",
+    "feature_available_in": "Feature available in:",
+    "feature_unavailable": "Ups... el teu pla <2>{{ plan }}</2> no suporta {{ feature }}.",
+    "plan": {
+      "basic": "Basic",
+      "custom": "Custom",
+      "free": "Free",
+      "pro": "Pro"
+    },
+    "satisfaction_rate": "97% satisfaction rate, for only 9€/month."
+  },
   "preview": "Preview",
   "pricing": {
     "advanced_analytitcs": "Informes i anàlisis avançades",
+    "all_features": "All features & voting types",
     "basic_analytics": "Informes i anàlisis bàsiques",
     "core_voting": "Funcions bàsiques de votació",
+    "custom_subtitle": "Large organizations enterprises, and institutions requiring extensive customization and support.",
+    "custom_title": "Personalitzat",
+    "dedicated_manager": "Dedicated account manager",
     "essential_subtitle": "Organitzacions petites o mitjanes o grups comunitaris amb necessitats bàsiques de votació.",
     "essential_title": "Essencial",
     "features": {
@@ -844,6 +863,7 @@
     "unlimited_yearly_processes": "Processos anuals il·limitats",
     "up_to_admins": "Fins a {{ admin }} admin. i {{ org }} organitzacions",
     "upgrade_title": "Has d'actualitzar el teu pla per utilitzar aquesta funcionalitat",
+    "white_label": "White label solution",
     "yearly_processes_one": "{{ count }} procés anual",
     "yearly_processes_many": "",
     "yearly_processes_other": "{{ count }} processos anuals",
@@ -1053,7 +1073,6 @@
   "skip": "Ometre",
   "smsNotification": "smsNotification",
   "submit": "Submit",
-  "subscribe": "Subscribe",
   "subscription": "Subscripció",
   "support": "Suport",
   "surname": {
@@ -1071,6 +1090,23 @@
   "teams": "Equips",
   "terms_and_conditions": "Terms and Conditions",
   "terms_of_use": "Condicions d'ús",
+  "tier_upgrade": {
+    "current_plan": "Your current <2>free plan</2> is limited to selecting up to <6>50 voters</6>.",
+    "dont_limit_yourself": "Don't limit yourself. Join the family of 725 orgs that trust <2>Vocdoni</2>.",
+    "plan": {
+      "basic": "Basic",
+      "custom": "Custom",
+      "free": "Free",
+      "limit": {
+        "basic": "Up to 1500",
+        "custom": "Unlimited",
+        "free": "50 voters",
+        "pro": "Up to 3000"
+      },
+      "pro": "Pro"
+    },
+    "satisfaction_rate": "97% satisfaction rate, starting at 9€/month."
+  },
   "total_votes_submitted": "Total Votes Submitted",
   "update": "Update",
   "upload": "Upload",
@@ -1101,6 +1137,8 @@
     "verifying_title": "Verifying {{ email }}"
   },
   "view_pricing": "View Pricing",
+  "view_pricing_plan": "View Pricing Plan",
+  "view_pricing_plans": "View Pricing Plans",
   "vote_details": "Vote details",
   "voters": "voters",
   "voting_link": "Voting Link",
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index fdb3328c1..e1a74dfae 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -758,6 +758,8 @@
   "meta": {
     "helper": "Provide a clear title and description to help voters understand the vote"
   },
+  "more_than_memberships_one": "more than {{count}} membership",
+  "more_than_memberships_other": "more than {{count}} memberships",
   "multiple": "multiple",
   "name": "Name",
   "new_organization": {
@@ -805,11 +807,27 @@
   },
   "passwords_do_not_match": "",
   "personalization": "personalization",
+  "plan_upgrade": {
+    "dont_limit_yourself": "Don't limit yourself. Join the family of 725 orgs that trust <2>Vocdoni</2>.",
+    "feature_available_in": "Feature available in:",
+    "feature_unavailable": "Oops ... your <2>free plan</2> doesn't support {{feature}}.",
+    "plan": {
+      "basic": "Basic",
+      "custom": "Custom",
+      "free": "Free",
+      "pro": "Pro"
+    },
+    "satisfaction_rate": "97% satisfaction rate, for only 9€/month."
+  },
   "preview": "Preview",
   "pricing": {
     "advanced_analytitcs": "Advanced reporting and analytics",
+    "all_features": "All features & voting types",
     "basic_analytics": "Basic reporting and analytics",
     "core_voting": "Core voting features",
+    "custom_subtitle": "Large organizations enterprises, and institutions requiring extensive customization and support.",
+    "custom_title": "Custom Plan",
+    "dedicated_manager": "Dedicated account manager",
     "essential_subtitle": "Small or medium-sized orgs or community groups with basic voting needs.",
     "essential_title": "Essential",
     "features": {
@@ -836,6 +854,7 @@
     "unlimited_yearly_processes": "Unlimited yearly voting processes",
     "up_to_admins": "Up to {{ admin }} admin and {{ org }} org",
     "upgrade_title": "You need to upgrade to use this feature",
+    "white_label": "White label solution",
     "yearly_processes_one": "{{ count }} yearly voting process",
     "yearly_processes_other": "{{ count }} yearly voting processes",
     "your_plan": "Currently you are subscribed to the 'Your plan' subscription. If you upgrade, we will only charge the yearly difference. In the next billing period, starting on 'dd/mm/yy' you will pay for the new select plan."
@@ -1041,7 +1060,6 @@
   "skip": "Skip",
   "smsNotification": "smsNotification",
   "submit": "Submit",
-  "subscribe": "Subscribe",
   "subscription": "Subscription",
   "support": "Support",
   "surname": {
@@ -1059,6 +1077,23 @@
   "teams": "Teams",
   "terms_and_conditions": "Terms and Conditions",
   "terms_of_use": "Terms of Use",
+  "tier_upgrade": {
+    "current_plan": "Your current <2>free plan</2> is limited to selecting up to <6>50 voters</6>.",
+    "dont_limit_yourself": "Don't limit yourself. Join the family of 725 orgs that trust <2>Vocdoni</2>.",
+    "plan": {
+      "basic": "Basic",
+      "custom": "Custom",
+      "free": "Free",
+      "limit": {
+        "basic": "Up to 1500",
+        "custom": "Unlimited",
+        "free": "50 voters",
+        "pro": "Up to 3000"
+      },
+      "pro": "Pro"
+    },
+    "satisfaction_rate": "97% satisfaction rate, starting at 9€/month."
+  },
   "total_votes_submitted": "Total Votes Submitted",
   "update": "Update",
   "upload": "Upload",
@@ -1089,6 +1124,8 @@
     "verifying_title": "Verifying {{ email }}"
   },
   "view_pricing": "View Pricing",
+  "view_pricing_plan": "View Pricing Plan",
+  "view_pricing_plans": "View Pricing Plans",
   "vote_details": "Vote details",
   "voters": "voters",
   "voting_link": "Voting Link",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 3b7b0993c..a5a01ec08 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -766,8 +766,11 @@
   "meta": {
     "helper": "Provide a clear title and description to help voters understand the vote"
   },
+  "more_than_memberships_one": "más de {{count}} membresía",
+  "more_than_memberships_many": "",
+  "more_than_memberships_other": "más de {{count}} membresías",
   "multiple": "multiple",
-  "name": "Name",
+  "name": "Nombre",
   "new_organization": {
     "create_organization_btn": "Crear Organización",
     "description1": "Antes de comenzar a crear su proceso de votación, <span>debe crear una organización</span>, es gratuito. Con una organización, podrá crear una amplia gama de elecciones y dar voz a los miembros de su comunidad.",
@@ -813,11 +816,27 @@
   },
   "passwords_do_not_match": "",
   "personalization": "personalization",
+  "plan_upgrade": {
+    "dont_limit_yourself": "Don't limit yourself. Join the family of 725 orgs that trust <2>Vocdoni</2>.",
+    "feature_available_in": "Feature available in:",
+    "feature_unavailable": "Oops ... your <2>free plan</2> doesn't support {{feature}}.",
+    "plan": {
+      "basic": "Basic",
+      "custom": "Custom",
+      "free": "Free",
+      "pro": "Pro"
+    },
+    "satisfaction_rate": "97% satisfaction rate, for only 9€/month."
+  },
   "preview": "Preview",
   "pricing": {
     "advanced_analytitcs": "Informes y análisis avanzados",
+    "all_features": "All features & voting types",
     "basic_analytics": "Informes y análisis básicos",
     "core_voting": "Funciones básicas de votación",
+    "custom_subtitle": "Large organizations enterprises, and institutions requiring extensive customization and support.",
+    "custom_title": "Custom Plan",
+    "dedicated_manager": "Dedicated account manager",
     "essential_subtitle": "Organizaciones pequeñas o medianas o grupos comunitarios con necesidades básicas de votación.",
     "essential_title": "Esencial",
     "features": {
@@ -844,6 +863,7 @@
     "unlimited_yearly_processes": "Procesos anuales ilimitados",
     "up_to_admins": "Hasta {{ admin }} admin. y {{ org }} organizaciones",
     "upgrade_title": "Debes actualizar tu plan para usar esta funcionalidad",
+    "white_label": "White label solution",
     "yearly_processes_one": "{{ count }} proceso anual",
     "yearly_processes_many": "",
     "yearly_processes_other": "{{ count }} procesos anuales",
@@ -1053,7 +1073,6 @@
   "skip": "Omitir",
   "smsNotification": "Notificación SMS",
   "submit": "Envía",
-  "subscribe": "Suscribirse",
   "subscription": "Suscripción",
   "support": "Soporte",
   "surname": {
@@ -1071,6 +1090,23 @@
   "teams": "Teams",
   "terms_and_conditions": "Terms and Conditions",
   "terms_of_use": "Condiciones de uso",
+  "tier_upgrade": {
+    "current_plan": "Your current <2>free plan</2> is limited to selecting up to <6>50 voters</6>.",
+    "dont_limit_yourself": "Don't limit yourself. Join the family of 725 orgs that trust <2>Vocdoni</2>.",
+    "plan": {
+      "basic": "Basic",
+      "custom": "Custom",
+      "free": "Free",
+      "limit": {
+        "basic": "Up to 1500",
+        "custom": "Unlimited",
+        "free": "50 voters",
+        "pro": "Up to 3000"
+      },
+      "pro": "Pro"
+    },
+    "satisfaction_rate": "97% satisfaction rate, starting at 9€/month."
+  },
   "total_votes_submitted": "Total Votes Submitted",
   "update": "Update",
   "upload": "Upload",
@@ -1101,6 +1137,8 @@
     "verifying_title": "Verifying {{ email }}"
   },
   "view_pricing": "View Pricing",
+  "view_pricing_plan": "View Pricing Plan",
+  "view_pricing_plans": "View Pricing Plans",
   "vote_details": "Vote details",
   "voters": "voters",
   "voting_link": "Voting Link",
diff --git a/src/router/routes/root.tsx b/src/router/routes/root.tsx
index dd8ce041f..0dee22c5a 100644
--- a/src/router/routes/root.tsx
+++ b/src/router/routes/root.tsx
@@ -6,7 +6,7 @@ import { Params } from 'react-router-dom'
 import Error from '~elements/Error'
 import Layout from '~elements/Layout'
 import PlansPublicPage from '~elements/plans'
-import PublicContentsLayout from '~elements/PublicContents'
+import { PlansLayout, StretchPublicContentsLayout } from '~elements/PublicContents'
 import { StripeCheckout, StripeReturn } from '~elements/Stripe'
 import ProtectedRoutes from '~src/router/ProtectedRoutes'
 import { Routes } from '.'
@@ -86,9 +86,9 @@ const RootElements = (client: VocdoniSDKClient) => [
       </SuspenseLoader>
     ),
   },
-  // Stuff centered in the view
+  // Plans have their own layout
   {
-    element: <PublicContentsLayout />,
+    element: <PlansLayout />,
     children: [
       {
         path: Routes.plans,
@@ -98,6 +98,12 @@ const RootElements = (client: VocdoniSDKClient) => [
           </SuspenseLoader>
         ),
       },
+    ],
+  },
+  // Stuff centered in the view, stretched
+  {
+    element: <StretchPublicContentsLayout />,
+    children: [
       {
         path: Routes.terms,
         element: (