diff --git a/client/components/TestRenderer/index.jsx b/client/components/TestRenderer/index.jsx
index 50bfce59d..4799096cb 100644
--- a/client/components/TestRenderer/index.jsx
+++ b/client/components/TestRenderer/index.jsx
@@ -203,6 +203,50 @@ const ResultsBulletList = styled.ul`
     }
 `;
 
+const AssertionFieldsetList = styled.ul`
+    > li {
+        margin-top: 1em;
+    }
+
+    > li:last-child {
+        margin-bottom: 2em;
+    }
+
+    > li + li {
+        margin-top: 1em;
+    }
+`;
+
+const AssertionFieldset = styled.fieldset`
+    border: 1px solid #000;
+
+    legend {
+        display: inline-block;
+        width: auto;
+        font-size: 1em;
+        margin-left: 1em;
+        margin-bottom: 0;
+        padding: 0.2em;
+    }
+
+    h5 {
+        margin: 0;
+    }
+
+    .assertion-input-list {
+        margin-left: 0.5em;
+        display: flex;
+    }
+
+    .assertion-input-list > .assertion-input-group + .assertion-input-group {
+        margin-left: 1em;
+    }
+
+    input {
+        margin-right: 0.5em;
+    }
+`;
+
 const Button = styled.button``;
 
 const ResultsSection = styled.section``;
