diff --git a/reports/src/capability/CapabilityTable.tsx b/reports/src/capability/CapabilityTable.tsx
index a8ce5aa..9a36b8a 100644
--- a/reports/src/capability/CapabilityTable.tsx
+++ b/reports/src/capability/CapabilityTable.tsx
@@ -1,226 +1,17 @@
-import { Link as RouterLink } from "react-router-dom";
-import {
-  Accordion,
-  AccordionDetails,
-  AccordionSummary,
-  Box,
-  Breadcrumbs,
-  Chip,
-  Dialog,
-  DialogContent,
-  Link,
-  Typography,
-} from "@mui/material";
-import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-
-import { Capability, Check, Requirement } from "./capabilityTypes";
-import { useEffect, useState } from "react";
+import { Box, Breadcrumbs, Typography } from "@mui/material";
+import { Capability } from "./capabilityTypes";
 import { useMatches } from "react-router-dom";
 import { ReactNode } from "react";
 import { Report } from "./capabilityTypes";
 import { CapabilityTableHeader } from "./CapabilityTableHeader";
+import { RequirementTable } from "./RequirementTable";
+import { ChildCapabilityTable } from "./ChildCapabilityTable";
 
 type CapabilityTableProps = {
   capability: Capability;
   report: Report;
 };
 
