diff --git a/src/components/Alert.tsx b/src/components/Alert.tsx
index c2f315dc..6d8f5166 100644
--- a/src/components/Alert.tsx
+++ b/src/components/Alert.tsx
@@ -1,14 +1,16 @@
-import { Box, Typography } from '@mui/material'
+import { Box, SxProps, Typography } from '@mui/material'
 import React from 'react'
 
 const Alert = ({
     variant,
     title,
     content,
+    sx,
 }: {
-    variant: 'info' | 'negative'
+    variant: 'info' | 'negative' | 'warning'
     title?: string
     content: string
+    sx?: SxProps
 }) => {
     return (
         <Box
@@ -18,11 +20,20 @@ const Alert = ({
                 padding: '16px',
                 border: '1px solid',
                 borderColor:
-                    variant === 'info' ? 'rgba(0, 133, 255, 0.5)' : 'rgba(229, 67, 31, 0.5)',
+                    variant === 'info'
+                        ? 'rgba(0, 133, 255, 0.5)'
+                        : variant === 'warning'
+                        ? 'rgba(229, 162, 31, 0.5)'
+                        : 'rgba(229, 67, 31, 0.5)',
                 background:
-                    variant === 'info' ? 'rgba(0, 133, 255, 0.05)' : 'rgba(229, 67, 31, 0.05)',
+                    variant === 'info'
+                        ? 'rgba(0, 133, 255, 0.05)'
+                        : variant === 'warning'
+                        ? 'rgba(229, 162, 31, 0.05)'
+                        : 'rgba(229, 67, 31, 0.05)',
                 borderRadius: '6px',
                 maxWidth: '350px',
+                ...sx,
                 ...(!title && { alignItems: 'center' }),
             }}
         >
@@ -55,6 +66,17 @@ const Alert = ({
                         />
                     </svg>
                 )}
+                {variant === 'warning' && (
+                    <svg
+                        width="24"
+                        height="24"
+                        viewBox="0 0 24 24"
+                        fill="none"
+                        xmlns="http://www.w3.org/2000/svg"
+                    >
+                        <path d="M13 14H11V9H13M13 18H11V16H13M1 21H23L12 2L1 21Z" fill="#E5A21F" />
+                    </svg>
+                )}
             </Box>
             <Box sx={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
                 {title && (
diff --git a/src/helpers/useSmartContract.tsx b/src/helpers/useSmartContract.tsx
index 8987e344..8a03a4c8 100644
--- a/src/helpers/useSmartContract.tsx
+++ b/src/helpers/useSmartContract.tsx
@@ -126,9 +126,6 @@ export const SmartContractProvider: React.FC<SmartContractProviderProps> = ({ ch
             )
             setProvider(ethersProvider)
             setManagerReadContract(managerReadOnlyContract)
-            // const allCMAccounts = await getCMAccountMappings()
-            // let result = allCMAccounts.getAllMappings()
-            // console.log(result)
         } catch (error) {
             console.error('User denied account access:', error)
         }
diff --git a/src/redux/services/partners.ts b/src/redux/services/partners.ts
index c188ef67..3a91d3d7 100644
--- a/src/redux/services/partners.ts
+++ b/src/redux/services/partners.ts
@@ -93,7 +93,7 @@ async function getContractMappings(): Promise<Map<string, string>> {
 
 function checkMatch(data): boolean {
     if (data.supportedResult.length === 0 && data.wantedResult.length === 0) {
-        return true
+        return false
     }
 
     const supportedResultSet = new Set(data.supportedResult.map(getServiceName))
diff --git a/src/views/partners/ConfigurSupplier.tsx b/src/views/partners/ConfigurSupplier.tsx
index 7fbefad2..4c8ba5dc 100644
--- a/src/views/partners/ConfigurSupplier.tsx
+++ b/src/views/partners/ConfigurSupplier.tsx
@@ -294,7 +294,6 @@ export const BasicSupportedServices = () => {
     })
     useEffect(() => {
         if (partner) {
-            console.log({ supportedServices: partner.supportedServices })
             dispatchSupplierState({
                 type: actionTypes.UPDATE_SUPPORTED_SERVICES,
                 payload: { services: partner.supportedServices, reset: true },
diff --git a/src/views/partners/Configuration.tsx b/src/views/partners/Configuration.tsx
index 7d65ab45..a6079b87 100644
--- a/src/views/partners/Configuration.tsx
+++ b/src/views/partners/Configuration.tsx
@@ -29,12 +29,14 @@ const Content = () => {
     const { state, dispatch } = usePartnerConfigurationContext()
     const [loading, setLoading] = useState(false)
     const partnerConfig = usePartnerConfig()
+
     async function submit() {
         setLoading(true)
         await partnerConfig.CreateConfiguration(state)
         setLoading(false)
     }
     const { balance } = useWalletBalance()
+
     if (contractCMAccountAddress) return <MyMessenger />
     return (
         <Box
@@ -66,10 +68,25 @@ const Content = () => {
                 )}
                 <Divider />
                 <Configuration.Buttons>
-                    <MainButton loading={loading} variant="contained" onClick={submit}>
+                    <MainButton
+                        loading={loading}
+                        variant="contained"
+                        onClick={submit}
+                        disabled={parseFloat(balance) < 100}
+                    >
                         Create Configuration
                     </MainButton>
                 </Configuration.Buttons>
+                <Box sx={{ width: '100%' }}>
+                    <Alert
+                        sx={{ maxWidth: 'none', width: 'fit-content' }}
+                        variant="warning"
+                        title="100 CAM is required"
+                        content={
+                            'Creating Camino Messenger account will incur a fee estimated of 0.22366775 CAM from C-Chain balance'
+                        }
+                    />
+                </Box>
             </Configuration>
             <Box sx={{ display: 'flex', flexDirection: 'column', gap: '16px' }}>
                 {state.step === 0 && (
diff --git a/src/views/partners/MyMessenger.tsx b/src/views/partners/MyMessenger.tsx
index 92364f6d..af855e53 100644
--- a/src/views/partners/MyMessenger.tsx
+++ b/src/views/partners/MyMessenger.tsx
@@ -454,7 +454,11 @@ const MyMessenger = () => {
                             Offered Services
                         </Typography>
                         <Typography variant="caption">
-                            {getServicesNames(state.stepsConfig[1]?.services)}
+                            {state.stepsConfig[1]?.services.length > 0 ? (
+                                getServicesNames(state.stepsConfig[1]?.services)
+                            ) : (
+                                <>None</>
+                            )}
                         </Typography>
                     </Box>
                     <Box sx={{ display: 'flex', alignItems: 'start', gap: '16px' }}>
@@ -462,7 +466,11 @@ const MyMessenger = () => {
                             Wanted Services
                         </Typography>
                         <Typography variant="caption">
-                            {getServicesNames(state.stepsConfig[2]?.services)}
+                            {state.stepsConfig[2]?.services.length > 0 ? (
+                                getServicesNames(state.stepsConfig[2]?.services)
+                            ) : (
+                                <>None</>
+                            )}
                         </Typography>
                     </Box>
                     {/* <ServiceList
@@ -679,6 +687,27 @@ const MyMessenger = () => {
                             )}
                         </Box>
                     </Box>
+                    {state.stepsConfig[1]?.services.length == 0 && (
+                        <Alert
+                            sx={{ maxWidth: 'none', width: 'fit-content' }}
+                            variant="warning"
+                            content="Visit the relevant tab to add offered services"
+                        />
+                    )}
+                    {state.stepsConfig[2]?.services.length == 0 && (
+                        <Alert
+                            sx={{ maxWidth: 'none', width: 'fit-content' }}
+                            variant="warning"
+                            content="Visit the relevant tab to add wanted services"
+                        />
+                    )}
+                    {bots.length == 0 && (
+                        <Alert
+                            sx={{ maxWidth: 'none', width: 'fit-content' }}
+                            variant="warning"
+                            content="Visit the relevant tab to add bots"
+                        />
+                    )}
                 </Configuration>
                 <Box sx={{ display: 'flex', flexDirection: 'column', gap: '16px' }}>
                     <Configuration.Infos
diff --git a/src/views/partners/Partner.tsx b/src/views/partners/Partner.tsx
index cc986b06..640b9dd6 100644
--- a/src/views/partners/Partner.tsx
+++ b/src/views/partners/Partner.tsx
@@ -191,9 +191,11 @@ const Widget = ({ supportedServices, CMAccountAddress, wantedServices, supported
                         )}
                         {!supportedCurrencies?.offChainPaymentSupported &&
                             !supportedCurrencies?.isCam && (
-                                <Typography fontSize={14} fontWeight={600} lineHeight={'20px'}>
-                                    None.
-                                </Typography>
+                                <li className="service-type-item">
+                                    <Typography fontSize={14} fontWeight={600} lineHeight={'20px'}>
+                                        None.
+                                    </Typography>
+                                </li>
                             )}
                     </ul>
                 ) : (