@@ -597,6 +641,112 @@ const TestRenderer = ({
     // pageContent to render instructions; submitResult.resultsJSON indicates results have been submitted
     if (!pageContent) return null;
 
+    const Assertion = ({ data, assertionIndex, commandIndex }) => {
+        const { description, passChoice, failChoices } = data;
+
+        const [missingChoice, failureChoice] = failChoices;
+
+        return (
+            <li>
+                <AssertionFieldset className="command-assertions">
+                    <legend>
+                        <h5>
+                            {description[0]}
+                            {isSubmitted && (
+                                <Feedback
+                                    className={`${description[1].required &&
+                                        'required'} ${description[1]
+                                        .highlightRequired &&
+                                        'highlight-required'}`}
+                                >
+                                    {description[1].description}
+                                </Feedback>
+                            )}
+                        </h5>
+                    </legend>
+
+                    <div className="assertion-input-list">
+                        <div className="assertion-input-group">
+                            <label>
+                                <input
+                                    key={`Pass__${commandIndex}__${assertionIndex}`}
+                                    type="radio"
+                                    id={`pass-${commandIndex}-${assertionIndex}`}
+                                    name={`result-${commandIndex}-${assertionIndex}`}
+                                    autoFocus={isSubmitted && passChoice.focus}
+                                    defaultChecked={passChoice.checked}
+                                    onClick={passChoice.click}
+                                />
+                                {passChoice.label[0].trim()}
+                                <>&nbsp;</>
+                                <Feedback
+                                    className={`${passChoice.label[1]
+                                        .offScreen && 'off-screen'}`}
+                                >
+                                    {passChoice.label[1].description}
+                                </Feedback>
+                            </label>
+                        </div>
+                        <div className="assertion-input-group">
+                            <label>
+                                <input
+                                    key={`Missing__${commandIndex}__${assertionIndex}`}
+                                    type="radio"
+                                    id={`missing-${commandIndex}-${assertionIndex}`}
+                                    name={`result-${commandIndex}-${assertionIndex}`}
+                                    autoFocus={
+                                        isSubmitted && missingChoice.focus
+                                    }
+                                    defaultChecked={missingChoice.checked}
+                                    onClick={missingChoice.click}
+                                />
+
+                                {missingChoice.label[0].trim()}
+                                <>&nbsp;</>
+                                <Feedback
+                                    className={`${missingChoice.label[1]
+                                        .offScreen && 'off-screen'}`}
+                                >
+                                    {missingChoice.label[1].description}
+                                </Feedback>
+                            </label>
+                        </div>
+                        <div className="assertion-input-group">
+                            <label>
+                                <input
+                                    key={`Fail__${commandIndex}__${assertionIndex}`}
+                                    type="radio"
+                                    id={`fail-${commandIndex}-${assertionIndex}`}
+                                    name={`result-${commandIndex}-${assertionIndex}`}
+                                    autoFocus={
+                                        isSubmitted && failureChoice.focus
+                                    }
+                                    defaultChecked={failureChoice.checked}
+                                    onClick={failureChoice.click}
+                                />
+
+                                {failureChoice.label[0].trim()}
+                                <>&nbsp;</>
+                                <Feedback
+                                    className={`${failureChoice.label[1]
+                                        .offScreen && 'off-screen'}`}
+                                >
+                                    {failureChoice.label[1].description}
+                                </Feedback>
+                            </label>
+                        </div>
+                    </div>
+                </AssertionFieldset>
+            </li>
+        );
+    };
+
+    Assertion.propTypes = {
+        data: PropTypes.object,
+        assertionIndex: PropTypes.number,
+        commandIndex: PropTypes.number
+    };
+
     return (
         <Container>
             {submitResult &&
@@ -647,7 +797,6 @@ const TestRenderer = ({
                                 const {
                                     header,
                                     atOutput,
-                                    assertionsHeader,
                                     assertions,
                                     unexpectedBehaviors
                                 } = value;
@@ -697,196 +846,33 @@ const TestRenderer = ({
                                                 }
                                             />
                                         </Text>
-                                        <Table>
-                                            <tbody>
-                                                <tr>
-                                                    <th>
-                                                        {assertionsHeader.descriptionHeader ||
-                                                            'Assertion'}
-                                                    </th>
-                                                    <th>
-                                                        {assertionsHeader.passHeader ||
-                                                            'Success case'}
-                                                    </th>
-                                                    <th>
-                                                        {assertionsHeader.failHeader ||
-                                                            'Failure cases'}
-                                                    </th>
-                                                </tr>
-                                                {assertions.map(
-                                                    (
-                                                        assertion,
-                                                        assertionIndex
-                                                    ) => {
-                                                        const {
-                                                            description,
-                                                            passChoice,
-                                                            failChoices
-                                                        } = assertion;
-
-                                                        const [
-                                                            missingChoice,
-                                                            failureChoice
-                                                        ] = failChoices;
-
-                                                        return (
-                                                            <tr
-                                                                key={`AssertionKey_${assertionIndex}`}
-                                                            >
-                                                                {/*Assertion*/}
-                                                                <td
-                                                                    id={`assertion-${commandIndex}-${assertionIndex}`}
-                                                                >
-                                                                    {
-                                                                        description[0]
-                                                                    }
-                                                                    {isSubmitted && (
-                                                                        <Feedback
-                                                                            className={`${description[1]
-                                                                                .required &&
-                                                                                'required'} ${description[1]
-                                                                                .highlightRequired &&
-                                                                                'highlight-required'}`}
-                                                                        >
-                                                                            {
-                                                                                description[1]
-                                                                                    .description
-                                                                            }
-                                                                        </Feedback>
-                                                                    )}
-                                                                </td>
-                                                                {/*Success case*/}
-                                                                <td>
-                                                                    <input
-                                                                        key={`Pass__${commandIndex}__${assertionIndex}`}
-                                                                        type="radio"
-                                                                        id={`pass-${commandIndex}-${assertionIndex}`}
-                                                                        name={`result-${commandIndex}-${assertionIndex}`}
-                                                                        aria-labelledby={`pass-${commandIndex}-${assertionIndex}-label assertion-${commandIndex}-${assertionIndex}`}
-                                                                        autoFocus={
-                                                                            isSubmitted &&
-                                                                            passChoice.focus
-                                                                        }
-                                                                        defaultChecked={
-                                                                            passChoice.checked
-                                                                        }
-                                                                        onClick={
-                                                                            passChoice.click
-                                                                        }
-                                                                    />
-                                                                    <label
-                                                                        id={`pass-${commandIndex}-${assertionIndex}-label`}
-                                                                        htmlFor={`pass-${commandIndex}-${assertionIndex}`}
-                                                                    >
-                                                                        {
-                                                                            passChoice
-                                                                                .label[0]
-                                                                        }
-                                                                        <Feedback
-                                                                            className={`${passChoice
-                                                                                .label[1]
-                                                                                .offScreen &&
-                                                                                'off-screen'}`}
-                                                                        >
-                                                                            {
-                                                                                passChoice
-                                                                                    .label[1]
-                                                                                    .description
-                                                                            }
-                                                                        </Feedback>
-                                                                    </label>
-                                                                </td>
-                                                                {/*Failure cases*/}
-                                                                <td>
-                                                                    <input
-                                                                        key={`Missing__${commandIndex}__${assertionIndex}`}
-                                                                        type="radio"
-                                                                        id={`missing-${commandIndex}-${assertionIndex}`}
-                                                                        name={`result-${commandIndex}-${assertionIndex}`}
-                                                                        aria-labelledby={`missing-${commandIndex}-${assertionIndex}-label assertion-${commandIndex}-${assertionIndex}`}
-                                                                        autoFocus={
-                                                                            isSubmitted &&
-                                                                            missingChoice.focus
-                                                                        }
-                                                                        defaultChecked={
-                                                                            missingChoice.checked
-                                                                        }
-                                                                        onClick={
-                                                                            missingChoice.click
-                                                                        }
-                                                                    />
-                                                                    <label
-                                                                        id={`missing-${commandIndex}-${assertionIndex}-label`}
-                                                                        htmlFor={`missing-${commandIndex}-${assertionIndex}`}
-                                                                    >
-                                                                        {
-                                                                            missingChoice
-                                                                                .label[0]
-                                                                        }
-                                                                        <Feedback
-                                                                            className={`${missingChoice
-                                                                                .label[1]
-                                                                                .offScreen &&
-                                                                                'off-screen'}`}
-                                                                        >
-                                                                            {
-                                                                                missingChoice
-                                                                                    .label[1]
-                                                                                    .description
-                                                                            }
-                                                                        </Feedback>
-                                                                    </label>
-
-                                                                    <input
-                                                                        key={`Fail__${commandIndex}__${assertionIndex}`}
-                                                                        type="radio"
-                                                                        id={`fail-${commandIndex}-${assertionIndex}`}
-                                                                        name={`result-${commandIndex}-${assertionIndex}`}
-                                                                        aria-labelledby={`fail-${commandIndex}-${assertionIndex}-label assertion-${commandIndex}-${assertionIndex}`}
-                                                                        autoFocus={
-                                                                            isSubmitted &&
-                                                                            failureChoice.focus
-                                                                        }
-                                                                        defaultChecked={
-                                                                            failureChoice.checked
-                                                                        }
-                                                                        onClick={
-                                                                            failureChoice.click
-                                                                        }
-                                                                    />
-                                                                    <label
-                                                                        id={`fail-${commandIndex}-${assertionIndex}-label`}
-                                                                        htmlFor={`fail-${commandIndex}-${assertionIndex}`}
-                                                                    >
-                                                                        {
-                                                                            failureChoice
-                                                                                .label[0]
-                                                                        }
-                                                                        <Feedback
-                                                                            className={`${failureChoice
-                                                                                .label[1]
-                                                                                .offScreen &&
-                                                                                'off-screen'}`}
-                                                                        >
-                                                                            {
-                                                                                failureChoice
-                                                                                    .label[1]
-                                                                                    .description
-                                                                            }
-                                                                        </Feedback>
-                                                                    </label>
-                                                                </td>
-                                                            </tr>
-                                                        );
-                                                    }
-                                                )}
-                                            </tbody>
-                                        </Table>
+                                        <h4
+                                            id={`assertions-heading-command-${commandIndex}`}
+                                        >
+                                            Assertions {header}
+                                        </h4>
+                                        <AssertionFieldsetList
+                                            aria-labelledby={`assertions-heading-command-${commandIndex}`}
+                                        >
+                                            {assertions.map((data, index) => (
+                                                <Assertion
+                                                    key={`assertion-${commandIndex}-${index}`}
+                                                    data={data}
+                                                    assertionIndex={index}
+                                                    commandIndex={commandIndex}
+                                                />
+                                            ))}
+                                        </AssertionFieldsetList>
                                         {/*Unexpected Behaviors*/}
                                         <Fieldset
                                             id={`cmd-${commandIndex}-problems`}
                                         >
-                                            {unexpectedBehaviors.description[0]}
+                                            <legend>
+                                                {
+                                                    unexpectedBehaviors
+                                                        .description[0]
+                                                }
+                                            </legend>
                                             {isSubmitted && (
                                                 <Feedback
                                                     className={`${unexpectedBehaviors
@@ -982,6 +968,7 @@ const TestRenderer = ({
                                                             more,
                                                             change
                                                         } = option;
+
                                                         return (
                                                             <Fragment
                                                                 key={`AssertionOptionsKey_${optionIndex}`}