-export const CheckLabel = ({
-  name,
-  docUrl,
-}: {
-  name: string;
-  docUrl?: string;
-}) => {
-  return docUrl ? <Link href={docUrl}>{name}</Link> : <>{name}</>;
-};
-
-const getCheckId = (check: Check): string => {
-  return [
-    check.scenario.name,
-    check.case.name,
-    check.step.name,
-    check.name,
-  ].join("-");
-};
-
-const CheckStatusTag = ({ check }: { check: Check }) => {
-  const [showDetails, setShowDetails] = useState(false);
-  return (
-    <div>
-      <Chip
-        label={check.result === "pass" ? "PASS" : "FAIL"}
-        color={check.result === "pass" ? "success" : "error"}
-        onClick={() => setShowDetails(true)}
-      />
-      <Dialog
-        fullWidth
-        maxWidth="xl"
-        onClose={() => setShowDetails(false)}
-        open={showDetails}
-      >
-        <DialogContent>
-          <Typography variant="h2" gutterBottom>
-            {check.name} was evaluated in step {check.step.name}
-          </Typography>
-          <Typography>Details:</Typography>
-          <pre>{JSON.stringify(check.details, null, 2)}</pre>
-        </DialogContent>
-      </Dialog>
-    </div>
-  );
-};
-
-const AggregatedStatusTag = ({ checks }: { checks: Check[] }) => {
-  const successfulChecks = checks.reduce(
-    (acc, check) => acc + (check.result === "pass" ? 1 : 0),
-    0
-  );
-  const pass = successfulChecks === checks.length;
-  return (
-    <Chip label={pass ? "PASS" : "FAIL"} color={pass ? "success" : "error"} />
-  );
-};
-
-const CheckAggregateRow = ({ checks }: { checks: Check[] }) => {
-  const separator = " :: ";
-  const checkSource = (
-    <>
-      <CheckLabel {...checks[0].scenario} />
-      {separator}
-      <CheckLabel {...checks[0].case} />
-      {separator}
-      <CheckLabel {...checks[0].step} />
-      {separator}
-      <CheckLabel name={checks[0].name} />
-    </>
-  );
-  return (
-    <tr>
-      <td style={{ padding: 0 }}>
-        <Accordion square disableGutters>
-          <AccordionSummary
-            expandIcon={<ExpandMoreIcon />}
-            aria-controls="panel1a-content"
-            id="panel1a-header"
-            sx={{
-              "& .MuiAccordionSummary-content": {
-                display: "flex",
-                justifyContent: "space-between",
-              },
-            }}
-          >
-            <Typography>{checkSource}</Typography>
-            <AggregatedStatusTag checks={checks} />
-          </AccordionSummary>
-          <AccordionDetails>
-            <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
-              {checks.map((c) => (
-                <CheckStatusTag check={c} />
-              ))}
-            </Box>
-          </AccordionDetails>
-        </Accordion>
-      </td>
-    </tr>
-  );
-};
-
-const checkAggregatedRows = (requirement: Requirement) => {
-  // Group checks by ID
-  const aggregatedChecks = requirement.checks.reduce((acc, check) => {
-    const checkId = getCheckId(check);
-    if (checkId in acc) {
-      return { ...acc, [checkId]: [...acc[checkId], check] };
-    } else {
-      return { ...acc, [checkId]: [check] };
-    }
-  }, {} as Record<string, Check[]>);
-
-  // For each check, display a checkRow
-  // Aggregate titles by check ID
-  return Object.keys(aggregatedChecks)
-    .map((key) => {
-      const checks = aggregatedChecks[key];
-      return <CheckAggregateRow checks={checks} />;
-    })
-    .flat();
-};
-
-const requirementRow = (requirement: Requirement) => {
-  const checks = checkAggregatedRows(requirement);
-  const requirementHeader = (
-    <tr>
-      <td rowSpan={checks.length + 1}>{requirement.name}</td>
-      {!checks.length && <td>Not tested</td>}
-    </tr>
-  );
-
-  if (checks.length) {
-    return [requirementHeader, ...checks];
-  } else {
-    return [requirementHeader];
-  }
-};
-
-export const ChildCapabilityRow = ({
-  capability,
-  path,
-}: {
-  capability: Capability;
-  path: string;
-}) => {
-  const pass = capability.result === "pass";
-  return (
-    <tr>
-      <td>
-        <Link to={path} component={RouterLink}>
-          {capability.name} ({capability.participant_id})
-        </Link>
-      </td>
-      <td>
-        <Chip
-          label={pass ? "PASS" : "FAIL"}
-          color={pass ? "success" : "error"}
-        />
-      </td>
-    </tr>
-  );
-};
-
-const ChildCapabilityHeader = () => {
-  return (
-    <tr>
-      <th>Child Capability</th>
-      <th>Result</th>
-    </tr>
-  );
-};
-
-export const CapabilityRows = ({ capability }: { capability: Capability }) => {
-  const requirements = capability.requirements
-    .flatMap((r) => requirementRow(r))
-    .flat();
-  const childCapabilities = capability.childCapabilities.map((c, i) => (
-    <ChildCapabilityRow capability={c} path={i.toString()} />
-  ));
-  const childTable = childCapabilities
-    ? [<ChildCapabilityHeader />, ...childCapabilities]
-    : [];
-
-  const allRows = [...requirements, ...childTable];
-  return [...allRows];
-};
-
-export const CapabilityDebug = ({ capability }: { capability: Capability }) => {
-  // return <code><pre style={{textAlign:"left"}}>{JSON.stringify(capability, null, 2)}</pre></code>;
-  useEffect(
-    () => console.info("Displayed Capability: ", capability),
-    [capability]
-  );
-  return <></>;
-};
-
 type CrumbHandle = { crumb: () => ReactNode };
 
 function CapabilityBreadcrumbs() {
@@ -244,6 +35,7 @@ export const CapabilityTable = ({
   if (!capability) {
     return <span>Capability not found</span>;
   }
+
   return (
     <>
       <CapabilityTableHeader capability={capability} report={report} />
@@ -254,27 +46,19 @@ export const CapabilityTable = ({
             theme.palette.mode === "light"
               ? theme.palette.grey[100]
               : theme.palette.grey[900],
-          // flexGrow: 1,
-          // height: "100vh",
-          // overflow: "auto",
           padding: 8,
           paddingTop: 10,
         }}
       >
         <CapabilityBreadcrumbs />
-        <br />
-        <table>
-          <thead>
-            <tr>
-              <th>Requirement</th>
-              <th>Test Check</th>
-            </tr>
-          </thead>
-          <tbody>
-            <CapabilityRows capability={capability} />
-          </tbody>
-        </table>
-        <CapabilityDebug capability={capability} />
+        <Typography variant="h3" gutterBottom sx={{ marginTop: 1 }}>
+          Requirements
+        </Typography>
+        <RequirementTable capability={capability} />
+        <Typography variant="h3" gutterBottom sx={{ marginTop: 1 }}>
+          Child capabilities
+        </Typography>
+        <ChildCapabilityTable capability={capability} />
       </Box>
     </>
   );
diff --git a/reports/src/capability/ChildCapabilityTable.tsx b/reports/src/capability/ChildCapabilityTable.tsx
new file mode 100644
index 0000000..0c629be
--- /dev/null
+++ b/reports/src/capability/ChildCapabilityTable.tsx
@@ -0,0 +1,49 @@
+import { Chip, Link } from "@mui/material";
+import { Link as RouterLink } from "react-router-dom";
+import { Capability } from "./capabilityTypes";
+export const ChildCapabilityRow = ({
+  capability,
+  path,
+}: {
+  capability: Capability;
+  path: string;
+}) => {
+  const pass = capability.result === "pass";
+  return (
+    <tr>
+      <td>
+        <Link to={path} component={RouterLink}>
+          {capability.name} ({capability.participant_id})
+        </Link>
+      </td>
+      <td>
+        <Chip
+          label={pass ? "PASS" : "FAIL"}
+          color={pass ? "success" : "error"}
+        />
+      </td>
+    </tr>
+  );
+};
+
+export const ChildCapabilityTable = ({
+  capability,
+}: {
+  capability: Capability;
+}) => {
+  const childCapabilities = capability.childCapabilities.map((c, i) => (
+    <ChildCapabilityRow capability={c} path={i.toString()} />
+  ));
+
+  return (
+    <table>
+      <thead>
+        <tr>
+          <th>Child Capability</th>
+          <th>Result</th>
+        </tr>
+      </thead>
+      <tbody>{childCapabilities}</tbody>
+    </table>
+  );
+};
diff --git a/reports/src/capability/RequirementTable.tsx b/reports/src/capability/RequirementTable.tsx
new file mode 100644
index 0000000..3983398
--- /dev/null
+++ b/reports/src/capability/RequirementTable.tsx
@@ -0,0 +1,170 @@
+import { useState } from "react";
+import {
+  Accordion,
+  AccordionDetails,
+  AccordionSummary,
+  Box,
+  Chip,
+  Dialog,
+  DialogContent,
+  Typography,
+  Link,
+} from "@mui/material";
+import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
+
+import { Capability, Check, Requirement } from "./capabilityTypes";
+
+const CheckLabel = ({ name, docUrl }: { name: string; docUrl?: string }) => {
+  return docUrl ? <Link href={docUrl}>{name}</Link> : <>{name}</>;
+};
+const CheckStatusTag = ({ check }: { check: Check }) => {
+  const [showDetails, setShowDetails] = useState(false);
+  return (
+    <div>
+      <Chip
+        label={check.result === "pass" ? "PASS" : "FAIL"}
+        color={check.result === "pass" ? "success" : "error"}
+        onClick={() => setShowDetails(true)}
+      />
+      <Dialog
+        fullWidth
+        maxWidth="xl"
+        onClose={() => setShowDetails(false)}
+        open={showDetails}
+      >
+        <DialogContent>
+          <Typography variant="h2" gutterBottom>
+            {check.name} was evaluated in step {check.step.name}
+          </Typography>
+          <Typography>Details:</Typography>
+          <pre>{JSON.stringify(check.details, null, 2)}</pre>
+        </DialogContent>
+      </Dialog>
+    </div>
+  );
+};
+const AggregatedStatusTag = ({ checks }: { checks: Check[] }) => {
+  const successfulChecks = checks.reduce(
+    (acc, check) => acc + (check.result === "pass" ? 1 : 0),
+    0
+  );
+  const pass = successfulChecks === checks.length;
+  return (
+    <Chip label={pass ? "PASS" : "FAIL"} color={pass ? "success" : "error"} />
+  );
+};
+
+const CheckAggregateRow = ({ checks }: { checks: Check[] }) => {
+  const separator = " :: ";
+  const checkSource = (
+    <>
+      <CheckLabel {...checks[0].scenario} />
+      {separator}
+      <CheckLabel {...checks[0].case} />
+      {separator}
+      <CheckLabel {...checks[0].step} />
+      {separator}
+      <CheckLabel name={checks[0].name} />
+    </>
+  );
+  return (
+    <tr>
+      <td style={{ padding: 0 }}>
+        <Accordion square disableGutters>
+          <AccordionSummary
+            expandIcon={<ExpandMoreIcon />}
+            aria-controls="panel1a-content"
+            id="panel1a-header"
+            sx={{
+              "& .MuiAccordionSummary-content": {
+                display: "flex",
+                justifyContent: "space-between",
+              },
+            }}
+          >
+            <Typography>{checkSource}</Typography>
+            <AggregatedStatusTag checks={checks} />
+          </AccordionSummary>
+          <AccordionDetails>
+            <Box sx={{ display: "flex", gap: 1, flexWrap: "wrap" }}>
+              {checks.map((c) => (
+                <CheckStatusTag check={c} />
+              ))}
+            </Box>
+          </AccordionDetails>
+        </Accordion>
+      </td>
+    </tr>
+  );
+};
+
+const getCheckId = (check: Check): string => {
+  return [
+    check.scenario.name,
+    check.case.name,
+    check.step.name,
+    check.name,
+  ].join("-");
+};
+
+const checkAggregatedRows = (requirement: Requirement) => {
+  // Group checks by ID
+  const aggregatedChecks = requirement.checks.reduce((acc, check) => {
+    const checkId = getCheckId(check);
+    if (checkId in acc) {
+      return { ...acc, [checkId]: [...acc[checkId], check] };
+    } else {
+      return { ...acc, [checkId]: [check] };
+    }
+  }, {} as Record<string, Check[]>);
+
+  // For each check, display a checkRow
+  // Aggregate titles by check ID
+  return Object.keys(aggregatedChecks)
+    .map((key) => {
+      const checks = aggregatedChecks[key];
+      return <CheckAggregateRow checks={checks} />;
+    })
+    .flat();
+};
+const requirementRow = (requirement: Requirement) => {
+  const checks = checkAggregatedRows(requirement);
+  const requirementHeader = (
+    <tr>
+      <td rowSpan={checks.length + 1}>{requirement.name}</td>
+      {!checks.length && <td>Not tested</td>}
+    </tr>
+  );
+
+  if (checks.length) {
+    return [requirementHeader, ...checks];
+  } else {
+    return [requirementHeader];
+  }
+};
+
+export const RequirementTable = ({
+  capability,
+}: {
+  capability: Capability;
+}) => {
+  const requirements = capability.requirements
+    .sort((a, b) => (a.name > b.name ? 1 : -1))
+    .flatMap((r) => requirementRow(r))
+    .flat();
+
+  return (
+    <table>
+      <thead>
+        <tr>
+          <th>Requirement</th>
+          <th>Test Check</th>
+        </tr>
+      </thead>
+      <tbody>
+        {/* <CapabilityRows capability={capability} /> */}
+        {requirements}
+      </tbody>
+    </table>
+  );
+};