diff --git a/web/gds-user-ui/src/components/Collaborators/index.tsx b/web/gds-user-ui/src/components/Collaborators/index.tsx
index e35e6b8b6..95319ba7e 100644
--- a/web/gds-user-ui/src/components/Collaborators/index.tsx
+++ b/web/gds-user-ui/src/components/Collaborators/index.tsx
@@ -130,7 +130,7 @@ const CollaboratorsSection: React.FC = () => {
     onClose();
   };
   return (
-    <FormLayout overflowX={'scroll'}>
+    <FormLayout overflowX={'auto'}>
       <Table variant="simple">
         <TableCaption placement="top" textAlign="end" p={0} m={0} mb={3} fontSize={20}>
           <Tooltip
diff --git a/web/gds-user-ui/src/components/Section/SearchDirectory.tsx b/web/gds-user-ui/src/components/Section/SearchDirectory.tsx
index 41db88dc8..d2cab51e1 100644
--- a/web/gds-user-ui/src/components/Section/SearchDirectory.tsx
+++ b/web/gds-user-ui/src/components/Section/SearchDirectory.tsx
@@ -98,7 +98,6 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
                       <AutoCompleteInput
                         variant="outline"
                         placeholder="Common name or VASP ID"
-                        autoFocus
                       />
 
                       <AutoCompleteList>
@@ -112,7 +111,7 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
                               setSearch(oid);
                               handleSubmit(e, oid);
                             }}
-                            textTransform="capitalize">
+                            >
                             {oid}
                           </AutoCompleteItem>
                         ))}
@@ -180,12 +179,12 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
             <Box>
               <Tabs colorScheme="blue">
                 <TabList border={'1px solid #eee'}>
-                  <Tab
+                <Tab
                     sx={{ width: '100%' }}
                     _focus={{ outline: 'none' }}
                     _selected={{ bg: colors.system.blue, color: 'white', fontWeight: 'semibold' }}>
                     <Text fontSize={['x-small', 'medium']}>
-                      <Trans id="TESTNET DIRECTORY RECORD">TESTNET DIRECTORY RECORD</Trans>
+                      <Trans id="MAINNET DIRECTORY RECORD">MAINNET DIRECTORY RECORD</Trans>
                     </Text>
                   </Tab>
                   <Tab
@@ -193,55 +192,59 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
                     _focus={{ outline: 'none' }}
                     _selected={{ bg: colors.system.blue, color: 'white', fontWeight: 'semibold' }}>
                     <Text fontSize={['x-small', 'medium']}>
-                      <Trans id="MAINNET DIRECTORY RECORD">MAINNET DIRECTORY RECORD</Trans>
+                      <Trans id="TESTNET DIRECTORY RECORD">TESTNET DIRECTORY RECORD</Trans>
                     </Text>
                   </Tab>
                 </TabList>
                 <TabPanels>
-                  <TabPanel p={0} border="1px solid #eee">
+                <TabPanel p={0} border="1px solid #eee">
                     <TableContainer>
                       <Table
                         variant="simple"
-                        sx={{ 'td:first-child': { fontWeight: 'semibold', width: '50%' } }}>
+                        sx={{
+                          'td:first-child': { fontWeight: 'semibold', width: '50%' },
+                          'td:last-child': { width: '50%' }
+                        }}>
                         <Tbody>
                           <Tr>
                             <Td>
                               <Trans id="Organization Name">Organization Name</Trans>
                             </Td>
-                            <Td colSpan={2}>{result?.testnet?.name || 'N/A'}</Td>
+                            <Td colSpan={2}>{result?.mainnet?.name || 'N/A'} </Td>
                           </Tr>
                           <Tr>
                             <Td>
                               <Trans id="Common Name">Common Name</Trans>
                             </Td>
