diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
index fc29e727b55..ca4d08414b7 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardDetails/DashboardDetails.component.tsx
@@ -480,7 +480,7 @@ const DashboardDetails = ({
                                       />
                                     ) : (
                                       <span className="tw-no-description">
-                                        No description added
+                                        No description
                                       </span>
                                     )}
                                   </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx
index de39fb851a9..0abd27746f4 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DashboardVersion/DashboardVersion.component.tsx
@@ -286,7 +286,7 @@ const DashboardVersion: FC<DashboardVersionProp> = ({
                                 />
                               ) : (
                                 <span className="tw-no-description">
-                                  No description added
+                                  No description
                                 </span>
                               )}
                             </td>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
index 7e3d31a712e..a6b6c21a572 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/DatasetDetails/DatasetDetails.component.tsx
@@ -609,11 +609,15 @@ const DatasetDetails: React.FC<DatasetDetailsProps> = ({
               </div>
             )}
             {activeTab === 4 && (
-              <div>
+              <div
+                className="tw-py-4 tw-px-7 tw-grid tw-grid-cols-3 entity-feed-list"
+                id="tablequeries">
+                <div />
                 <TableQueries
                   isLoading={isQueriesLoading}
                   queries={tableQueries}
                 />
+                <div />
               </div>
             )}
             {activeTab === 5 && (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx
index e35ae24b624..d14cdcf8ac8 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityInfoDrawer/EntityInfoDrawer.component.tsx
@@ -230,9 +230,7 @@ const EntityInfoDrawer = ({
               {entityDetail.description?.trim() ? (
                 <RichTextEditorPreviewer markdown={entityDetail.description} />
               ) : (
-                <p className="tw-text-xs tw-text-grey-muted">
-                  No description added
-                </p>
+                <p className="tw-text-xs tw-text-grey-muted">No description</p>
               )}
             </div>
           </section>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
index d61aecad539..baeaf1a4f66 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/EntityTable/EntityTable.component.tsx
@@ -558,7 +558,7 @@ const EntityTable = ({
                                   />
                                 ) : (
                                   <span className="tw-no-description">
-                                    No description added{' '}
+                                    No description{' '}
                                   </span>
                                 )}
                               </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
index 28c3ed09c66..29b4e968387 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineDetails/PipelineDetails.component.tsx
@@ -426,7 +426,7 @@ const PipelineDetails = ({
                                       />
                                     ) : (
                                       <span className="tw-no-description">
-                                        No description added{' '}
+                                        No description{' '}
                                       </span>
                                     )}
                                   </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx
index 5b6f901d85d..9d52cbb5e68 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/PipelineVersion/PipelineVersion.component.tsx
@@ -288,7 +288,7 @@ const PipelineVersion: FC<PipelineVersionProp> = ({
                                     />
                                   ) : (
                                     <span className="tw-no-description">
-                                      No description added
+                                      No description
                                     </span>
                                   )}
                                 </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx
index 55b32eb5034..e71acf5bd91 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/TableQueries/TableQueries.tsx
@@ -94,7 +94,7 @@ const QueryCard: FC<QueryCardProp> = ({ className, query }) => {
               variant="text">
               {showCopiedText ? (
                 <span className="tw-mr-1 tw-text-success tw-bg-success-lite tw-px-1 tw-rounded-md">
-                  Copied!
+                  Copied to the clipboard
                 </span>
               ) : null}
               <SVGIcons alt="copy" icon={Icons.COPY} width="16px" />
@@ -119,9 +119,13 @@ const TableQueries: FC<TableQueriesProp> = ({ queries, className }) => {
   return (
     <div className={className}>
       <div className="tw-my-6">
-        {queries?.map((query, index) => (
-          <QueryCard key={index} query={query} />
-        ))}
+        {queries ? (
+          queries.map((query, index) => <QueryCard key={index} query={query} />)
+        ) : (
+          <div className="tw-mt-4 tw-ml-4 tw-flex tw-justify-center tw-font-medium tw-items-center tw-border tw-border-main tw-rounded-md tw-p-8">
+            <span>No queries data available.</span>
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.test.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.test.tsx
index a916e5cafd8..60f17c2230a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.test.tsx
@@ -23,7 +23,7 @@ const mockItem = {
   email: 'string@email.com',
   isActiveUser: true,
   profilePhoto: '',
-  teamCount: 2,
+  teamCount: 'Cloud_Infra',
 };
 
 const mockRemove = jest.fn();
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.tsx
index 39ab569b925..c84aeb06c58 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UserDataCard/UserDataCard.tsx
@@ -22,7 +22,7 @@ type Item = {
   email: string;
   isActiveUser: boolean;
   profilePhoto: string;
-  teamCount: number;
+  teamCount: string;
 };
 
 type Props = {
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserList.tsx b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserList.tsx
index 4e5a3b75338..24a10a9c745 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserList.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/UserList/UserList.tsx
@@ -81,10 +81,7 @@ const UserList: FunctionComponent<Props> = ({
       default:
         setUsers(
           userList.filter(
-            (user) =>
-              !user.isAdmin &&
-              !user.isBot &&
-              isIncludes(user.displayName || user.name)
+            (user) => !user.isBot && isIncludes(user.displayName || user.name)
           )
         );
 
@@ -93,7 +90,7 @@ const UserList: FunctionComponent<Props> = ({
   };
 
   const setAllTabList = () => {
-    setUsers(userList.filter((user) => !user.isAdmin && !user.isBot));
+    setUsers(userList.filter((user) => !user.isBot));
     setAdmins(userList.filter((user) => user.isAdmin));
     setBots(userList.filter((user) => user.isBot));
   };
@@ -310,11 +307,19 @@ const UserList: FunctionComponent<Props> = ({
               email: user.email || '',
               isActiveUser: !user.deleted,
               profilePhoto: user.profile?.images?.image || '',
-              teamCount: user.teams?.length || 0,
+              teamCount:
+                user.teams
+                  ?.map((team) => team.displayName ?? team.name)
+                  ?.join(', ') ?? '',
             };
 
             return (
-              <UserDataCard item={User} key={index} onClick={selectUser} />
+              <div
+                className="tw-cursor-pointer"
+                key={index}
+                onClick={() => selectUser(User.id)}>
+                <UserDataCard item={User} onClick={selectUser} />
+              </div>
             );
           })}
         </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card/TableDataCardBody.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card/TableDataCardBody.tsx
index 8079c356afb..f5d4fa4520d 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card/TableDataCardBody.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/table-data-card/TableDataCardBody.tsx
@@ -67,7 +67,7 @@ const TableDataCardBody: FunctionComponent<Props> = ({
             markdown={description}
           />
         ) : (
-          <span className="tw-no-description">No description added</span>
+          <span className="tw-no-description">No description</span>
         )}
       </div>
       {Boolean(tags?.length) && (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx b/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx
index 276d2d0ab50..58ff5d1a45c 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/my-data-details/SchemaTable.tsx
@@ -290,7 +290,7 @@ const SchemaTable: FunctionComponent<Props> = ({
                             />
                           ) : (
                             <span className="tw-no-description">
-                              No description added
+                              No description
                             </span>
                           )}
                         </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx
index 6425de7957e..33b58102c60 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.component.tsx
@@ -514,7 +514,7 @@ const RolesPage = () => {
     if (!rules.length) {
       return (
         <div className="tw-text-center tw-py-5">
-          <p className="tw-text-base">No Rules Added.</p>
+          <p className="tw-text-base">No rules.</p>
         </div>
       );
     }
@@ -818,14 +818,16 @@ const RolesPage = () => {
                       <NonAdminAction
                         position="bottom"
                         title={TITLE_FOR_NON_ADMIN_ACTION}>
-                        <button
-                          className="link-text tw-underline"
+                        <Button
+                          size="small"
+                          theme="primary"
+                          variant="outlined"
                           onClick={() => {
                             setErrorData(undefined);
                             setIsAddingRole(true);
                           }}>
                           Click here
-                        </button>
+                        </Button>
                         {' to add new Role'}
                       </NonAdminAction>
                     </p>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.test.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.test.tsx
index 6ad81f33797..83059799094 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.test.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/RolesPage/RolesPage.test.tsx
@@ -140,12 +140,12 @@ describe('Test RolesPage component', () => {
     const { container } = render(<RolesPage />, {
       wrapper: MemoryRouter,
     });
-    // checking No Rules Added. directly as there is no data available on 1st instance
+    // checking No rules. directly as there is no data available on 1st instance
 
     const usersButton = await findByTestId(container, 'users');
     const teamsButton = await findByTestId(container, 'teams');
 
-    expect(await findByText(container, /No Rules Added./i)).toBeInTheDocument();
+    expect(await findByText(container, /No rules./i)).toBeInTheDocument();
 
     fireEvent.click(usersButton);
 
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
index 38fe8bc4aa6..aa9e4fd3674 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/database-details/index.tsx
@@ -588,7 +588,7 @@ const DatabaseDetails: FunctionComponent = () => {
                                   />
                                 ) : (
                                   <span className="tw-no-description">
-                                    No description added
+                                    No description
                                   </span>
                                 )}
                               </td>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
index 51438484b2f..9ab265f7f68 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/service/index.tsx
@@ -237,7 +237,7 @@ const ServicePage: FunctionComponent = () => {
       key: 'Owner',
       value:
         serviceDetails?.owner?.type === 'team'
-          ? getTeamDetailsPath(serviceDetails?.owner?.type || '')
+          ? getTeamDetailsPath(serviceDetails?.owner?.name || '')
           : serviceDetails?.owner?.name || '',
       placeholderText: serviceDetails?.owner?.displayName || '',
       isLink: serviceDetails?.owner?.type === 'team',
@@ -1061,7 +1061,7 @@ const ServicePage: FunctionComponent = () => {
                                     />
                                   ) : (
                                     <span className="tw-no-description">
-                                      No description added
+                                      No description
                                     </span>
                                   )}
                                 </td>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx
index 5aad5312a77..12112f8b364 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/services/index.tsx
@@ -556,7 +556,7 @@ const ServicesPage = () => {
                               />
                             ) : (
                               <span className="tw-no-description">
-                                No description added
+                                No description
                               </span>
                             )}
                           </div>
@@ -623,12 +623,14 @@ const ServicesPage = () => {
                       <NonAdminAction
                         position="bottom"
                         title={TITLE_FOR_NON_ADMIN_ACTION}>
-                        <button
-                          className="link-text tw-underline"
+                        <Button
                           data-testid="add-service-button"
+                          size="small"
+                          theme="primary"
+                          variant="outlined"
                           onClick={handleAddService}>
                           Click here
-                        </button>
+                        </Button>
                       </NonAdminAction>{' '}
                       to add new {servicesDisplayName[serviceName]}
                     </p>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
index 1d84ca6597e..21545a386ce 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/tags/index.tsx
@@ -387,7 +387,7 @@ const TagsPage = () => {
                                       />
                                     ) : (
                                       <span className="tw-no-description">
-                                        No description added
+                                        No description
                                       </span>
                                     )}
                                   </div>
diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx
index 1ca472f49bb..b613f87de57 100644
--- a/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/pages/teams/index.tsx
@@ -569,13 +569,16 @@ const TeamsPage = () => {
                       <NonAdminAction
                         position="bottom"
                         title={TITLE_FOR_NON_ADMIN_ACTION}>
-                        <button
-                          className={classNames('link-text tw-underline', {
+                        <Button
+                          className={classNames({
                             'tw-opacity-40': !isAdminUser && !isAuthDisabled,
                           })}
+                          size="small"
+                          theme="primary"
+                          variant="outlined"
                           onClick={() => setIsAddingTeam(true)}>
                           Click here
-                        </button>
+                        </Button>
                       </NonAdminAction>
                       {' to add new Team'}
                     </div>