diff --git a/locales/en/public.json b/locales/en/public.json
index f20e6fb3b..44c2e82d7 100644
--- a/locales/en/public.json
+++ b/locales/en/public.json
@@ -365,7 +365,7 @@
     "DATETIME": "Date and Time"
   },
   "Diagnostics": {
-    "THREAD_DUMPS_TAB_TITLE": "Thread Dumps"
+    "TARGET_THREAD_DUMPS_TAB_TITLE": "Targets"
   },
   "DiagnosticsCard": {
     "DIAGNOSTICS_ACTION_FAILURE": "Diagnostics Failure: {{kind}}",
@@ -374,6 +374,7 @@
     "DIAGNOSTICS_CARD_TITLE": "Diagnostics",
     "DIAGNOSTICS_GC_BUTTON": "Invoke Garbage Collection",
     "DIAGNOSTICS_THREAD_DUMP_BUTTON": "Invoke Thread Dump",
+    "DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP": "View captured Thread Dumps",
     "DIAGONSTICS_THREAD_REDIRECT_BUTTON": "View collected Thread Dumps",
     "KINDS": {
       "GC": "Garbage Collection",
diff --git a/src/app/AppLayout/AppLayout.tsx b/src/app/AppLayout/AppLayout.tsx
index ced7da5f8..77be03bfd 100644
--- a/src/app/AppLayout/AppLayout.tsx
+++ b/src/app/AppLayout/AppLayout.tsx
@@ -592,6 +592,8 @@ export const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
           .map((route, idx) => renderable(route, idx));
         if (!k) {
           items = renderables;
+        } else if (!renderables.length) {
+          items = [];
         } else {
           const anyActive = rs.some((r) => isActiveRoute(r));
           items = [
@@ -612,11 +614,13 @@ export const AppLayout: React.FC<AppLayoutProps> = ({ children }) => {
         aria-label={t('AppLayout.TOOLBAR.ARIA_LABELS.GLOBAL_NAVIGATION')}
       >
         <NavList>
-          {Array.from(groups.entries()).map(([groupTitle, items]) => (
-            <NavGroup title={t(groupTitle)} key={groupTitle}>
-              {items}
-            </NavGroup>
-          ))}
+          {Array.from(groups.entries())
+            .filter(([_, items]) => items.length)
+            .map(([groupTitle, items]) => (
+              <NavGroup title={t(groupTitle)} key={groupTitle}>
+                {items}
+              </NavGroup>
+            ))}
         </NavList>
       </Nav>
     );
diff --git a/src/app/Archives/Archives.tsx b/src/app/Archives/Archives.tsx
index a323b8ec7..1e54f2d20 100644
--- a/src/app/Archives/Archives.tsx
+++ b/src/app/Archives/Archives.tsx
@@ -172,7 +172,6 @@ export const Archives: React.FC<ArchivesProps> = ({ ...props }) => {
       <Card isCompact>
         <CardBody>{cardBody}</CardBody>
       </Card>
-      <></>
     </BreadcrumbPage>
   );
 };
diff --git a/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx b/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx
index 607d4e599..21f7c6326 100644
--- a/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx
+++ b/src/app/Dashboard/Diagnostics/DiagnosticsCard.tsx
@@ -21,6 +21,7 @@ import {
   DashboardCardDescriptor,
 } from '@app/Dashboard/types';
 import { CryostatLink } from '@app/Shared/Components/CryostatLink';
+import { FeatureFlag } from '@app/Shared/Components/FeatureFlag';
 import { NotificationCategory } from '@app/Shared/Services/api.types';
 import { NotificationsContext } from '@app/Shared/Services/Notifications.service';
 import { FeatureLevel } from '@app/Shared/Services/service.types';
@@ -41,6 +42,8 @@ import {
   EmptyStateFooter,
   ActionList,
   Tooltip,
+  Stack,
+  StackItem,
 } from '@patternfly/react-core';
 import { ListIcon, WrenchIcon } from '@patternfly/react-icons';
 import * as React from 'react';
@@ -141,36 +144,44 @@ export const DiagnosticsCard: DashboardCardFC<DiagnosticsCardProps> = (props) =>
               />
               <EmptyStateBody>{t('DiagnosticsCard.DIAGNOSTICS_CARD_DESCRIPTION')}</EmptyStateBody>
               <EmptyStateFooter>
-                <ActionList>
-                  <Button
-                    variant="primary"
-                    onClick={handleGC}
-                    spinnerAriaValueText="Invoke GC"
-                    spinnerAriaLabel="invoke-gc"
-                    isLoading={running}
-                  >
-                    {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
-                  </Button>
-                </ActionList>
-                <ActionList>
-                  <Button
-                    variant="primary"
-                    onClick={handleThreadDump}
-                    spinnerAriaValueText="Invoke Thread Dump"
-                    spinnerAriaLabel="invoke-thread-dump"
-                    isLoading={running}
-                  >
-                    {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
-                  </Button>
-                  <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
-                    <Button
-                      variant="primary"
-                      isAriaDisabled={!threadDumpReady}
-                      component={(props) => <CryostatLink {...props} to="/diagnostics" />}
-                      icon={<ListIcon />}
-                    />
-                  </Tooltip>
-                </ActionList>
+                <Stack hasGutter>
+                  <StackItem>
+                    <ActionList>
+                      <Button
+                        variant="primary"
+                        onClick={handleGC}
+                        spinnerAriaValueText="Invoke GC"
+                        spinnerAriaLabel="invoke-gc"
+                        isLoading={running}
+                      >
+                        {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
+                      </Button>
+                    </ActionList>
+                  </StackItem>
+                  <StackItem>
+                    <FeatureFlag level={FeatureLevel.BETA}>
+                      <ActionList>
+                        <Button
+                          variant="primary"
+                          onClick={handleThreadDump}
+                          spinnerAriaValueText="Invoke Thread Dump"
+                          spinnerAriaLabel="invoke-thread-dump"
+                          isLoading={running}
+                        >
+                          {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
+                        </Button>
+                        <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
+                          <Button
+                            variant="primary"
+                            isAriaDisabled={!threadDumpReady}
+                            component={(props) => <CryostatLink {...props} to="/thread-dumps" />}
+                            icon={<ListIcon />}
+                          />
+                        </Tooltip>
+                      </ActionList>
+                    </FeatureFlag>
+                  </StackItem>
+                </Stack>
               </EmptyStateFooter>
             </EmptyState>
           </Bullseye>
diff --git a/src/app/Diagnostics/AnalyzeThreadDumps.tsx b/src/app/Diagnostics/AnalyzeThreadDumps.tsx
new file mode 100644
index 000000000..b44c511b2
--- /dev/null
+++ b/src/app/Diagnostics/AnalyzeThreadDumps.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright The Cryostat Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { BreadcrumbPage } from '@app/BreadcrumbPage/BreadcrumbPage';
+import { NullableTarget } from '@app/Shared/Services/api.types';
+import { ServiceContext } from '@app/Shared/Services/Services';
+import { NoTargetSelected } from '@app/TargetView/NoTargetSelected';
+import { TargetContextSelector } from '@app/TargetView/TargetContextSelector';
+import { useSubscriptions } from '@app/utils/hooks/useSubscriptions';
+import { getActiveTab, switchTab } from '@app/utils/utils';
+import { Card, CardBody, Stack, StackItem, Tab, Tabs, TabTitleText } from '@patternfly/react-core';
+import { t } from 'i18next';
+import * as React from 'react';
+import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
+import { ThreadDumpsTable } from './ThreadDumpsTable';
+
+export interface AnalyzeThreadDumpsProps {}
+
+enum AnalyzeThreadDumpsTab {
+  THREAD_DUMPS = 'target-thread-dumps',
+}
+
+export const AnalyzeThreadDumps: React.FC<AnalyzeThreadDumpsProps> = ({ ...props }) => {
+  const { search, pathname } = useLocation();
+  const navigate = useNavigate();
+  const context = React.useContext(ServiceContext);
+  const addSubscription = useSubscriptions();
+
+  const [target, setTarget] = React.useState(undefined as NullableTarget);
+
+  React.useEffect(() => {
+    addSubscription(context.target.target().subscribe((t) => setTarget(t)));
+  }, [addSubscription, context.target, setTarget]);
+
+  const activeTab = React.useMemo(() => {
+    return getActiveTab(search, 'tab', Object.values(AnalyzeThreadDumpsTab), AnalyzeThreadDumpsTab.THREAD_DUMPS);
+  }, [search]);
+
+  const onTabSelect = React.useCallback(
+    (_: React.MouseEvent, key: string | number) =>
+      switchTab(navigate, pathname, search, { tabKey: 'tab', tabValue: `${key}` }),
+    [navigate, pathname, search],
+  );
+
+  const cardBody = React.useMemo(
+    () => (
+      <Tabs id="threadDumps" activeKey={activeTab} onSelect={onTabSelect} unmountOnExit>
+        <Tab
+          id="threadDumps"
+          eventKey={AnalyzeThreadDumpsTab.THREAD_DUMPS}
+          title={<TabTitleText>{t('Diagnostics.TARGET_THREAD_DUMPS_TAB_TITLE')}</TabTitleText>}
+          data-quickstart-id="thread-dumps-tab"
+        >
+          <Stack hasGutter>
+            <StackItem>
+              <TargetContextSelector />
+            </StackItem>
+            <StackItem>
+              {target ? (
+                <ThreadDumpsTable />
+              ) : (
+                // FIXME this should be an "AllTargetsThreadDumpsTable" like the AllTargetsArchivedRecordingsTable
+                <NoTargetSelected />
+              )}
+            </StackItem>
+          </Stack>
+        </Tab>
+      </Tabs>
+    ),
+    [activeTab, onTabSelect, target],
+  );
+
+  return (
+    <BreadcrumbPage {...props} pageTitle="Thread Dumps">
+      <Card isFullHeight>
+        <CardBody isFilled>{cardBody}</CardBody>
+      </Card>
+    </BreadcrumbPage>
+  );
+};
+
+export default AnalyzeThreadDumps;
diff --git a/src/app/Diagnostics/CaptureDiagnostics.tsx b/src/app/Diagnostics/CaptureDiagnostics.tsx
new file mode 100644
index 000000000..9edf82a6e
--- /dev/null
+++ b/src/app/Diagnostics/CaptureDiagnostics.tsx
@@ -0,0 +1,169 @@
+/*
+ * Copyright The Cryostat Authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { MBeanMetricsChartCard } from '@app/Dashboard/Charts/mbean/MBeanMetricsChartCard';
+import { CryostatLink } from '@app/Shared/Components/CryostatLink';
+import { NotificationCategory } from '@app/Shared/Services/api.types';
+import { NotificationsContext } from '@app/Shared/Services/Notifications.service';
+import { ServiceContext } from '@app/Shared/Services/Services';
+import { TargetView } from '@app/TargetView/TargetView';
+import { useSubscriptions } from '@app/utils/hooks/useSubscriptions';
+import { useCryostatTranslation } from '@i18n/i18nextUtil';
+import {
+  ActionList,
+  Bullseye,
+  Button,
+  Card,
+  CardBody,
+  Grid,
+  GridItem,
+  Stack,
+  StackItem,
+  Tooltip,
+} from '@patternfly/react-core';
+import { ListIcon } from '@patternfly/react-icons';
+import * as React from 'react';
+import { concatMap, filter, first } from 'rxjs';
+
+export interface CaptureDiagnosticsProps {}
+
+export const CaptureDiagnostics: React.FC<CaptureDiagnosticsProps> = ({ ...props }) => {
+  const { t } = useCryostatTranslation();
+  const serviceContext = React.useContext(ServiceContext);
+  const notifications = React.useContext(NotificationsContext);
+  const addSubscription = useSubscriptions();
+  const [running, setRunning] = React.useState(false);
+  const [threadDumpReady, setThreadDumpReady] = React.useState(false);
+
+  const handleError = React.useCallback(
+    (kind, error) => {
+      // TODO this message key should not be specific to the Card view
+      notifications.danger(t('DiagnosticsCard.DIAGNOSTICS_ACTION_FAILURE', { kind }), error?.message || error);
+    },
+    [notifications, t],
+  );
+
+  React.useEffect(() => {
+    addSubscription(
+      serviceContext.target
+        .target()
+        .pipe(
+          filter((target) => !!target),
+          first(),
+          concatMap(() => serviceContext.api.getThreadDumps()),
+        )
+        .subscribe({
+          next: (dumps) => (dumps.length > 0 ? setThreadDumpReady(true) : setThreadDumpReady(false)),
+          error: () => setThreadDumpReady(false),
+        }),
+    );
+  }, [addSubscription, serviceContext.api, serviceContext.target, setThreadDumpReady]);
+
+  React.useEffect(() => {
+    addSubscription(
+      serviceContext.notificationChannel.messages(NotificationCategory.ThreadDumpSuccess).subscribe(() => {
+        setThreadDumpReady(true);
+      }),
+    );
+  }, [addSubscription, serviceContext.notificationChannel, setThreadDumpReady]);
+
+  const handleGC = React.useCallback(() => {
+    setRunning(true);
+    addSubscription(
+      serviceContext.api.runGC(true).subscribe({
+        error: (err) => handleError(t('DiagnosticsCard.KINDS.GC'), err),
+        complete: () => setRunning(false),
+      }),
+    );
+  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+
+  const handleThreadDump = React.useCallback(() => {
+    setRunning(true);
+    addSubscription(
+      serviceContext.api.runThreadDump(true).subscribe({
+        error: (err) => handleError(t('DiagnosticsCard.KINDS.THREADS'), err),
+        complete: () => {
+          setRunning(false);
+          setThreadDumpReady(true);
+        },
+      }),
+    );
+  }, [addSubscription, serviceContext.api, handleError, setRunning, t]);
+
+  return (
+    <TargetView {...props} pageTitle="Diagnostics">
+      <Grid hasGutter>
+        <GridItem span={3}>
+          <Card isCompact>
+            <CardBody>
+              <Bullseye>
+                <Stack hasGutter>
+                  <StackItem>
+                    <ActionList>
+                      <Button
+                        variant="primary"
+                        onClick={handleGC}
+                        spinnerAriaValueText="Invoke GC"
+                        spinnerAriaLabel="invoke-gc"
+                        isLoading={running}
+                      >
+                        {t('DiagnosticsCard.DIAGNOSTICS_GC_BUTTON')}
+                      </Button>
+                    </ActionList>
+                  </StackItem>
+                  <StackItem>
+                    <ActionList>
+                      <Button
+                        variant="primary"
+                        onClick={handleThreadDump}
+                        spinnerAriaValueText="Invoke Thread Dump"
+                        spinnerAriaLabel="invoke-thread-dump"
+                        isLoading={running}
+                      >
+                        {t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_BUTTON')}
+                      </Button>
+                      <Tooltip content={t('DiagnosticsCard.DIAGNOSTICS_THREAD_DUMP_TABLE_TOOLTIP')}>
+                        <Button
+                          variant="primary"
+                          isAriaDisabled={!threadDumpReady}
+                          component={(props) => <CryostatLink {...props} to="/thread-dumps" />}
+                          icon={<ListIcon />}
+                        />
+                      </Tooltip>
+                    </ActionList>
+                  </StackItem>
+                </Stack>
+              </Bullseye>
+            </CardBody>
+          </Card>
+        </GridItem>
+        <GridItem span={9}>
+          <MBeanMetricsChartCard
+            span={9}
+            chartKind="Heap Memory Usage"
+            themeColor="blue"
+            duration={300}
+            period={10}
+            dashboardId={0}
+            isDraggable={false}
+            isResizable={false}
+          />
+        </GridItem>
+      </Grid>
+    </TargetView>
+  );
+};
+
+export default CaptureDiagnostics;
diff --git a/src/app/Diagnostics/Diagnostics.tsx b/src/app/Diagnostics/Diagnostics.tsx
deleted file mode 100644
index 7aaf3e374..000000000
--- a/src/app/Diagnostics/Diagnostics.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright The Cryostat Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { TargetView } from '@app/TargetView/TargetView';
-import { getActiveTab, switchTab } from '@app/utils/utils';
-import { Card, CardBody, Tab, Tabs, TabTitleText } from '@patternfly/react-core';
-import { t } from 'i18next';
-import * as React from 'react';
-import { useLocation, useNavigate } from 'react-router-dom-v5-compat';
-import { ThreadDumpsTable } from './ThreadDumpsTable';
-
-enum DiagnosticsTab {
-  THREAD_DUMPS = 'thread-dumps',
-}
-
-export interface DiagnosticsProps {}
-
-export const Diagnostics: React.FC<DiagnosticsProps> = ({ ...props }) => {
-  const { search, pathname } = useLocation();
-  const navigate = useNavigate();
-
-  const activeTab = React.useMemo(() => {
-    return getActiveTab(search, 'tab', Object.values(DiagnosticsTab), DiagnosticsTab.THREAD_DUMPS);
-  }, [search]);
-
-  const onTabSelect = React.useCallback(
-    (_: React.MouseEvent, key: string | number) =>
-      switchTab(navigate, pathname, search, { tabKey: 'tab', tabValue: `${key}` }),
-    [navigate, pathname, search],
-  );
-
-  const cardBody = React.useMemo(
-    () => (
-      <Tabs id="threadDumps" activeKey={activeTab} onSelect={onTabSelect} unmountOnExit>
-        <Tab
-          id="threadDumps"
-          eventKey={DiagnosticsTab.THREAD_DUMPS}
-          title={<TabTitleText>{t('Diagnostics.THREAD_DUMPS_TAB_TITLE')}</TabTitleText>}
-          data-quickstart-id="thread-dumps-tab"
-        >
-          <ThreadDumpsTable />
-        </Tab>
-      </Tabs>
-    ),
-    [activeTab, onTabSelect],
-  );
-
-  return (
-    <TargetView {...props} pageTitle="Diagnostics">
-      <Card isFullHeight>
-        <CardBody isFilled>{cardBody}</CardBody>
-      </Card>
-    </TargetView>
-  );
-};
-
-export default Diagnostics;
diff --git a/src/app/Diagnostics/ThreadDumpsTable.tsx b/src/app/Diagnostics/ThreadDumpsTable.tsx
index 305c69995..dd065b944 100644
--- a/src/app/Diagnostics/ThreadDumpsTable.tsx
+++ b/src/app/Diagnostics/ThreadDumpsTable.tsx
@@ -22,10 +22,9 @@ import { NotificationsContext } from '@app/Shared/Services/Notifications.service
 import { ServiceContext } from '@app/Shared/Services/Services';
 import useDayjs from '@app/utils/hooks/useDayjs';
 import { useSubscriptions } from '@app/utils/hooks/useSubscriptions';
-import { TableColumn, sortResources } from '@app/utils/utils';
+import { TableColumn, formatBytes, sortResources } from '@app/utils/utils';
 import { useCryostatTranslation } from '@i18n/i18nextUtil';
 import {
-  Button,
   EmptyState,
   EmptyStateIcon,
   Stack,
@@ -41,11 +40,11 @@ import {
   MenuToggleElement,
   MenuToggle,
   SearchInput,
-  Tooltip,
   Timestamp,
   TimestampTooltipVariant,
+  Divider,
 } from '@patternfly/react-core';
-import { SearchIcon, EllipsisVIcon, UploadIcon } from '@patternfly/react-icons';
+import { SearchIcon, EllipsisVIcon } from '@patternfly/react-icons';
 import {
   ISortBy,
   SortByDirection,
@@ -60,7 +59,6 @@ import {
 } from '@patternfly/react-table';
 import _ from 'lodash';
 import * as React from 'react';
-import { first } from 'rxjs/operators';
 
 const tableColumns: TableColumn[] = [
   {
@@ -73,6 +71,11 @@ const tableColumns: TableColumn[] = [
     keyPaths: ['lastModified'],
     sortable: true,
   },
+  {
+    title: 'Size',
+    keyPaths: ['size'],
+    sortable: true,
+  },
 ];
 
 export interface ThreadDumpsProps {}
@@ -160,26 +163,6 @@ export const ThreadDumpsTable: React.FC<ThreadDumpsProps> = ({}) => {
     setWarningModalOpen(false);
   }, [setWarningModalOpen]);
 
-  const handleThreadDump = React.useCallback(() => {
-    addSubscription(
-      context.api
-        .runThreadDump(true)
-        .pipe(first())
-        .subscribe({
-          next: (jobId) => {
-            addSubscription(
-              context.notificationChannel.messages(NotificationCategory.ThreadDumpSuccess).subscribe((notification) => {
-                if (jobId == notification.message.jobId) {
-                  refreshThreadDumps();
-                }
-              }),
-            );
-          },
-          error: () => refreshThreadDumps(),
-        }),
-    );
-  }, [addSubscription, context.api, context.notificationChannel, refreshThreadDumps]);
-
   const handleFilterTextChange = React.useCallback((_, value: string) => setFilterText(value), [setFilterText]);
 
   React.useEffect(() => {
@@ -277,6 +260,9 @@ export const ThreadDumpsTable: React.FC<ThreadDumpsProps> = ({}) => {
                 {dayjs(t.lastModified).tz(datetimeContext.timeZone.full).format('L LTS z')}
               </Timestamp>
             </Td>
+            <Td key={`thread-dump-size-${index}`} dataLabel={tableColumns[2].title}>
+              {formatBytes(t.size ?? 0)}
+            </Td>
             <Td key={`thread-dump-action-${index}`} isActionCell style={{ paddingRight: '0' }}>
               <ThreadDumpAction threadDump={t} onDelete={handleDeleteAction} onDownload={handleDownloadThreadDump} />
             </Td>
@@ -292,68 +278,51 @@ export const ThreadDumpsTable: React.FC<ThreadDumpsProps> = ({}) => {
     return <LoadingView />;
   } else {
     return (
-      <>
-        <Stack hasGutter style={{ marginTop: '1em' }}>
-          <StackItem>
-            <Toolbar id="thead-dumps-toolbar">
-              <ToolbarContent>
-                <ToolbarGroup variant="filter-group">
-                  <ToolbarItem>
-                    <SearchInput
-                      style={{ minWidth: '30ch' }}
-                      name="threadDumpsFilter"
-                      id="threadDumpsFilter"
-                      type="search"
-                      placeholder={t('ThreadDumps.SEARCH_PLACEHOLDER')}
-                      aria-label={t('ThreadDumps.ARIA_LABELS.SEARCH_INPUT')}
-                      onChange={handleFilterTextChange}
-                      value={filterText}
-                    />
-                  </ToolbarItem>
-                </ToolbarGroup>
-                <ToolbarItem variant="separator" />
-                <ToolbarGroup variant="icon-button-group">
-                  <ToolbarItem>
-                    <Button
-                      key="dump-threads"
-                      name="Dump Threads"
-                      variant="secondary"
-                      aria-label="dump-threads"
-                      onClick={handleThreadDump}
-                    >
-                      <Tooltip content="Start Thread Dump" />
-                      <UploadIcon />
-                    </Button>
-                  </ToolbarItem>
-                </ToolbarGroup>
-                {deleteThreadDumpModal}
-              </ToolbarContent>
-            </Toolbar>
-            {threadDumpRows.length ? (
-              <Table aria-label="Thread Dumps table" variant={TableVariant.compact}>
-                <Thead>
-                  <Tr>
-                    {tableColumns.map(({ title, sortable }, index) => (
-                      <Th key={`thread-dump-header-${title}`} sort={sortable ? getSortParams(index) : undefined}>
-                        {title}
-                      </Th>
-                    ))}
-                  </Tr>
-                </Thead>
-                <Tbody>{threadDumpRows}</Tbody>
-              </Table>
-            ) : (
-              <EmptyState>
-                <EmptyStateHeader
-                  titleText="No Thread Dumps"
-                  icon={<EmptyStateIcon icon={SearchIcon} />}
-                  headingLevel="h4"
-                />
-              </EmptyState>
-            )}
-          </StackItem>
-        </Stack>
-      </>
+      <Stack hasGutter style={{ marginTop: '1em' }}>
+        <StackItem>
+          <Toolbar id="thead-dumps-toolbar">
+            <ToolbarContent>
+              <ToolbarGroup variant="filter-group">
+                <ToolbarItem>
+                  <SearchInput
+                    style={{ minWidth: '30ch' }}
+                    name="threadDumpsFilter"
+                    id="threadDumpsFilter"
+                    type="search"
+                    placeholder={t('ThreadDumps.SEARCH_PLACEHOLDER')}
+                    aria-label={t('ThreadDumps.ARIA_LABELS.SEARCH_INPUT')}
+                    onChange={handleFilterTextChange}
+                    value={filterText}
+                  />
+                </ToolbarItem>
+              </ToolbarGroup>
+              {deleteThreadDumpModal}
+            </ToolbarContent>
+          </Toolbar>
+          {threadDumpRows.length ? (
+            <Table aria-label="Thread Dumps table" variant={TableVariant.compact}>
+              <Thead>
+                <Tr>
+                  {tableColumns.map(({ title, sortable }, index) => (
+                    <Th key={`thread-dump-header-${title}`} sort={sortable ? getSortParams(index) : undefined}>
+                      {title}
+                    </Th>
+                  ))}
+                </Tr>
+              </Thead>
+              <Tbody>{threadDumpRows}</Tbody>
+            </Table>
+          ) : (
+            <EmptyState>
+              <EmptyStateHeader
+                titleText="No Thread Dumps"
+                icon={<EmptyStateIcon icon={SearchIcon} />}
+                headingLevel="h4"
+              />
+            </EmptyState>
+          )}
+        </StackItem>
+      </Stack>
     );
   }
 };
@@ -371,7 +340,7 @@ export const ThreadDumpAction: React.FC<ThreadDumpActionProps> = ({ threadDump,
   const actionItems = React.useMemo(() => {
     return [
       {
-        title: 'Download Thread Dump',
+        title: 'Download',
         key: 'download-threaddump',
         onClick: () => onDownload(threadDump),
       },
@@ -391,19 +360,23 @@ export const ThreadDumpAction: React.FC<ThreadDumpActionProps> = ({ threadDump,
 
   const dropdownItems = React.useMemo(
     () =>
-      actionItems.map((action) => (
-        <DropdownItem
-          aria-label={action.key}
-          key={action.key}
-          onClick={() => {
-            setIsOpen(false);
-            action.onClick && action.onClick();
-          }}
-          isDanger={action.isDanger}
-        >
-          {action.title}
-        </DropdownItem>
-      )),
+      actionItems.map((action, idx) =>
+        action.isSeparator ? (
+          <Divider key={`separator-${idx}`} />
+        ) : (
+          <DropdownItem
+            aria-label={action.key}
+            key={action.key}
+            onClick={() => {
+              setIsOpen(false);
+              action.onClick && action.onClick();
+            }}
+            isDanger={action.isDanger}
+          >
+            {action.title}
+          </DropdownItem>
+        ),
+      ),
     [actionItems, setIsOpen],
   );
 
diff --git a/src/app/JMCAgent/AboutAgentCard.tsx b/src/app/JMCAgent/AboutAgentCard.tsx
deleted file mode 100644
index afa67237a..000000000
--- a/src/app/JMCAgent/AboutAgentCard.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright The Cryostat Authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { Card, CardBody, CardTitle } from '@patternfly/react-core';
-import * as React from 'react';
-
-export interface AboutAgentCardProps {}
-
-export const AboutAgentCard: React.FC<AboutAgentCardProps> = (_) => {
-  return (
-    <Card>
-      <CardTitle>About the JMC Agent</CardTitle>
-      <CardBody>
-        The JMC Agent allows users to dynamically inject custom JFR events into running JVMs. In order to make use of
-        the JMC Agent, the agent jar must be present in the same container as the target, and the target must be started
-        with the agent (-javaagent:/path/to/agent.jar). Once these pre-requisites are met, the user can upload Probe
-        Templates to Cryostat and insert them to the target, as well as view or remove currently active probes.
-      </CardBody>
-    </Card>
-  );
-};
diff --git a/src/app/JMCAgent/AgentLiveProbes.tsx b/src/app/JMCAgent/AgentLiveProbes.tsx
index 16f4537de..6105ca630 100644
--- a/src/app/JMCAgent/AgentLiveProbes.tsx
+++ b/src/app/JMCAgent/AgentLiveProbes.tsx
@@ -30,8 +30,6 @@ import {
   ToolbarContent,
   ToolbarGroup,
   ToolbarItem,
-  Stack,
-  StackItem,
   EmptyState,
   EmptyStateIcon,
   EmptyStateHeader,
@@ -53,7 +51,6 @@ import {
 import _ from 'lodash';
 import * as React from 'react';
 import { combineLatest } from 'rxjs';
-import { AboutAgentCard } from './AboutAgentCard';
 
 export type LiveProbeActions = 'REMOVE';
 
@@ -319,72 +316,65 @@ export const AgentLiveProbes: React.FC<AgentLiveProbesProps> = () => {
   } else {
     return (
       <>
-        <Stack hasGutter style={{ marginTop: '1em' }}>
-          <StackItem>
-            <AboutAgentCard />
-          </StackItem>
-          <StackItem>
-            <Toolbar id="active-probes-toolbar">
-              <ToolbarContent>
-                <ToolbarGroup variant="filter-group">
-                  <ToolbarItem>
-                    <SearchInput
-                      style={{ minWidth: '36ch' }}
-                      name="activeProbeFilter"
-                      id="activeProbeFilter"
-                      type="search"
-                      placeholder={t('AgentLiveProbes.SEARCH_PLACEHOLDER')}
-                      aria-label={t('AgentLiveProves.ARIA_LABELS.SEARCH_INPUT')}
-                      onChange={handleFilterTextChange}
-                    />
-                  </ToolbarItem>
-                </ToolbarGroup>
-                <ToolbarItem variant="separator" />
-                <ToolbarGroup variant="icon-button-group">
-                  <ToolbarItem>
-                    <Button
-                      key="delete"
-                      variant="danger"
-                      onClick={handleDeleteButton}
-                      isDisabled={!filteredProbes.length || actionLoadings['REMOVE']}
-                      {...actionLoadingProps['REMOVE']}
-                    >
-                      {actionLoadings['REMOVE'] ? 'Removing' : 'Remove'} all probes
-                    </Button>
-                  </ToolbarItem>
-                </ToolbarGroup>
-              </ToolbarContent>
-              <DeleteWarningModal
-                warningType={DeleteOrDisableWarningType.DeleteActiveProbes}
-                visible={warningModalOpen}
-                onAccept={handleWarningModalAccept}
-                onClose={handleWarningModalClose}
-              />
-            </Toolbar>
-            {probeRows.length ? (
-              <Table aria-label="Active probe table" variant={TableVariant.compact}>
-                <Thead>
-                  <Tr>
-                    {tableColumns.map(({ title, sortable }, index) => (
-                      <Th key={`active-probe-header-${title}`} sort={sortable ? getSortParams(index) : undefined}>
-                        {title}
-                      </Th>
-                    ))}
-                  </Tr>
-                </Thead>
-                <Tbody>{probeRows}</Tbody>
-              </Table>
-            ) : (
-              <EmptyState>
-                <EmptyStateHeader
-                  titleText="No active probes"
-                  icon={<EmptyStateIcon icon={SearchIcon} />}
-                  headingLevel="h4"
+        <Toolbar id="active-probes-toolbar">
+          <ToolbarContent>
+            <ToolbarGroup variant="filter-group">
+              <ToolbarItem>
+                <SearchInput
+                  style={{ minWidth: '36ch' }}
+                  name="activeProbeFilter"
+                  id="activeProbeFilter"
+                  type="search"
+                  placeholder={t('AgentLiveProbes.SEARCH_PLACEHOLDER')}
+                  aria-label={t('AgentLiveProves.ARIA_LABELS.SEARCH_INPUT')}
+                  onChange={handleFilterTextChange}
                 />
-              </EmptyState>
-            )}
-          </StackItem>
-        </Stack>
+              </ToolbarItem>
+            </ToolbarGroup>
+            <ToolbarItem variant="separator" />
+            <ToolbarGroup variant="icon-button-group">
+              <ToolbarItem>
+                <Button
+                  key="delete"
+                  variant="danger"
+                  onClick={handleDeleteButton}
+                  isDisabled={!filteredProbes.length || actionLoadings['REMOVE']}
+                  {...actionLoadingProps['REMOVE']}
+                >
+                  {actionLoadings['REMOVE'] ? 'Removing' : 'Remove'} all probes
+                </Button>
+              </ToolbarItem>
+            </ToolbarGroup>
+          </ToolbarContent>
+          <DeleteWarningModal
+            warningType={DeleteOrDisableWarningType.DeleteActiveProbes}
+            visible={warningModalOpen}
+            onAccept={handleWarningModalAccept}
+            onClose={handleWarningModalClose}
+          />
+        </Toolbar>
+        {probeRows.length ? (
+          <Table aria-label="Active probe table" variant={TableVariant.compact}>
+            <Thead>
+              <Tr>
+                {tableColumns.map(({ title, sortable }, index) => (
+                  <Th key={`active-probe-header-${title}`} sort={sortable ? getSortParams(index) : undefined}>
+                    {title}
+                  </Th>
+                ))}
+              </Tr>
+            </Thead>
+            <Tbody>{probeRows}</Tbody>
+          </Table>
+        ) : (
+          <EmptyState>
+            <EmptyStateHeader
+              titleText="No active probes"
+              icon={<EmptyStateIcon icon={SearchIcon} />}
+              headingLevel="h4"
+            />
+          </EmptyState>
+        )}
       </>
     );
   }
diff --git a/src/app/JMCAgent/AgentProbeTemplates.tsx b/src/app/JMCAgent/AgentProbeTemplates.tsx
index c3d1681ff..29f6194b7 100644
--- a/src/app/JMCAgent/AgentProbeTemplates.tsx
+++ b/src/app/JMCAgent/AgentProbeTemplates.tsx
@@ -35,6 +35,8 @@ import {
   ModalVariant,
   Stack,
   StackItem,
+  Text,
+  TextVariants,
   Toolbar,
   ToolbarContent,
   ToolbarGroup,
@@ -47,6 +49,7 @@ import {
   MenuToggle,
   SearchInput,
   Divider,
+  TextContent,
 } from '@patternfly/react-core';
 import { SearchIcon, EllipsisVIcon, UploadIcon } from '@patternfly/react-icons';
 import {
@@ -65,7 +68,6 @@ import _ from 'lodash';
 import * as React from 'react';
 import { forkJoin, Observable, of } from 'rxjs';
 import { catchError, defaultIfEmpty, first, tap } from 'rxjs/operators';
-import { AboutAgentCard } from './AboutAgentCard';
 
 const tableColumns: TableColumn[] = [
   {
@@ -294,7 +296,16 @@ export const AgentProbeTemplates: React.FC<AgentProbeTemplatesProps> = ({ agentD
       <>
         <Stack hasGutter style={{ marginTop: '1em' }}>
           <StackItem>
-            <AboutAgentCard />
+            <TextContent>
+              <Text component={TextVariants.h5}>About the JMC Agent</Text>
+              <Text component={TextVariants.small}>
+                The JMC Agent allows users to dynamically inject custom JFR events into running JVMs. In order to make
+                use of the JMC Agent, the agent jar must be present in the same container as the target, and the target
+                must be started with the agent (-javaagent:/path/to/agent.jar). Once these pre-requisites are met, the
+                user can upload Probe Templates to Cryostat and insert them to the target, as well as view or remove
+                currently active probes.
+              </Text>
+            </TextContent>
           </StackItem>
           <StackItem>
             <Toolbar id="probe-templates-toolbar">
diff --git a/src/app/Shared/Services/api.types.ts b/src/app/Shared/Services/api.types.ts
index 34338176b..3941e8e9a 100644
--- a/src/app/Shared/Services/api.types.ts
+++ b/src/app/Shared/Services/api.types.ts
@@ -246,6 +246,7 @@ export interface ThreadDump {
   uuid: string;
   jvmId?: string;
   lastModified?: number;
+  size?: number;
 }
 
 export interface ArchivedRecording extends Recording {
diff --git a/src/app/routes.tsx b/src/app/routes.tsx
index 474408d6c..0740cf24e 100644
--- a/src/app/routes.tsx
+++ b/src/app/routes.tsx
@@ -21,7 +21,8 @@ import Archives from './Archives/Archives';
 import CreateRecording from './CreateRecording/CreateRecording';
 import Dashboard from './Dashboard/Dashboard';
 import DashboardSolo from './Dashboard/DashboardSolo';
-import Diagnostics from './Diagnostics/Diagnostics';
+import AnalyzeThreadDumps from './Diagnostics/AnalyzeThreadDumps';
+import CaptureDiagnostics from './Diagnostics/CaptureDiagnostics';
 import Events from './Events/Events';
 import JMCAgent from './JMCAgent/JMCAgent';
 import NotFound from './NotFound/NotFound';
@@ -170,13 +171,23 @@ const flightRecorderRoutes: IAppRoute[] = [
 
 const diagnosticsRoutes: IAppRoute[] = [
   {
-    component: Diagnostics,
-    label: 'Thread Dumps',
+    component: CaptureDiagnostics,
+    label: 'Capture',
     path: toPath('/diagnostics'),
+    title: 'Capture',
+    description: 'Perform garbage collection and create thread dumps on single target JVMs.',
+    navGroup: DIAGNOSTICS,
+    featureLevel: FeatureLevel.BETA,
+  },
+  {
+    component: AnalyzeThreadDumps,
+    label: 'Thread Dumps',
+    path: toPath('/thread-dumps'),
     title: 'Thread Dumps',
-    description: 'Create and view thread dumps on single target JVMs.',
+    description: 'View thread dumps on single target JVMs.',
     navGroup: DIAGNOSTICS,
     navSubgroup: ANALYZE,
+    featureLevel: FeatureLevel.BETA,
   },
 ];
 
diff --git a/src/test/Archives/__snapshots__/Archives.test.tsx.snap b/src/test/Archives/__snapshots__/Archives.test.tsx.snap
index 140486ab4..72becfe71 100644
--- a/src/test/Archives/__snapshots__/Archives.test.tsx.snap
+++ b/src/test/Archives/__snapshots__/Archives.test.tsx.snap
@@ -159,9 +159,6 @@ exports[`<Archives /> renders correctly 1`] = `
           </div>
         </div>
       </div>
-      <div
-        className="pf-v5-l-stack__item"
-      />
     </div>
   </section>
 </div>
diff --git a/src/test/Diagnostics/Diagnostics.test.tsx b/src/test/Diagnostics/ThreadDumpsTable.test.tsx
similarity index 89%
rename from src/test/Diagnostics/Diagnostics.test.tsx
rename to src/test/Diagnostics/ThreadDumpsTable.test.tsx
index ad611ac92..ca0158c2c 100644
--- a/src/test/Diagnostics/Diagnostics.test.tsx
+++ b/src/test/Diagnostics/ThreadDumpsTable.test.tsx
@@ -70,8 +70,6 @@ jest
   .mockReturnValueOnce(of(mockThreadDumpNotification))
   .mockReturnValue(of());
 
-const dumpThreadsSpy = jest.spyOn(defaultServices.api, 'runThreadDump').mockReturnValue(of('someJobId'));
-
 describe('<ThreadDumpsTable />', () => {
   afterEach(cleanup);
 
@@ -95,21 +93,6 @@ describe('<ThreadDumpsTable />', () => {
     expect(xmlHeader).toBeVisible();
   });
 
-  it('should upload a Thread Dump when button is clicked', async () => {
-    const { user } = render({
-      routerConfigs: { routes: [{ path: '/diagnostics', element: <ThreadDumpsTable /> }] },
-    });
-
-    await act(async () => {
-      const uploadButton = screen.getByRole('button', { name: 'dump-threads' });
-      expect(uploadButton).toBeInTheDocument();
-      expect(uploadButton).toBeVisible();
-
-      await user.click(uploadButton);
-      expect(dumpThreadsSpy).toHaveBeenCalledTimes(1);
-    });
-  });
-
   it('should show warning modal and delete a Thread Dump when confirmed', async () => {
     const deleteRequestSpy = jest.spyOn(defaultServices.api, 'deleteThreadDump').mockReturnValue(of(true));
     const { user } = render({
diff --git a/src/test/JMCAgent/__snapshots__/AgentLiveProbes.test.tsx.snap b/src/test/JMCAgent/__snapshots__/AgentLiveProbes.test.tsx.snap
index 90e4d495c..2d173b292 100644
--- a/src/test/JMCAgent/__snapshots__/AgentLiveProbes.test.tsx.snap
+++ b/src/test/JMCAgent/__snapshots__/AgentLiveProbes.test.tsx.snap
@@ -1,463 +1,426 @@
 // Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`<AgentLiveProbes /> renders correctly 1`] = `
-<div
-  className="pf-v5-l-stack pf-m-gutter"
-  style={
-    {
-      "marginTop": "1em",
-    }
-  }
->
+[
   <div
-    className="pf-v5-l-stack__item"
+    className="pf-v5-c-toolbar"
+    data-ouia-component-id="OUIA-Generated-Toolbar-1"
+    data-ouia-component-type="PF5/Toolbar"
+    data-ouia-safe={true}
+    id="active-probes-toolbar"
   >
     <div
-      className="pf-v5-c-card"
-      data-ouia-component-id="OUIA-Generated-Card-1"
-      data-ouia-component-type="PF5/Card"
-      data-ouia-safe={true}
-      id=""
+      className="pf-v5-c-toolbar__content"
     >
       <div
-        className="pf-v5-c-card__title"
+        className="pf-v5-c-toolbar__content-section"
       >
         <div
-          className="pf-v5-c-card__title-text"
-        >
-          About the JMC Agent
-        </div>
-      </div>
-      <div
-        className="pf-v5-c-card__body"
-      >
-        The JMC Agent allows users to dynamically inject custom JFR events into running JVMs. In order to make use of the JMC Agent, the agent jar must be present in the same container as the target, and the target must be started with the agent (-javaagent:/path/to/agent.jar). Once these pre-requisites are met, the user can upload Probe Templates to Cryostat and insert them to the target, as well as view or remove currently active probes.
-      </div>
-    </div>
-  </div>
-  <div
-    className="pf-v5-l-stack__item"
-  >
-    <div
-      className="pf-v5-c-toolbar"
-      data-ouia-component-id="OUIA-Generated-Toolbar-1"
-      data-ouia-component-type="PF5/Toolbar"
-      data-ouia-safe={true}
-      id="active-probes-toolbar"
-    >
-      <div
-        className="pf-v5-c-toolbar__content"
-      >
-        <div
-          className="pf-v5-c-toolbar__content-section"
+          className="pf-v5-c-toolbar__group pf-m-filter-group"
         >
           <div
-            className="pf-v5-c-toolbar__group pf-m-filter-group"
+            className="pf-v5-c-toolbar__item"
           >
             <div
-              className="pf-v5-c-toolbar__item"
+              className="pf-v5-c-text-input-group"
+              id="activeProbeFilter"
+              style={
+                {
+                  "minWidth": "36ch",
+                }
+              }
+              type="search"
             >
               <div
-                className="pf-v5-c-text-input-group"
-                id="activeProbeFilter"
-                style={
-                  {
-                    "minWidth": "36ch",
-                  }
-                }
-                type="search"
+                className="pf-v5-c-text-input-group__main pf-m-icon"
+                onKeyDown={[Function]}
               >
-                <div
-                  className="pf-v5-c-text-input-group__main pf-m-icon"
-                  onKeyDown={[Function]}
+                <span
+                  className="pf-v5-c-text-input-group__text"
                 >
                   <span
-                    className="pf-v5-c-text-input-group__text"
+                    className="pf-v5-c-text-input-group__icon"
                   >
-                    <span
-                      className="pf-v5-c-text-input-group__icon"
+                    <svg
+                      aria-hidden={true}
+                      aria-labelledby={null}
+                      className="pf-v5-svg"
+                      fill="currentColor"
+                      height="1em"
+                      role="img"
+                      viewBox="0 0 512 512"
+                      width="1em"
                     >
-                      <svg
-                        aria-hidden={true}
-                        aria-labelledby={null}
-                        className="pf-v5-svg"
-                        fill="currentColor"
-                        height="1em"
-                        role="img"
-                        viewBox="0 0 512 512"
-                        width="1em"
-                      >
-                        <path
-                          d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
-                        />
-                      </svg>
-                    </span>
-                    <input
-                      aria-label="active-probe-filter"
-                      className="pf-v5-c-text-input-group__text-input"
-                      disabled={false}
-                      name="activeProbeFilter"
-                      onChange={[Function]}
-                      placeholder="Find by name, description, class, or method..."
-                      type="text"
-                      value=""
-                    />
+                      <path
+                        d="M505 442.7L405.3 343c-4.5-4.5-10.6-7-17-7H372c27.6-35.3 44-79.7 44-128C416 93.1 322.9 0 208 0S0 93.1 0 208s93.1 208 208 208c48.3 0 92.7-16.4 128-44v16.3c0 6.4 2.5 12.5 7 17l99.7 99.7c9.4 9.4 24.6 9.4 33.9 0l28.3-28.3c9.4-9.4 9.4-24.6.1-34zM208 336c-70.7 0-128-57.2-128-128 0-70.7 57.2-128 128-128 70.7 0 128 57.2 128 128 0 70.7-57.2 128-128 128z"
+                      />
+                    </svg>
                   </span>
-                </div>
+                  <input
+                    aria-label="active-probe-filter"
+                    className="pf-v5-c-text-input-group__text-input"
+                    disabled={false}
+                    name="activeProbeFilter"
+                    onChange={[Function]}
+                    placeholder="Find by name, description, class, or method..."
+                    type="text"
+                    value=""
+                  />
+                </span>
               </div>
             </div>
           </div>
-          <hr
-            className="pf-v5-c-divider pf-m-vertical"
-          />
+        </div>
+        <hr
+          className="pf-v5-c-divider pf-m-vertical"
+        />
+        <div
+          className="pf-v5-c-toolbar__group pf-m-icon-button-group"
+        >
           <div
-            className="pf-v5-c-toolbar__group pf-m-icon-button-group"
+            className="pf-v5-c-toolbar__item"
           >
-            <div
-              className="pf-v5-c-toolbar__item"
+            <button
+              aria-disabled={false}
+              aria-label={null}
+              className="pf-v5-c-button pf-m-danger pf-m-progress"
+              data-ouia-component-id="OUIA-Generated-Button-danger-1"
+              data-ouia-component-type="PF5/Button"
+              data-ouia-safe={true}
+              disabled={false}
+              onClick={[Function]}
+              role={null}
+              type="button"
             >
-              <button
-                aria-disabled={false}
-                aria-label={null}
-                className="pf-v5-c-button pf-m-danger pf-m-progress"
-                data-ouia-component-id="OUIA-Generated-Button-danger-1"
-                data-ouia-component-type="PF5/Button"
-                data-ouia-safe={true}
-                disabled={false}
-                onClick={[Function]}
-                role={null}
-                type="button"
-              >
-                Remove
-                 all probes
-              </button>
-            </div>
+              Remove
+               all probes
+            </button>
           </div>
         </div>
       </div>
+    </div>
+    <div
+      className="pf-v5-c-toolbar__content pf-m-hidden"
+      hidden={true}
+    >
       <div
-        className="pf-v5-c-toolbar__content pf-m-hidden"
-        hidden={true}
-      >
-        <div
-          className="pf-v5-c-toolbar__group"
-        />
-      </div>
+        className="pf-v5-c-toolbar__group"
+      />
     </div>
-    <table
-      aria-label="Active probe table"
-      className="pf-v5-c-table pf-m-grid-md pf-m-compact"
-      data-ouia-component-id="OUIA-Generated-Table-1"
-      data-ouia-component-type="PF5/Table"
-      data-ouia-safe={true}
-      role="grid"
+  </div>,
+  <table
+    aria-label="Active probe table"
+    className="pf-v5-c-table pf-m-grid-md pf-m-compact"
+    data-ouia-component-id="OUIA-Generated-Table-1"
+    data-ouia-component-type="PF5/Table"
+    data-ouia-safe={true}
+    role="grid"
+  >
+    <thead
+      className="pf-v5-c-table__thead"
     >
-      <thead
-        className="pf-v5-c-table__thead"
+      <tr
+        className="pf-v5-c-table__tr"
+        data-ouia-component-id="OUIA-Generated-TableRow-1"
+        data-ouia-component-type="PF5/TableRow"
+        data-ouia-safe={true}
+        hidden={false}
       >
-        <tr
-          className="pf-v5-c-table__tr"
-          data-ouia-component-id="OUIA-Generated-TableRow-1"
-          data-ouia-component-type="PF5/TableRow"
-          data-ouia-safe={true}
-          hidden={false}
+        <th
+          aria-sort="none"
+          className="pf-v5-c-table__th pf-v5-c-table__sort"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          scope="col"
+          tabIndex={-1}
         >
-          <th
-            aria-sort="none"
-            className="pf-v5-c-table__th pf-v5-c-table__sort"
+          <button
+            className="pf-v5-c-table__button"
             onBlur={[Function]}
+            onClick={[Function]}
             onFocus={[Function]}
-            onMouseEnter={[Function]}
-            scope="col"
-            tabIndex={-1}
+            type="button"
           >
-            <button
-              className="pf-v5-c-table__button"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              type="button"
+            <div
+              className="pf-v5-c-table__button-content"
             >
-              <div
-                className="pf-v5-c-table__button-content"
+              <span
+                className="pf-v5-c-table__text"
+                onMouseEnter={[Function]}
               >
-                <span
-                  className="pf-v5-c-table__text"
-                  onMouseEnter={[Function]}
-                >
-                  ID
-                </span>
-                <span
-                  className="pf-v5-c-table__sort-indicator"
+                ID
+              </span>
+              <span
+                className="pf-v5-c-table__sort-indicator"
+              >
+                <svg
+                  aria-hidden={true}
+                  aria-labelledby={null}
+                  className="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 256 512"
+                  width="1em"
                 >
-                  <svg
-                    aria-hidden={true}
-                    aria-labelledby={null}
-                    className="pf-v5-svg"
-                    fill="currentColor"
-                    height="1em"
-                    role="img"
-                    viewBox="0 0 256 512"
-                    width="1em"
-                  >
-                    <path
-                      d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
-                    />
-                  </svg>
-                </span>
-              </div>
-            </button>
-          </th>
-          <th
-            aria-sort="none"
-            className="pf-v5-c-table__th pf-v5-c-table__sort"
+                  <path
+                    d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
+                  />
+                </svg>
+              </span>
+            </div>
+          </button>
+        </th>
+        <th
+          aria-sort="none"
+          className="pf-v5-c-table__th pf-v5-c-table__sort"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          scope="col"
+          tabIndex={-1}
+        >
+          <button
+            className="pf-v5-c-table__button"
             onBlur={[Function]}
+            onClick={[Function]}
             onFocus={[Function]}
-            onMouseEnter={[Function]}
-            scope="col"
-            tabIndex={-1}
+            type="button"
           >
-            <button
-              className="pf-v5-c-table__button"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              type="button"
+            <div
+              className="pf-v5-c-table__button-content"
             >
-              <div
-                className="pf-v5-c-table__button-content"
+              <span
+                className="pf-v5-c-table__text"
+                onMouseEnter={[Function]}
               >
-                <span
-                  className="pf-v5-c-table__text"
-                  onMouseEnter={[Function]}
-                >
-                  Name
-                </span>
-                <span
-                  className="pf-v5-c-table__sort-indicator"
+                Name
+              </span>
+              <span
+                className="pf-v5-c-table__sort-indicator"
+              >
+                <svg
+                  aria-hidden={true}
+                  aria-labelledby={null}
+                  className="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 256 512"
+                  width="1em"
                 >
-                  <svg
-                    aria-hidden={true}
-                    aria-labelledby={null}
-                    className="pf-v5-svg"
-                    fill="currentColor"
-                    height="1em"
-                    role="img"
-                    viewBox="0 0 256 512"
-                    width="1em"
-                  >
-                    <path
-                      d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
-                    />
-                  </svg>
-                </span>
-              </div>
-            </button>
-          </th>
-          <th
-            aria-sort="none"
-            className="pf-v5-c-table__th pf-v5-c-table__sort"
+                  <path
+                    d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
+                  />
+                </svg>
+              </span>
+            </div>
+          </button>
+        </th>
+        <th
+          aria-sort="none"
+          className="pf-v5-c-table__th pf-v5-c-table__sort"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          scope="col"
+          tabIndex={-1}
+        >
+          <button
+            className="pf-v5-c-table__button"
             onBlur={[Function]}
+            onClick={[Function]}
             onFocus={[Function]}
-            onMouseEnter={[Function]}
-            scope="col"
-            tabIndex={-1}
+            type="button"
           >
-            <button
-              className="pf-v5-c-table__button"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              type="button"
+            <div
+              className="pf-v5-c-table__button-content"
             >
-              <div
-                className="pf-v5-c-table__button-content"
+              <span
+                className="pf-v5-c-table__text"
+                onMouseEnter={[Function]}
               >
-                <span
-                  className="pf-v5-c-table__text"
-                  onMouseEnter={[Function]}
-                >
-                  Class
-                </span>
-                <span
-                  className="pf-v5-c-table__sort-indicator"
+                Class
+              </span>
+              <span
+                className="pf-v5-c-table__sort-indicator"
+              >
+                <svg
+                  aria-hidden={true}
+                  aria-labelledby={null}
+                  className="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 256 512"
+                  width="1em"
                 >
-                  <svg
-                    aria-hidden={true}
-                    aria-labelledby={null}
-                    className="pf-v5-svg"
-                    fill="currentColor"
-                    height="1em"
-                    role="img"
-                    viewBox="0 0 256 512"
-                    width="1em"
-                  >
-                    <path
-                      d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
-                    />
-                  </svg>
-                </span>
-              </div>
-            </button>
-          </th>
-          <th
-            aria-sort="none"
-            className="pf-v5-c-table__th pf-v5-c-table__sort"
+                  <path
+                    d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
+                  />
+                </svg>
+              </span>
+            </div>
+          </button>
+        </th>
+        <th
+          aria-sort="none"
+          className="pf-v5-c-table__th pf-v5-c-table__sort"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          scope="col"
+          tabIndex={-1}
+        >
+          <button
+            className="pf-v5-c-table__button"
             onBlur={[Function]}
+            onClick={[Function]}
             onFocus={[Function]}
-            onMouseEnter={[Function]}
-            scope="col"
-            tabIndex={-1}
+            type="button"
           >
-            <button
-              className="pf-v5-c-table__button"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              type="button"
+            <div
+              className="pf-v5-c-table__button-content"
             >
-              <div
-                className="pf-v5-c-table__button-content"
+              <span
+                className="pf-v5-c-table__text"
+                onMouseEnter={[Function]}
               >
-                <span
-                  className="pf-v5-c-table__text"
-                  onMouseEnter={[Function]}
-                >
-                  Description
-                </span>
-                <span
-                  className="pf-v5-c-table__sort-indicator"
+                Description
+              </span>
+              <span
+                className="pf-v5-c-table__sort-indicator"
+              >
+                <svg
+                  aria-hidden={true}
+                  aria-labelledby={null}
+                  className="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 256 512"
+                  width="1em"
                 >
-                  <svg
-                    aria-hidden={true}
-                    aria-labelledby={null}
-                    className="pf-v5-svg"
-                    fill="currentColor"
-                    height="1em"
-                    role="img"
-                    viewBox="0 0 256 512"
-                    width="1em"
-                  >
-                    <path
-                      d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
-                    />
-                  </svg>
-                </span>
-              </div>
-            </button>
-          </th>
-          <th
-            aria-sort="none"
-            className="pf-v5-c-table__th pf-v5-c-table__sort"
+                  <path
+                    d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
+                  />
+                </svg>
+              </span>
+            </div>
+          </button>
+        </th>
+        <th
+          aria-sort="none"
+          className="pf-v5-c-table__th pf-v5-c-table__sort"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          scope="col"
+          tabIndex={-1}
+        >
+          <button
+            className="pf-v5-c-table__button"
             onBlur={[Function]}
+            onClick={[Function]}
             onFocus={[Function]}
-            onMouseEnter={[Function]}
-            scope="col"
-            tabIndex={-1}
+            type="button"
           >
-            <button
-              className="pf-v5-c-table__button"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
-              type="button"
+            <div
+              className="pf-v5-c-table__button-content"
             >
-              <div
-                className="pf-v5-c-table__button-content"
+              <span
+                className="pf-v5-c-table__text"
+                onMouseEnter={[Function]}
               >
-                <span
-                  className="pf-v5-c-table__text"
-                  onMouseEnter={[Function]}
-                >
-                  Method
-                </span>
-                <span
-                  className="pf-v5-c-table__sort-indicator"
+                Method
+              </span>
+              <span
+                className="pf-v5-c-table__sort-indicator"
+              >
+                <svg
+                  aria-hidden={true}
+                  aria-labelledby={null}
+                  className="pf-v5-svg"
+                  fill="currentColor"
+                  height="1em"
+                  role="img"
+                  viewBox="0 0 256 512"
+                  width="1em"
                 >
-                  <svg
-                    aria-hidden={true}
-                    aria-labelledby={null}
-                    className="pf-v5-svg"
-                    fill="currentColor"
-                    height="1em"
-                    role="img"
-                    viewBox="0 0 256 512"
-                    width="1em"
-                  >
-                    <path
-                      d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
-                    />
-                  </svg>
-                </span>
-              </div>
-            </button>
-          </th>
-        </tr>
-      </thead>
-      <tbody
-        className="pf-v5-c-table__tbody"
-        role="rowgroup"
+                  <path
+                    d="M214.059 377.941H168V134.059h46.059c21.382 0 32.09-25.851 16.971-40.971L144.971 7.029c-9.373-9.373-24.568-9.373-33.941 0L24.971 93.088c-15.119 15.119-4.411 40.971 16.971 40.971H88v243.882H41.941c-21.382 0-32.09 25.851-16.971 40.971l86.059 86.059c9.373 9.373 24.568 9.373 33.941 0l86.059-86.059c15.12-15.119 4.412-40.971-16.97-40.971z"
+                  />
+                </svg>
+              </span>
+            </div>
+          </button>
+        </th>
+      </tr>
+    </thead>
+    <tbody
+      className="pf-v5-c-table__tbody"
+      role="rowgroup"
+    >
+      <tr
+        className="pf-v5-c-table__tr"
+        data-ouia-component-id="OUIA-Generated-TableRow-2"
+        data-ouia-component-type="PF5/TableRow"
+        data-ouia-safe={true}
+        hidden={false}
       >
-        <tr
-          className="pf-v5-c-table__tr"
-          data-ouia-component-id="OUIA-Generated-TableRow-2"
-          data-ouia-component-type="PF5/TableRow"
-          data-ouia-safe={true}
-          hidden={false}
+        <td
+          className="pf-v5-c-table__td"
+          data-label="ID"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          tabIndex={-1}
         >
-          <td
-            className="pf-v5-c-table__td"
-            data-label="ID"
-            onBlur={[Function]}
-            onFocus={[Function]}
-            onMouseEnter={[Function]}
-            tabIndex={-1}
-          >
-            some_id
-          </td>
-          <td
-            className="pf-v5-c-table__td"
-            data-label="Name"
-            onBlur={[Function]}
-            onFocus={[Function]}
-            onMouseEnter={[Function]}
-            tabIndex={-1}
-          >
-            some_name
-          </td>
-          <td
-            className="pf-v5-c-table__td"
-            data-label="Class"
-            onBlur={[Function]}
-            onFocus={[Function]}
-            onMouseEnter={[Function]}
-            tabIndex={-1}
-          >
-            some_clazz
-          </td>
-          <td
-            className="pf-v5-c-table__td"
-            data-label="Description"
-            onBlur={[Function]}
-            onFocus={[Function]}
-            onMouseEnter={[Function]}
-            tabIndex={-1}
-          >
-            some_desc
-          </td>
-          <td
-            className="pf-v5-c-table__td"
-            data-label="Method"
-            onBlur={[Function]}
-            onFocus={[Function]}
-            onMouseEnter={[Function]}
-            tabIndex={-1}
-          >
-            a_method
-          </td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>
+          some_id
+        </td>
+        <td
+          className="pf-v5-c-table__td"
+          data-label="Name"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          tabIndex={-1}
+        >
+          some_name
+        </td>
+        <td
+          className="pf-v5-c-table__td"
+          data-label="Class"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          tabIndex={-1}
+        >
+          some_clazz
+        </td>
+        <td
+          className="pf-v5-c-table__td"
+          data-label="Description"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          tabIndex={-1}
+        >
+          some_desc
+        </td>
+        <td
+          className="pf-v5-c-table__td"
+          data-label="Method"
+          onBlur={[Function]}
+          onFocus={[Function]}
+          onMouseEnter={[Function]}
+          tabIndex={-1}
+        >
+          a_method
+        </td>
+      </tr>
+    </tbody>
+  </table>,
+]
 `;