diff --git a/client/src/app/components/AppTableActionButtons.tsx b/client/src/app/components/AppTableActionButtons.tsx
index 9e01ceaf72..550f196568 100644
--- a/client/src/app/components/AppTableActionButtons.tsx
+++ b/client/src/app/components/AppTableActionButtons.tsx
@@ -1,8 +1,9 @@
 import React from "react";
 import { useTranslation } from "react-i18next";
-import { Button, Flex, FlexItem } from "@patternfly/react-core";
+import { Button } from "@patternfly/react-core";
 import { applicationsWriteScopes, RBAC, RBAC_TYPE } from "@app/rbac";
 import { ConditionalTooltip } from "./ConditionalTooltip";
+import { Td } from "@patternfly/react-table";
 
 export interface AppTableActionButtonsProps {
   isDeleteEnabled?: boolean;
@@ -24,34 +25,32 @@ export const AppTableActionButtons: React.FC<AppTableActionButtonsProps> = ({
       allowedPermissions={applicationsWriteScopes}
       rbacType={RBAC_TYPE.Scope}
     >
-      <Flex>
-        <FlexItem align={{ default: "alignRight" }}>
+      <Td isActionCell>
+        <Button
+          id="edit-button"
+          aria-label="edit"
+          variant="secondary"
+          onClick={onEdit}
+        >
+          {t("actions.edit")}
+        </Button>
+      </Td>
+      <Td isActionCell>
+        <ConditionalTooltip
+          isTooltipEnabled={isDeleteEnabled}
+          content={tooltipMessage}
+        >
           <Button
-            id="edit-button"
-            aria-label="edit"
-            variant="secondary"
-            onClick={onEdit}
+            id="delete-button"
+            aria-label="delete"
+            variant="link"
+            onClick={onDelete}
+            isAriaDisabled={isDeleteEnabled}
           >
-            {t("actions.edit")}
+            {t("actions.delete")}
           </Button>
-        </FlexItem>
-        <FlexItem>
-          <ConditionalTooltip
-            isTooltipEnabled={isDeleteEnabled}
-            content={tooltipMessage}
-          >
-            <Button
-              id="delete-button"
-              aria-label="delete"
-              variant="link"
-              onClick={onDelete}
-              isAriaDisabled={isDeleteEnabled}
-            >
-              {t("actions.delete")}
-            </Button>
-          </ConditionalTooltip>
-        </FlexItem>
-      </Flex>
+        </ConditionalTooltip>
+      </Td>
     </RBAC>
   );
 };
diff --git a/client/src/app/pages/applications/applications-table/applications-table.tsx b/client/src/app/pages/applications/applications-table/applications-table.tsx
index 51f2cefe11..0e2afe6cd0 100644
--- a/client/src/app/pages/applications/applications-table/applications-table.tsx
+++ b/client/src/app/pages/applications/applications-table/applications-table.tsx
@@ -824,7 +824,7 @@ export const ApplicationsTable: React.FC = () => {
             <Tr>
               <TableHeaderContentWithControls {...tableControls}>
                 {getColumnVisibility("name") && (
-                  <Th {...getThProps({ columnKey: "name" })} width={15} />
+                  <Th {...getThProps({ columnKey: "name" })} width={10} />
                 )}
                 {getColumnVisibility("businessService") && (
                   <Th
@@ -836,10 +836,10 @@ export const ApplicationsTable: React.FC = () => {
                   <Th {...getThProps({ columnKey: "assessment" })} width={15} />
                 )}
                 {getColumnVisibility("review") && (
-                  <Th {...getThProps({ columnKey: "review" })} width={10} />
+                  <Th {...getThProps({ columnKey: "review" })} width={15} />
                 )}
                 {getColumnVisibility("analysis") && (
-                  <Th {...getThProps({ columnKey: "analysis" })} width={10} />
+                  <Th {...getThProps({ columnKey: "analysis" })} width={15} />
                 )}
                 {getColumnVisibility("tags") && (
                   <Th {...getThProps({ columnKey: "tags" })} width={10} />
@@ -847,7 +847,7 @@ export const ApplicationsTable: React.FC = () => {
                 {getColumnVisibility("effort") && (
                   <Th {...getThProps({ columnKey: "effort" })} width={10} />
                 )}
-                <Th />
+                <Th width={10} />
               </TableHeaderContentWithControls>
             </Tr>
           </Thead>
@@ -885,7 +885,7 @@ export const ApplicationsTable: React.FC = () => {
                     >
                       {getColumnVisibility("name") && (
                         <Td
-                          width={15}
+                          width={10}
                           {...getTdProps({ columnKey: "name" })}
                           modifier="truncate"
                         >
@@ -936,7 +936,7 @@ export const ApplicationsTable: React.FC = () => {
                       )}
                       {getColumnVisibility("analysis") && (
                         <Td
-                          width={10}
+                          width={15}
                           modifier="truncate"
                           {...getTdProps({ columnKey: "analysis" })}
                         >
diff --git a/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx b/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
index 12173c3ec5..f63f19db56 100644
--- a/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
+++ b/client/src/app/pages/controls/stakeholder-groups/stakeholder-groups.tsx
@@ -226,9 +226,13 @@ export const StakeholderGroups: React.FC = () => {
             <Thead>
               <Tr>
                 <TableHeaderContentWithControls {...tableControls}>
-                  <Th {...getThProps({ columnKey: "name" })} />
-                  <Th {...getThProps({ columnKey: "description" })} />
-                  <Th {...getThProps({ columnKey: "count" })} />
+                  <Th {...getThProps({ columnKey: "name" })} width={25} />
+                  <Th
+                    {...getThProps({ columnKey: "description" })}
+                    width={25}
+                  />
+                  <Th {...getThProps({ columnKey: "count" })} width={40} />
+                  <Th width={10} />
                 </TableHeaderContentWithControls>
               </Tr>
             </Thead>
@@ -254,52 +258,49 @@ export const StakeholderGroups: React.FC = () => {
               }
               numRenderedColumns={numRenderedColumns}
             >
-              {currentPageItems?.map((stakeholderGroup, rowIndex) => {
-                const hasStakeholders = stakeholderGroup.stakeholders?.length;
-                return (
-                  <Tbody
-                    key={stakeholderGroup.id}
-                    isExpanded={isCellExpanded(stakeholderGroup)}
-                  >
-                    <Tr {...getTrProps({ item: stakeholderGroup })}>
-                      <TableRowContentWithControls
-                        {...tableControls}
-                        item={stakeholderGroup}
-                        rowIndex={rowIndex}
-                      >
-                        <Td width={25} {...getTdProps({ columnKey: "name" })}>
-                          {stakeholderGroup.name}
-                        </Td>
-                        <Td
-                          width={10}
-                          {...getTdProps({ columnKey: "description" })}
+              <Tbody key={stakeholderGroups?.length}>
+                {currentPageItems?.map((stakeholderGroup, rowIndex) => {
+                  return (
+                    <>
+                      <Tr {...getTrProps({ item: stakeholderGroup })}>
+                        <TableRowContentWithControls
+                          {...tableControls}
+                          item={stakeholderGroup}
+                          rowIndex={rowIndex}
                         >
-                          {stakeholderGroup.description}
-                        </Td>
-                        <Td width={10} {...getTdProps({ columnKey: "count" })}>
-                          {stakeholderGroup.stakeholders?.length}
-                        </Td>
-                        <Td width={20}>
+                          <Td width={25} {...getTdProps({ columnKey: "name" })}>
+                            {stakeholderGroup.name}
+                          </Td>
+                          <Td
+                            width={25}
+                            {...getTdProps({ columnKey: "description" })}
+                          >
+                            {stakeholderGroup.description}
+                          </Td>
+                          <Td
+                            width={40}
+                            {...getTdProps({ columnKey: "count" })}
+                          >
+                            {stakeholderGroup.stakeholders?.length}
+                          </Td>
                           <AppTableActionButtons
                             onEdit={() =>
                               setCreateUpdateModalState(stakeholderGroup)
                             }
                             onDelete={() => deleteRow(stakeholderGroup)}
                           />
-                        </Td>
-                      </TableRowContentWithControls>
-                    </Tr>
-                    {isCellExpanded(stakeholderGroup) ? (
-                      <Tr isExpanded>
-                        <Td />
-                        <Td
-                          {...getExpandedContentTdProps({
-                            item: stakeholderGroup,
-                          })}
-                          className={spacing.pyLg}
-                        >
-                          <ExpandableRowContent>
-                            {hasStakeholders ? (
+                        </TableRowContentWithControls>
+                      </Tr>
+                      {isCellExpanded(stakeholderGroup) ? (
+                        <Tr isExpanded>
+                          <Td />
+                          <Td
+                            {...getExpandedContentTdProps({
+                              item: stakeholderGroup,
+                            })}
+                            className={spacing.pyLg}
+                          >
+                            <ExpandableRowContent>
                               <DescriptionList>
                                 <DescriptionListGroup>
                                   <DescriptionListTerm>
@@ -314,29 +315,14 @@ export const StakeholderGroups: React.FC = () => {
                                   )}
                                 </DescriptionListGroup>
                               </DescriptionList>
-                            ) : (
-                              <EmptyState variant="sm">
-                                <EmptyStateIcon icon={CubesIcon} />
-                                <Title headingLevel="h2" size="lg">
-                                  {t("composed.noDataStateTitle", {
-                                    what: t("terms.stakeholder").toLowerCase(),
-                                  })}
-                                </Title>
-                                <EmptyStateBody>
-                                  {t("composed.noDataStateBody", {
-                                    how: t("terms.add"),
-                                    what: t("terms.stakeholder").toLowerCase(),
-                                  })}
-                                </EmptyStateBody>
-                              </EmptyState>
-                            )}
-                          </ExpandableRowContent>
-                        </Td>
-                      </Tr>
-                    ) : null}
-                  </Tbody>
-                );
-              })}
+                            </ExpandableRowContent>
+                          </Td>
+                        </Tr>
+                      ) : null}
+                    </>
+                  );
+                })}
+              </Tbody>
             </ConditionalTableBody>
           </Table>
           <SimplePagination
diff --git a/client/src/app/pages/controls/stakeholders/stakeholders.tsx b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
index ef6bc4f171..b1948f93c1 100644
--- a/client/src/app/pages/controls/stakeholders/stakeholders.tsx
+++ b/client/src/app/pages/controls/stakeholders/stakeholders.tsx
@@ -234,10 +234,14 @@ export const Stakeholders: React.FC = () => {
             <Thead>
               <Tr>
                 <TableHeaderContentWithControls {...tableControls}>
-                  <Th {...getThProps({ columnKey: "email" })} />
-                  <Th {...getThProps({ columnKey: "name" })} />
-                  <Th {...getThProps({ columnKey: "jobFunction" })} />
-                  <Th {...getThProps({ columnKey: "groupCount" })} />
+                  <Th {...getThProps({ columnKey: "email" })} width={30} />
+                  <Th {...getThProps({ columnKey: "name" })} width={20} />
+                  <Th
+                    {...getThProps({ columnKey: "jobFunction" })}
+                    width={20}
+                  />
+                  <Th {...getThProps({ columnKey: "groupCount" })} width={20} />
+                  <Th width={10} />
                 </TableHeaderContentWithControls>
               </Tr>
             </Thead>
@@ -263,56 +267,55 @@ export const Stakeholders: React.FC = () => {
               }
               numRenderedColumns={numRenderedColumns}
             >
-              {currentPageItems?.map((stakeholder, rowIndex) => {
-                const hasGroups = stakeholder.stakeholderGroups?.length;
-                return (
-                  <Tbody
-                    key={stakeholder.id}
-                    isExpanded={isCellExpanded(stakeholder)}
-                  >
-                    <Tr {...getTrProps({ item: stakeholder })}>
-                      <TableRowContentWithControls
-                        {...tableControls}
-                        item={stakeholder}
-                        rowIndex={rowIndex}
-                      >
-                        <Td width={25} {...getTdProps({ columnKey: "email" })}>
-                          {stakeholder.email}
-                        </Td>
-                        <Td width={10} {...getTdProps({ columnKey: "name" })}>
-                          {stakeholder.name}
-                        </Td>
-                        <Td
-                          width={10}
-                          {...getTdProps({ columnKey: "jobFunction" })}
-                        >
-                          {stakeholder.jobFunction?.name}
-                        </Td>
-                        <Td
-                          width={10}
-                          {...getTdProps({ columnKey: "groupCount" })}
+              <Tbody key={currentPageItems.length}>
+                {currentPageItems?.map((stakeholder, rowIndex) => {
+                  return (
+                    <>
+                      <Tr {...getTrProps({ item: stakeholder })}>
+                        <TableRowContentWithControls
+                          {...tableControls}
+                          item={stakeholder}
+                          rowIndex={rowIndex}
                         >
-                          {stakeholder.stakeholderGroups?.length}
-                        </Td>
-                        <Td width={20}>
+                          <Td
+                            width={30}
+                            {...getTdProps({ columnKey: "email" })}
+                          >
+                            {stakeholder.email}
+                          </Td>
+                          <Td width={20} {...getTdProps({ columnKey: "name" })}>
+                            {stakeholder.name}
+                          </Td>
+                          <Td
+                            width={20}
+                            {...getTdProps({ columnKey: "jobFunction" })}
+                          >
+                            {stakeholder.jobFunction?.name}
+                          </Td>
+                          <Td
+                            width={20}
+                            {...getTdProps({ columnKey: "groupCount" })}
+                          >
+                            {stakeholder.stakeholderGroups?.length}
+                          </Td>
                           <AppTableActionButtons
                             onEdit={() =>
                               setCreateUpdateModalState(stakeholder)
                             }
                             onDelete={() => deleteRow(stakeholder)}
                           />
-                        </Td>
-                      </TableRowContentWithControls>
-                    </Tr>
-                    {isCellExpanded(stakeholder) ? (
-                      <Tr isExpanded>
-                        <Td />
-                        <Td
-                          {...getExpandedContentTdProps({ item: stakeholder })}
-                          className={spacing.pyLg}
-                        >
-                          <ExpandableRowContent>
-                            {hasGroups ? (
+                        </TableRowContentWithControls>
+                      </Tr>
+                      {isCellExpanded(stakeholder) ? (
+                        <Tr isExpanded>
+                          <Td />
+                          <Td
+                            {...getExpandedContentTdProps({
+                              item: stakeholder,
+                            })}
+                            className={spacing.pyLg}
+                          >
+                            <ExpandableRowContent>
                               <DescriptionList>
                                 <DescriptionListGroup>
                                   <DescriptionListTerm>
@@ -327,33 +330,14 @@ export const Stakeholders: React.FC = () => {
                                   )}
                                 </DescriptionListGroup>
                               </DescriptionList>
-                            ) : (
-                              <EmptyState variant="sm">
-                                <EmptyStateIcon icon={CubesIcon} />
-                                <Title headingLevel="h2" size="lg">
-                                  {t("composed.noDataStateTitle", {
-                                    what: t(
-                                      "terms.stakeholderGroups"
-                                    ).toLowerCase(),
-                                  })}
-                                </Title>
-                                <EmptyStateBody>
-                                  {t("composed.noDataStateBody", {
-                                    how: t("terms.add"),
-                                    what: t(
-                                      "terms.stakeholderGroup"
-                                    ).toLowerCase(),
-                                  })}
-                                </EmptyStateBody>
-                              </EmptyState>
-                            )}
-                          </ExpandableRowContent>
-                        </Td>
-                      </Tr>
-                    ) : null}
-                  </Tbody>
-                );
-              })}
+                            </ExpandableRowContent>
+                          </Td>
+                        </Tr>
+                      ) : null}
+                    </>
+                  );
+                })}
+              </Tbody>
             </ConditionalTableBody>
           </Table>
           <SimplePagination
diff --git a/client/src/app/pages/controls/tags/tags.tsx b/client/src/app/pages/controls/tags/tags.tsx
index 66f791c507..c969ec21d0 100644
--- a/client/src/app/pages/controls/tags/tags.tsx
+++ b/client/src/app/pages/controls/tags/tags.tsx
@@ -319,10 +319,11 @@ export const Tags: React.FC = () => {
             <Thead>
               <Tr>
                 <TableHeaderContentWithControls {...tableControls}>
-                  <Th {...getThProps({ columnKey: "name" })} />
-                  <Th {...getThProps({ columnKey: "rank" })} />
-                  <Th {...getThProps({ columnKey: "color" })} />
-                  <Th {...getThProps({ columnKey: "tagCount" })} />
+                  <Th {...getThProps({ columnKey: "name" })} width={30} />
+                  <Th {...getThProps({ columnKey: "rank" })} width={20} />
+                  <Th {...getThProps({ columnKey: "color" })} width={20} />
+                  <Th {...getThProps({ columnKey: "tagCount" })} width={20} />
+                  <Th width={10} />
                 </TableHeaderContentWithControls>
               </Tr>
             </Thead>
@@ -380,20 +381,18 @@ export const Tags: React.FC = () => {
                         >
                           {tagCategory.tags?.length || 0}
                         </Td>
-                        <Td width={20}>
-                          <AppTableActionButtons
-                            isDeleteEnabled={!!tagCategory.tags?.length}
-                            tooltipMessage={t(
-                              "message.cannotDeleteNonEmptyTagCategory"
-                            )}
-                            onEdit={() => setTagCategoryModalState(tagCategory)}
-                            onDelete={() => setTagCategoryToDelete(tagCategory)}
-                          />
-                        </Td>
+                        <AppTableActionButtons
+                          isDeleteEnabled={!!tagCategory.tags?.length}
+                          tooltipMessage={t(
+                            "message.cannotDeleteNonEmptyTagCategory"
+                          )}
+                          onEdit={() => setTagCategoryModalState(tagCategory)}
+                          onDelete={() => setTagCategoryToDelete(tagCategory)}
+                        />
                       </TableRowContentWithControls>
                     </Tr>
                     {isCellExpanded(tagCategory) && (
-                      <Tr>
+                      <Tr isExpanded>
                         <Td colSpan={numRenderedColumns}>
                           <ExpandableRowContent>
                             {hasTags ? (