-                            <Td>{result?.testnet?.common_name || 'N/A'}</Td>
+                            <Td>{result?.mainnet?.common_name || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
                               <Trans id="TRISA Service Endpoint">TRISA Service Endpoint</Trans>
                             </Td>
-                            <Td>{result?.testnet?.endpoint || 'N/A'}</Td>
+                            <Td>{result?.mainnet?.endpoint || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
-                              <Trans id="Registered Directory">Registered Directory</Trans>
+                              <Trans id="Registered Directory"></Trans>
                             </Td>
-                            <Td>{result?.testnet?.registered_directory || 'N/A'}</Td>
+                            <Td>{result?.mainnet?.registered_directory || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
-                              <Trans id="TRISA Member ID">TRISA Member ID</Trans>
+                              <Trans id="TRISA Member ID"></Trans>
                             </Td>
-                            <Td>{result?.testnet?.id || 'N/A'}</Td>
+                            <Td>{result?.mainnet?.id || 'N/A'}</Td>
                           </Tr>
+
                           <Tr>
                             <Td>
                               <Trans id="Country">Country</Trans>
                             </Td>
                             <Td>
-                              {getCountryName(result?.testnet?.country as IsoCountryCode)}
+                              {getCountryName(result?.mainnet?.country as IsoCountryCode)}
                               {'  '}
-                              {countryCodeEmoji(result?.testnet?.country) || 'N/A'}
+                              {countryCodeEmoji(result?.mainnet?.country) || 'N/A'}
                             </Td>
                           </Tr>
 
@@ -249,11 +252,11 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
                             <Td>
                               <Trans id="TRISA Verification">TRISA Verification</Trans>
                             </Td>
-                            {result?.testnet?.verified_on ? (
+                            {result?.mainnet?.verified_on ? (
                               <Td>
                                 {' '}
                                 <Trans id="VERIFIED ON">VERIFIED ON</Trans>{' '}
-                                {result?.testnet?.verified_on}{' '}
+                                {result?.mainnet?.verified_on}{' '}
                               </Td>
                             ) : (
                               <Td>N/A</Td>
@@ -267,50 +270,46 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
                     <TableContainer>
                       <Table
                         variant="simple"
-                        sx={{
-                          'td:first-child': { fontWeight: 'semibold', width: '50%' },
-                          'td:last-child': { width: '50%' }
-                        }}>
+                        sx={{ 'td:first-child': { fontWeight: 'semibold', width: '50%' } }}>
                         <Tbody>
                           <Tr>
                             <Td>
                               <Trans id="Organization Name">Organization Name</Trans>
                             </Td>
-                            <Td colSpan={2}>{result?.mainnet?.name || 'N/A'} </Td>
+                            <Td colSpan={2}>{result?.testnet?.name || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
                               <Trans id="Common Name">Common Name</Trans>
                             </Td>
-                            <Td>{result?.mainnet?.common_name || 'N/A'}</Td>
+                            <Td>{result?.testnet?.common_name || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
                               <Trans id="TRISA Service Endpoint">TRISA Service Endpoint</Trans>
                             </Td>
-                            <Td>{result?.mainnet?.endpoint || 'N/A'}</Td>
+                            <Td>{result?.testnet?.endpoint || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
-                              <Trans id="Registered Directory"></Trans>
+                              <Trans id="Registered Directory">Registered Directory</Trans>
                             </Td>
-                            <Td>{result?.mainnet?.registered_directory || 'N/A'}</Td>
+                            <Td>{result?.testnet?.registered_directory || 'N/A'}</Td>
                           </Tr>
                           <Tr>
                             <Td>
-                              <Trans id="TRISA Member ID"></Trans>
+                              <Trans id="TRISA Member ID">TRISA Member ID</Trans>
                             </Td>
-                            <Td>{result?.mainnet?.id || 'N/A'}</Td>
+                            <Td>{result?.testnet?.id || 'N/A'}</Td>
                           </Tr>
-
                           <Tr>
                             <Td>
                               <Trans id="Country">Country</Trans>
                             </Td>
                             <Td>
-                              {getCountryName(result?.mainnet?.country as IsoCountryCode)}
+                              {getCountryName(result?.testnet?.country as IsoCountryCode)}
                               {'  '}
-                              {countryCodeEmoji(result?.mainnet?.country) || 'N/A'}
+                              {countryCodeEmoji(result?.testnet?.country) || 'N/A'}
                             </Td>
                           </Tr>
 
@@ -318,11 +317,11 @@ const SearchDirectory: React.FC<TSearchDirectory> = ({
                             <Td>
                               <Trans id="TRISA Verification">TRISA Verification</Trans>
                             </Td>
-                            {result?.mainnet?.verified_on ? (
+                            {result?.testnet?.verified_on ? (
                               <Td>
                                 {' '}
                                 <Trans id="VERIFIED ON">VERIFIED ON</Trans>{' '}
-                                {result?.mainnet?.verified_on}{' '}
+                                {result?.testnet?.verified_on}{' '}
                               </Td>
                             ) : (
                               <Td>N/A</Td>
diff --git a/web/gds-user-ui/src/components/Sidebar/index.tsx b/web/gds-user-ui/src/components/Sidebar/index.tsx
index 917b4554f..fe4663936 100644
--- a/web/gds-user-ui/src/components/Sidebar/index.tsx
+++ b/web/gds-user-ui/src/components/Sidebar/index.tsx
@@ -30,7 +30,7 @@ const Sidebar: React.FC<SidebarProps> = ({ children }) => {
         </DrawerContent>
       </Drawer>
       <MobileNav onOpen={onOpen} />
-      <Box ml={{ base: 0, md: 274 }} pt={10} px="10" height="100%" overflow="scroll">
+      <Box ml={{ base: 0, md: 274 }} pt={10} px="10" height="100%" overflow="auto">
         {children}
       </Box>
     </Box>
diff --git a/web/gds-user-ui/src/modules/dashboard/member/index.tsx b/web/gds-user-ui/src/modules/dashboard/member/index.tsx
index 86472e4b1..cc0cb01cc 100644
--- a/web/gds-user-ui/src/modules/dashboard/member/index.tsx
+++ b/web/gds-user-ui/src/modules/dashboard/member/index.tsx
@@ -15,7 +15,7 @@ const MemberPage: React.FC = () => {
       </Heading>
       <Suspense fallback={<Loader />}>
         <DirectoryNotification />
-        <FormLayout overflowX={'scroll'}>
+        <FormLayout overflowX={'auto'}>
           <MemberHeader />
           <MemberSelectNetwork />
           <MemberTable />