diff --git a/components/data-table/__docs__/__snapshots__/storybook-stories.storyshot b/components/data-table/__docs__/__snapshots__/storybook-stories.storyshot
index 449f7c6b39..d7d4fd94c1 100644
--- a/components/data-table/__docs__/__snapshots__/storybook-stories.storyshot
+++ b/components/data-table/__docs__/__snapshots__/storybook-stories.storyshot
@@ -1042,962 +1042,1375 @@ exports[`DOM snapshots SLDSDataTable Advanced Single Select (Fixed Header) 1`] =
   className="slds-p-around_medium"
 >
   <div>
-    <table
-      className="slds-table slds-table_fixed-layout slds-table_resizable-cols slds-table_bordered"
-      id="DataTableExample-SingleRequiredSelect"
-      onBlur={[Function]}
-      role="grid"
+    <div
+      className="slds-table_header-fixed_container"
+      onScroll={[Function]}
+      style={
+        Object {
+          "borderTop": "1px solid rgb(221, 219, 218)",
+          "height": "100%",
+        }
+      }
     >
-      <thead>
-        <tr
-          className="slds-line-height_reset"
+      <div
+        className="slds-table_header-fixed_scroller"
+        style={
+          Object {
+            "height": "100%",
+            "overflow": "auto",
+          }
+        }
+      >
+        <table
+          className="slds-table slds-table_fixed-layout slds-table_header-fixed slds-table_resizable-cols slds-table_bordered"
+          id="DataTableExample-SingleRequiredSelect"
+          onBlur={[Function]}
+          role="grid"
         >
-          <th
-            className="slds-text-align_right"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={
-              Object {
-                "height": null,
-                "lineHeight": null,
-                "width": "3.25rem",
-              }
-            }
-          >
-            <div
-              className="slds-truncate slds-assistive-text"
-              id="DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
-              title="Choose a row to select"
-            >
-              Choose a row to select
-            </div>
-          </th>
-          <th
-            aria-label="Name"
-            aria-sort="ascending"
-            className="slds-is-sortable slds-is-sorted"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={
-              Object {
-                "height": null,
-                "lineHeight": null,
-                "width": "10rem",
-              }
-            }
-          >
-            <a
-              className="slds-th__action slds-text-link_reset"
-              href="#"
-              onClick={[Function]}
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex="-1"
-            >
-              <span
-                className="slds-assistive-text"
-              >
-                sort this column
-                 
-              </span>
-              <span
-                className="slds-truncate"
-                title="Name"
-              >
-                Name
-              </span>
-              <span>
-                <svg
-                  aria-hidden="true"
-                  className="slds-is-sortable__icon slds-icon slds-icon_x-small slds-icon-text-default"
-                >
-                  <use
-                    href="/assets/icons/utility-sprite/svg/symbols.svg#arrowup"
-                  />
-                </svg>
-                
-              </span>
-              <span
-                aria-atomic="true"
-                className="slds-assistive-text"
-              >
-                asc
-              </span>
-            </a>
-          </th>
-          <th
-            aria-label="Account Name"
-            aria-sort="none"
-            className=""
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={
-              Object {
-                "height": null,
-                "lineHeight": null,
-                "width": "8rem",
-              }
-            }
-          >
-            <span
-              className="slds-p-horizontal_x-small slds-th__action"
-              style={
-                Object {
-                  "display": "flex",
-                }
-              }
+          <thead>
+            <tr
+              className="slds-line-height_reset"
             >
-              <span
-                className="slds-truncate"
-                title="Account Name"
-              >
-                Account Name
-              </span>
-            </span>
-          </th>
-          <th
-            aria-label="Close Date"
-            aria-sort="none"
-            className=""
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={null}
-          >
-            <span
-              className="slds-p-horizontal_x-small slds-th__action"
-              style={
-                Object {
-                  "display": "flex",
+              <th
+                className="slds-text-align_right"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": "3.25rem",
+                  }
                 }
-              }
-            >
-              <span
-                className="slds-truncate"
-                title="Close Date"
               >
-                Close Date
-              </span>
-            </span>
-          </th>
-          <th
-            aria-label="Stage"
-            aria-sort="none"
-            className=""
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={null}
-          >
-            <span
-              className="slds-p-horizontal_x-small slds-th__action"
-              style={
-                Object {
-                  "display": "flex",
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <div
+                    className="slds-truncate slds-assistive-text"
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
+                    title="Choose a row to select"
+                  >
+                    Choose a row to select
+                  </div>
+                </div>
+              </th>
+              <th
+                aria-label="Name"
+                aria-sort="ascending"
+                className="slds-is-sortable slds-is-sorted"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": "10rem",
+                  }
                 }
-              }
-            >
-              <span
-                className="slds-truncate"
-                title="Stage"
-              >
-                Stage
-              </span>
-            </span>
-          </th>
-          <th
-            aria-label="Confidence"
-            aria-sort="none"
-            className="slds-is-sortable"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={null}
-          >
-            <a
-              className="slds-th__action slds-text-link_reset"
-              href="#"
-              onClick={[Function]}
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              role="button"
-              tabIndex="-1"
-            >
-              <span
-                className="slds-assistive-text"
               >
-                sort this column
-                 
-              </span>
-              <span
-                className="slds-truncate"
-                title="Confidence"
+                <a
+                  className="slds-th__action slds-text-link_reset"
+                  href="#"
+                  onClick={[Function]}
+                  onKeyDown={[Function]}
+                  role="button"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-assistive-text"
+                  >
+                    sort this column
+                     
+                  </span>
+                  <span
+                    className="slds-truncate"
+                    title="Name"
+                  >
+                    Name
+                  </span>
+                  <span>
+                    <svg
+                      aria-hidden="true"
+                      className="slds-is-sortable__icon slds-icon slds-icon_x-small slds-icon-text-default"
+                    >
+                      <use
+                        href="/assets/icons/utility-sprite/svg/symbols.svg#arrowup"
+                      />
+                    </svg>
+                    
+                  </span>
+                  <span
+                    aria-atomic="true"
+                    className="slds-assistive-text"
+                  >
+                    asc
+                  </span>
+                </a>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <a
+                    className="slds-th__action slds-text-link_reset"
+                    href="#"
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    role="button"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex="-1"
+                  >
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      sort this column
+                       
+                    </span>
+                    <span
+                      className="slds-truncate"
+                      title="Name"
+                    >
+                      Name
+                    </span>
+                    <span>
+                      <svg
+                        aria-hidden="true"
+                        className="slds-is-sortable__icon slds-icon slds-icon_x-small slds-icon-text-default"
+                      >
+                        <use
+                          href="/assets/icons/utility-sprite/svg/symbols.svg#arrowup"
+                        />
+                      </svg>
+                      
+                    </span>
+                    <span
+                      aria-atomic="true"
+                      className="slds-assistive-text"
+                    >
+                      asc
+                    </span>
+                  </a>
+                </div>
+              </th>
+              <th
+                aria-label="Account Name"
+                aria-sort="none"
+                className=""
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": "8rem",
+                  }
+                }
+              >
+                <span
+                  className="slds-p-horizontal_x-small slds-th__action"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-truncate"
+                    title="Account Name"
+                  >
+                    Account Name
+                  </span>
+                </span>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-p-horizontal_x-small slds-th__action"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex={null}
+                  >
+                    <span
+                      className="slds-truncate"
+                      title="Account Name"
+                    >
+                      Account Name
+                    </span>
+                  </span>
+                </div>
+              </th>
+              <th
+                aria-label="Close Date"
+                aria-sort="none"
+                className=""
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": null,
+                  }
+                }
+              >
+                <span
+                  className="slds-p-horizontal_x-small slds-th__action"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-truncate"
+                    title="Close Date"
+                  >
+                    Close Date
+                  </span>
+                </span>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-p-horizontal_x-small slds-th__action"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex={null}
+                  >
+                    <span
+                      className="slds-truncate"
+                      title="Close Date"
+                    >
+                      Close Date
+                    </span>
+                  </span>
+                </div>
+              </th>
+              <th
+                aria-label="Stage"
+                aria-sort="none"
+                className=""
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": null,
+                  }
+                }
+              >
+                <span
+                  className="slds-p-horizontal_x-small slds-th__action"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-truncate"
+                    title="Stage"
+                  >
+                    Stage
+                  </span>
+                </span>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-p-horizontal_x-small slds-th__action"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex={null}
+                  >
+                    <span
+                      className="slds-truncate"
+                      title="Stage"
+                    >
+                      Stage
+                    </span>
+                  </span>
+                </div>
+              </th>
+              <th
+                aria-label="Confidence"
+                aria-sort="none"
+                className="slds-is-sortable"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": null,
+                  }
+                }
+              >
+                <a
+                  className="slds-th__action slds-text-link_reset"
+                  href="#"
+                  onClick={[Function]}
+                  onKeyDown={[Function]}
+                  role="button"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-assistive-text"
+                  >
+                    sort this column
+                     
+                  </span>
+                  <span
+                    className="slds-truncate"
+                    title="Confidence"
+                  >
+                    Confidence
+                  </span>
+                  <span>
+                    <svg
+                      aria-hidden="true"
+                      className="slds-is-sortable__icon slds-icon slds-icon_x-small slds-icon-text-default"
+                    >
+                      <use
+                        href="/assets/icons/utility-sprite/svg/symbols.svg#arrowup"
+                      />
+                    </svg>
+                    
+                  </span>
+                </a>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <a
+                    className="slds-th__action slds-text-link_reset"
+                    href="#"
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    role="button"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex="-1"
+                  >
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      sort this column
+                       
+                    </span>
+                    <span
+                      className="slds-truncate"
+                      title="Confidence"
+                    >
+                      Confidence
+                    </span>
+                    <span>
+                      <svg
+                        aria-hidden="true"
+                        className="slds-is-sortable__icon slds-icon slds-icon_x-small slds-icon-text-default"
+                      >
+                        <use
+                          href="/assets/icons/utility-sprite/svg/symbols.svg#arrowup"
+                        />
+                      </svg>
+                      
+                    </span>
+                  </a>
+                </div>
+              </th>
+              <th
+                aria-label="Amount"
+                aria-sort="none"
+                className=""
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": null,
+                  }
+                }
+              >
+                <span
+                  className="slds-p-horizontal_x-small slds-th__action"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-truncate"
+                    title="Amount"
+                  >
+                    Amount
+                  </span>
+                </span>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-p-horizontal_x-small slds-th__action"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex={null}
+                  >
+                    <span
+                      className="slds-truncate"
+                      title="Amount"
+                    >
+                      Amount
+                    </span>
+                  </span>
+                </div>
+              </th>
+              <th
+                aria-label="Contact"
+                aria-sort="none"
+                className=""
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": null,
+                  }
+                }
+              >
+                <span
+                  className="slds-p-horizontal_x-small slds-th__action"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-truncate"
+                    title="Contact"
+                  >
+                    Contact
+                  </span>
+                </span>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-p-horizontal_x-small slds-th__action"
+                    style={
+                      Object {
+                        "alignItems": "center",
+                        "display": "flex",
+                        "flex": "1 1 auto",
+                        "lineHeight": 1.25,
+                        "width": "100%",
+                      }
+                    }
+                    tabIndex={null}
+                  >
+                    <span
+                      className="slds-truncate"
+                      title="Contact"
+                    >
+                      Contact
+                    </span>
+                  </span>
+                </div>
+              </th>
+              <th
+                className=""
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                scope="col"
+                style={
+                  Object {
+                    "height": 0,
+                    "lineHeight": 0,
+                    "width": "3.25rem",
+                  }
+                }
+              >
+                <div
+                  className="slds-th__action"
+                  style={
+                    Object {
+                      "height": 0,
+                      "overflow": "hidden",
+                      "paddingBottom": 0,
+                      "paddingTop": 0,
+                      "visibility": "hidden",
+                    }
+                  }
+                >
+                  <span
+                    className="slds-assistive-text"
+                  >
+                    actions
+                  </span>
+                </div>
+                <div
+                  className="slds-cell-fixed"
+                  style={
+                    Object {
+                      "display": "flex",
+                      "flexDirection": "row",
+                      "flexWrap": "nowrap",
+                      "lineHeight": "2rem",
+                    }
+                  }
+                >
+                  <div
+                    className="slds-th__action"
+                    style={
+                      Object {
+                        "lineHeight": 1,
+                        "width": "100%",
+                      }
+                    }
+                  >
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      actions
+                    </span>
+                  </div>
+                </div>
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr
+              aria-selected="false"
+              className="slds-hint-parent"
+            >
+              <td
+                className="slds-text-align_right"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "3.25rem",
+                  }
+                }
               >
-                Confidence
-              </span>
-              <span>
-                <svg
-                  aria-hidden="true"
-                  className="slds-is-sortable__icon slds-icon slds-icon_x-small slds-icon-text-default"
+                <span
+                  className="slds-radio slds-m-right_x-small"
                 >
-                  <use
-                    href="/assets/icons/utility-sprite/svg/symbols.svg#arrowup"
+                  <input
+                    aria-labelledby="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow-label DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
+                    checked={false}
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow"
+                    name="DataTableExample-SingleRequiredSelect-SelectRow"
+                    onChange={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onKeyPress={[Function]}
+                    tabIndex="-1"
+                    type="radio"
                   />
-                </svg>
-                
-              </span>
-            </a>
-          </th>
-          <th
-            aria-label="Amount"
-            aria-sort="none"
-            className=""
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={null}
-          >
-            <span
-              className="slds-p-horizontal_x-small slds-th__action"
-              style={
-                Object {
-                  "display": "flex",
+                  <label
+                    className="slds-radio__label"
+                    htmlFor="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow"
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow-label"
+                  >
+                    <span
+                      className="slds-radio_faux"
+                    />
+                    <span
+                      className="slds-form-element__label"
+                    />
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      Select this row 1
+                    </span>
+                  </label>
+                </span>
+              </td>
+              <th
+                className=""
+                data-label="Name"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "10rem",
+                  }
                 }
-              }
-            >
-              <span
-                className="slds-truncate"
-                title="Amount"
+                tabIndex="0"
               >
-                Amount
-              </span>
-            </span>
-          </th>
-          <th
-            aria-label="Contact"
-            aria-sort="none"
-            className=""
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={null}
-          >
-            <span
-              className="slds-p-horizontal_x-small slds-th__action"
-              style={
-                Object {
-                  "display": "flex",
+                <div
+                  className="slds-truncate"
+                  title="Acme - 1,200 Widgets"
+                >
+                  <a
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    tabIndex="-1"
+                  >
+                    Acme - 1,200 Widgets
+                  </a>
+                </div>
+              </th>
+              <td
+                className=""
+                data-label="Account Name"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "8rem",
+                  }
                 }
-              }
-            >
-              <span
-                className="slds-truncate"
-                title="Contact"
               >
-                Contact
-              </span>
-            </span>
-          </th>
-          <th
-            className=""
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            scope="col"
-            style={
-              Object {
-                "height": null,
-                "lineHeight": null,
-                "width": "3.25rem",
-              }
-            }
-          >
-            <div
-              className="slds-th__action"
-              style={null}
-            >
-              <span
-                className="slds-assistive-text"
+                <div
+                  className="slds-truncate"
+                  title="Acme"
+                >
+                  Acme
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Close Date"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
               >
-                actions
-              </span>
-            </div>
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr
-          aria-selected="false"
-          className="slds-hint-parent"
-        >
-          <td
-            className="slds-text-align_right"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "3.25rem",
-              }
-            }
-          >
-            <span
-              className="slds-radio slds-m-right_x-small"
+                <div
+                  className="slds-truncate"
+                  title="4/10/15"
+                >
+                  4/10/15
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Stage"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="Value Proposition"
+                >
+                  Value Proposition
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Confidence"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="70%"
+                >
+                  70%
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Amount"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="$25,000,000"
+                >
+                  $25,000,000
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Contact"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="jrogers@acme.com"
+                >
+                  <a
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    tabIndex="-1"
+                  >
+                    jrogers@acme.com
+                  </a>
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Actions"
+                onClick={[Function]}
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "3.25rem",
+                  }
+                }
+              >
+                <div
+                  className="slds-dropdown-trigger slds-dropdown-trigger_click"
+                  id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SLDSDataTableRowActions"
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onKeyDown={[Function]}
+                  onMouseEnter={null}
+                  onMouseLeave={null}
+                >
+                  <button
+                    aria-expanded={false}
+                    aria-haspopup={true}
+                    className="slds-button slds-button_icon-border-filled slds-button_icon-small ignore-click-DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SLDSDataTableRowActions slds-button_icon-x-small"
+                    disabled={false}
+                    onClick={[Function]}
+                    tabIndex="-1"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      className="slds-button__icon slds-button__icon_hint"
+                    >
+                      <use
+                        href="/assets/icons/utility-sprite/svg/symbols.svg#down"
+                      />
+                    </svg>
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      Actions
+                    </span>
+                  </button>
+                </div>
+              </td>
+            </tr>
+            <tr
+              aria-selected="false"
+              className="slds-hint-parent"
             >
-              <input
-                aria-labelledby="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow-label DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
-                checked={false}
-                id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow"
-                name="DataTableExample-SingleRequiredSelect-SelectRow"
-                onChange={[Function]}
-                onClick={[Function]}
+              <td
+                className="slds-text-align_right"
                 onFocus={[Function]}
-                onKeyPress={[Function]}
-                tabIndex="-1"
-                type="radio"
-              />
-              <label
-                className="slds-radio__label"
-                htmlFor="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow"
-                id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SelectRow-label"
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "3.25rem",
+                  }
+                }
               >
                 <span
-                  className="slds-radio_faux"
-                />
-                <span
-                  className="slds-form-element__label"
-                />
-                <span
-                  className="slds-assistive-text"
+                  className="slds-radio slds-m-right_x-small"
                 >
-                  Select this row 1
+                  <input
+                    aria-labelledby="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow-label DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
+                    checked={false}
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow"
+                    name="DataTableExample-SingleRequiredSelect-SelectRow"
+                    onChange={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onKeyPress={[Function]}
+                    tabIndex="-1"
+                    type="radio"
+                  />
+                  <label
+                    className="slds-radio__label"
+                    htmlFor="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow"
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow-label"
+                  >
+                    <span
+                      className="slds-radio_faux"
+                    />
+                    <span
+                      className="slds-form-element__label"
+                    />
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      Select this row 2
+                    </span>
+                  </label>
                 </span>
-              </label>
-            </span>
-          </td>
-          <th
-            className=""
-            data-label="Name"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "10rem",
-              }
-            }
-            tabIndex="0"
-          >
-            <div
-              className="slds-truncate"
-              title="Acme - 1,200 Widgets"
-            >
-              <a
+              </td>
+              <th
+                className=""
+                data-label="Name"
                 onFocus={[Function]}
                 onKeyDown={[Function]}
-                tabIndex="-1"
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "10rem",
+                  }
+                }
               >
-                Acme - 1,200 Widgets
-              </a>
-            </div>
-          </th>
-          <td
-            className=""
-            data-label="Account Name"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "8rem",
-              }
-            }
-          >
-            <div
-              className="slds-truncate"
-              title="Acme"
-            >
-              Acme
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Close Date"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="4/10/15"
-            >
-              4/10/15
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Stage"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="Value Proposition"
-            >
-              Value Proposition
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Confidence"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="70%"
-            >
-              70%
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Amount"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="$25,000,000"
-            >
-              $25,000,000
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Contact"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="jrogers@acme.com"
-            >
-              <a
+                <div
+                  className="slds-truncate"
+                  title="Acme - 200 Widgets"
+                >
+                  <a
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    tabIndex="-1"
+                  >
+                    Acme - 200 Widgets
+                  </a>
+                </div>
+              </th>
+              <td
+                className=""
+                data-label="Account Name"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "8rem",
+                  }
+                }
+              >
+                <div
+                  className="slds-truncate"
+                  title="Acme"
+                >
+                  Acme
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Close Date"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="1/31/15"
+                >
+                  1/31/15
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Stage"
                 onFocus={[Function]}
                 onKeyDown={[Function]}
-                tabIndex="-1"
-              >
-                jrogers@acme.com
-              </a>
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Actions"
-            onClick={[Function]}
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "3.25rem",
-              }
-            }
-          >
-            <div
-              className="slds-dropdown-trigger slds-dropdown-trigger_click"
-              id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SLDSDataTableRowActions"
-              onClick={[Function]}
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseEnter={null}
-              onMouseLeave={null}
-            >
-              <button
-                aria-expanded={false}
-                aria-haspopup={true}
-                className="slds-button slds-button_icon-border-filled slds-button_icon-small ignore-click-DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV80-SLDSDataTableRowActions slds-button_icon-x-small"
-                disabled={false}
-                onClick={[Function]}
-                tabIndex="-1"
-                type="button"
+                role="gridcell"
+                style={null}
               >
-                <svg
-                  aria-hidden="true"
-                  className="slds-button__icon slds-button__icon_hint"
-                >
-                  <use
-                    href="/assets/icons/utility-sprite/svg/symbols.svg#down"
-                  />
-                </svg>
-                <span
-                  className="slds-assistive-text"
+                <div
+                  className="slds-truncate"
+                  title="Prospecting"
                 >
-                  Actions
-                </span>
-              </button>
-            </div>
-          </td>
-        </tr>
-        <tr
-          aria-selected="false"
-          className="slds-hint-parent"
-        >
-          <td
-            className="slds-text-align_right"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "3.25rem",
-              }
-            }
-          >
-            <span
-              className="slds-radio slds-m-right_x-small"
-            >
-              <input
-                aria-labelledby="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow-label DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
-                checked={false}
-                id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow"
-                name="DataTableExample-SingleRequiredSelect-SelectRow"
-                onChange={[Function]}
-                onClick={[Function]}
+                  Prospecting
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Confidence"
                 onFocus={[Function]}
-                onKeyPress={[Function]}
-                tabIndex="-1"
-                type="radio"
-              />
-              <label
-                className="slds-radio__label"
-                htmlFor="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow"
-                id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SelectRow-label"
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
               >
-                <span
-                  className="slds-radio_faux"
-                />
-                <span
-                  className="slds-form-element__label"
-                />
-                <span
-                  className="slds-assistive-text"
+                <div
+                  className="slds-truncate"
+                  title="30%"
                 >
-                  Select this row 2
-                </span>
-              </label>
-            </span>
-          </td>
-          <th
-            className=""
-            data-label="Name"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "10rem",
-              }
-            }
-          >
-            <div
-              className="slds-truncate"
-              title="Acme - 200 Widgets"
-            >
-              <a
+                  30%
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Amount"
                 onFocus={[Function]}
                 onKeyDown={[Function]}
-                tabIndex="-1"
+                role="gridcell"
+                style={null}
               >
-                Acme - 200 Widgets
-              </a>
-            </div>
-          </th>
-          <td
-            className=""
-            data-label="Account Name"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "8rem",
-              }
-            }
-          >
-            <div
-              className="slds-truncate"
-              title="Acme"
-            >
-              Acme
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Close Date"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="1/31/15"
-            >
-              1/31/15
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Stage"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="Prospecting"
-            >
-              Prospecting
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Confidence"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="30%"
-            >
-              30%
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Amount"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="$5,000,000"
-            >
-              $5,000,000
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Contact"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="bob@acme.com"
-            >
-              <a
+                <div
+                  className="slds-truncate"
+                  title="$5,000,000"
+                >
+                  $5,000,000
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Contact"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="bob@acme.com"
+                >
+                  <a
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    tabIndex="-1"
+                  >
+                    bob@acme.com
+                  </a>
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Actions"
+                onClick={[Function]}
                 onFocus={[Function]}
                 onKeyDown={[Function]}
-                tabIndex="-1"
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "3.25rem",
+                  }
+                }
               >
-                bob@acme.com
-              </a>
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Actions"
-            onClick={[Function]}
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "3.25rem",
-              }
-            }
-          >
-            <div
-              className="slds-dropdown-trigger slds-dropdown-trigger_click"
-              id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SLDSDataTableRowActions"
-              onClick={[Function]}
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseEnter={null}
-              onMouseLeave={null}
+                <div
+                  className="slds-dropdown-trigger slds-dropdown-trigger_click"
+                  id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SLDSDataTableRowActions"
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onKeyDown={[Function]}
+                  onMouseEnter={null}
+                  onMouseLeave={null}
+                >
+                  <button
+                    aria-expanded={false}
+                    aria-haspopup={true}
+                    className="slds-button slds-button_icon-border-filled slds-button_icon-small ignore-click-DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SLDSDataTableRowActions slds-button_icon-x-small"
+                    disabled={false}
+                    onClick={[Function]}
+                    tabIndex="-1"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      className="slds-button__icon slds-button__icon_hint"
+                    >
+                      <use
+                        href="/assets/icons/utility-sprite/svg/symbols.svg#down"
+                      />
+                    </svg>
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      Actions
+                    </span>
+                  </button>
+                </div>
+              </td>
+            </tr>
+            <tr
+              aria-selected="false"
+              className="slds-hint-parent"
             >
-              <button
-                aria-expanded={false}
-                aria-haspopup={true}
-                className="slds-button slds-button_icon-border-filled slds-button_icon-small ignore-click-DataTableExample-SingleRequiredSelect-SLDSDataTableRow-5GJOOOPWU7-SLDSDataTableRowActions slds-button_icon-x-small"
-                disabled={false}
-                onClick={[Function]}
-                tabIndex="-1"
-                type="button"
+              <td
+                className="slds-text-align_right"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "3.25rem",
+                  }
+                }
               >
-                <svg
-                  aria-hidden="true"
-                  className="slds-button__icon slds-button__icon_hint"
-                >
-                  <use
-                    href="/assets/icons/utility-sprite/svg/symbols.svg#down"
-                  />
-                </svg>
                 <span
-                  className="slds-assistive-text"
+                  className="slds-radio slds-m-right_x-small"
                 >
-                  Actions
+                  <input
+                    aria-labelledby="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow-label DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
+                    checked={false}
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow"
+                    name="DataTableExample-SingleRequiredSelect-SelectRow"
+                    onChange={[Function]}
+                    onClick={[Function]}
+                    onFocus={[Function]}
+                    onKeyPress={[Function]}
+                    tabIndex="-1"
+                    type="radio"
+                  />
+                  <label
+                    className="slds-radio__label"
+                    htmlFor="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow"
+                    id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow-label"
+                  >
+                    <span
+                      className="slds-radio_faux"
+                    />
+                    <span
+                      className="slds-form-element__label"
+                    />
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      Select this row 3
+                    </span>
+                  </label>
                 </span>
-              </button>
-            </div>
-          </td>
-        </tr>
-        <tr
-          aria-selected="false"
-          className="slds-hint-parent"
-        >
-          <td
-            className="slds-text-align_right"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "3.25rem",
-              }
-            }
-          >
-            <span
-              className="slds-radio slds-m-right_x-small"
-            >
-              <input
-                aria-labelledby="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow-label DataTableExample-SingleRequiredSelect-SLDSDataTableHead-column-group-header-row-select"
-                checked={false}
-                id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow"
-                name="DataTableExample-SingleRequiredSelect-SelectRow"
-                onChange={[Function]}
-                onClick={[Function]}
+              </td>
+              <th
+                className=""
+                data-label="Name"
                 onFocus={[Function]}
-                onKeyPress={[Function]}
-                tabIndex="-1"
-                type="radio"
-              />
-              <label
-                className="slds-radio__label"
-                htmlFor="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow"
-                id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SelectRow-label"
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "10rem",
+                  }
+                }
               >
-                <span
-                  className="slds-radio_faux"
-                />
-                <span
-                  className="slds-form-element__label"
-                />
-                <span
-                  className="slds-assistive-text"
+                <div
+                  className="slds-truncate"
+                  title="salesforce.com - 1,000 Widgets"
+                >
+                  <a
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    tabIndex="-1"
+                  >
+                    salesforce.com - 1,000 Widgets
+                  </a>
+                </div>
+              </th>
+              <td
+                className=""
+                data-label="Account Name"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "8rem",
+                  }
+                }
+              >
+                <div
+                  className="slds-truncate"
+                  title="salesforce.com"
+                >
+                  salesforce.com
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Close Date"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="1/31/15 3:45PM"
+                >
+                  1/31/15 3:45PM
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Stage"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="Id. Decision Makers"
+                >
+                  Id. Decision Makers
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Confidence"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={null}
+              >
+                <div
+                  className="slds-truncate"
+                  title="60%"
                 >
-                  Select this row 3
-                </span>
-              </label>
-            </span>
-          </td>
-          <th
-            className=""
-            data-label="Name"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "10rem",
-              }
-            }
-          >
-            <div
-              className="slds-truncate"
-              title="salesforce.com - 1,000 Widgets"
-            >
-              <a
+                  60%
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Amount"
                 onFocus={[Function]}
                 onKeyDown={[Function]}
-                tabIndex="-1"
+                role="gridcell"
+                style={null}
               >
-                salesforce.com - 1,000 Widgets
-              </a>
-            </div>
-          </th>
-          <td
-            className=""
-            data-label="Account Name"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "8rem",
-              }
-            }
-          >
-            <div
-              className="slds-truncate"
-              title="salesforce.com"
-            >
-              salesforce.com
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Close Date"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="1/31/15 3:45PM"
-            >
-              1/31/15 3:45PM
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Stage"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="Id. Decision Makers"
-            >
-              Id. Decision Makers
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Confidence"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="60%"
-            >
-              60%
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Amount"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="$25,000"
-            >
-              $25,000
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Contact"
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={null}
-          >
-            <div
-              className="slds-truncate"
-              title="nathan@salesforce.com"
-            >
-              <a
+                <div
+                  className="slds-truncate"
+                  title="$25,000"
+                >
+                  $25,000
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Contact"
                 onFocus={[Function]}
                 onKeyDown={[Function]}
-                tabIndex="-1"
+                role="gridcell"
+                style={null}
               >
-                nathan@salesforce.com
-              </a>
-            </div>
-          </td>
-          <td
-            className=""
-            data-label="Actions"
-            onClick={[Function]}
-            onFocus={[Function]}
-            onKeyDown={[Function]}
-            role="gridcell"
-            style={
-              Object {
-                "width": "3.25rem",
-              }
-            }
-          >
-            <div
-              className="slds-dropdown-trigger slds-dropdown-trigger_click"
-              id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SLDSDataTableRowActions"
-              onClick={[Function]}
-              onFocus={[Function]}
-              onKeyDown={[Function]}
-              onMouseEnter={null}
-              onMouseLeave={null}
-            >
-              <button
-                aria-expanded={false}
-                aria-haspopup={true}
-                className="slds-button slds-button_icon-border-filled slds-button_icon-small ignore-click-DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SLDSDataTableRowActions slds-button_icon-x-small"
-                disabled={false}
+                <div
+                  className="slds-truncate"
+                  title="nathan@salesforce.com"
+                >
+                  <a
+                    onFocus={[Function]}
+                    onKeyDown={[Function]}
+                    tabIndex="-1"
+                  >
+                    nathan@salesforce.com
+                  </a>
+                </div>
+              </td>
+              <td
+                className=""
+                data-label="Actions"
                 onClick={[Function]}
-                tabIndex="-1"
-                type="button"
+                onFocus={[Function]}
+                onKeyDown={[Function]}
+                role="gridcell"
+                style={
+                  Object {
+                    "width": "3.25rem",
+                  }
+                }
               >
-                <svg
-                  aria-hidden="true"
-                  className="slds-button__icon slds-button__icon_hint"
-                >
-                  <use
-                    href="/assets/icons/utility-sprite/svg/symbols.svg#down"
-                  />
-                </svg>
-                <span
-                  className="slds-assistive-text"
+                <div
+                  className="slds-dropdown-trigger slds-dropdown-trigger_click"
+                  id="DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SLDSDataTableRowActions"
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                  onKeyDown={[Function]}
+                  onMouseEnter={null}
+                  onMouseLeave={null}
                 >
-                  Actions
-                </span>
-              </button>
-            </div>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+                  <button
+                    aria-expanded={false}
+                    aria-haspopup={true}
+                    className="slds-button slds-button_icon-border-filled slds-button_icon-small ignore-click-DataTableExample-SingleRequiredSelect-SLDSDataTableRow-8IKZHZZV81-SLDSDataTableRowActions slds-button_icon-x-small"
+                    disabled={false}
+                    onClick={[Function]}
+                    tabIndex="-1"
+                    type="button"
+                  >
+                    <svg
+                      aria-hidden="true"
+                      className="slds-button__icon slds-button__icon_hint"
+                    >
+                      <use
+                        href="/assets/icons/utility-sprite/svg/symbols.svg#down"
+                      />
+                    </svg>
+                    <span
+                      className="slds-assistive-text"
+                    >
+                      Actions
+                    </span>
+                  </button>
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>
 `;
diff --git a/components/data-table/__examples__/advanced-single-select-fixed-header.jsx b/components/data-table/__examples__/advanced-single-select-fixed-header.jsx
index c26ef74e68..87babc5b0a 100644
--- a/components/data-table/__examples__/advanced-single-select-fixed-header.jsx
+++ b/components/data-table/__examples__/advanced-single-select-fixed-header.jsx
@@ -117,6 +117,7 @@ class Example extends React.Component {
 							selectRow: 'Select this row',
 						}}
 						fixedLayout
+						fixedHeader
 						keyboardNavigation
 						items={this.state.items}
 						id="DataTableExample-SingleRequiredSelect"
diff --git a/components/data-table/private/head.jsx b/components/data-table/private/head.jsx
index 1171c20a12..b1b970a472 100644
--- a/components/data-table/private/head.jsx
+++ b/components/data-table/private/head.jsx
@@ -143,7 +143,7 @@ class DataTableHead extends React.Component {
 			let render = null;
 
 			if (canSelectRows === 'radio') {
-				render = (
+				render = !ariaHidden ? (
 					<div
 						className="slds-truncate slds-assistive-text"
 						id={`${this.props.id}-column-group-header-row-select`}
@@ -151,7 +151,7 @@ class DataTableHead extends React.Component {
 					>
 						{this.props.assistiveText.selectRowGroup}
 					</div>
-				);
+				) : null;
 			} else if (canSelectRows === true || canSelectRows === 'checkbox') {
 				render = (
 					<div
diff --git a/package-lock.json b/package-lock.json
index ab5bd703de..1e103f50aa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4830,6 +4830,12 @@
 				"minimist": "^1.2.0"
 			}
 		},
+		"@discoveryjs/json-ext": {
+			"version": "0.5.7",
+			"resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+			"integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+			"dev": true
+		},
 		"@emotion/cache": {
 			"version": "10.0.29",
 			"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-10.0.29.tgz",
@@ -13127,6 +13133,27 @@
 				"@xtuc/long": "4.2.2"
 			}
 		},
+		"@webpack-cli/configtest": {
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz",
+			"integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==",
+			"dev": true
+		},
+		"@webpack-cli/info": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz",
+			"integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==",
+			"dev": true,
+			"requires": {
+				"envinfo": "^7.7.3"
+			}
+		},
+		"@webpack-cli/serve": {
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz",
+			"integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==",
+			"dev": true
+		},
 		"@wojtekmaj/enzyme-adapter-react-17": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/@wojtekmaj/enzyme-adapter-react-17/-/enzyme-adapter-react-17-0.6.1.tgz",
@@ -17545,12 +17572,6 @@
 			"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
 			"dev": true
 		},
-		"detect-file": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-			"integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-			"dev": true
-		},
 		"detect-indent": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
@@ -18077,6 +18098,12 @@
 			"integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
 			"dev": true
 		},
+		"envinfo": {
+			"version": "7.8.1",
+			"resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz",
+			"integrity": "sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==",
+			"dev": true
+		},
 		"enzyme": {
 			"version": "3.11.0",
 			"resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
@@ -20050,15 +20077,6 @@
 				}
 			}
 		},
-		"expand-tilde": {
-			"version": "2.0.2",
-			"resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-			"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-			"dev": true,
-			"requires": {
-				"homedir-polyfill": "^1.0.1"
-			}
-		},
 		"expect": {
 			"version": "24.9.0",
 			"resolved": "https://registry.npmjs.org/expect/-/expect-24.9.0.tgz",
@@ -20523,6 +20541,12 @@
 			"integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
 			"dev": true
 		},
+		"fastest-levenshtein": {
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz",
+			"integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==",
+			"dev": true
+		},
 		"fastq": {
 			"version": "1.11.0",
 			"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz",
@@ -20857,18 +20881,6 @@
 				"semver-regex": "^2.0.0"
 			}
 		},
-		"findup-sync": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-			"integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-			"dev": true,
-			"requires": {
-				"detect-file": "^1.0.0",
-				"is-glob": "^4.0.0",
-				"micromatch": "^3.0.4",
-				"resolve-dir": "^1.0.1"
-			}
-		},
 		"flat": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz",
@@ -21619,19 +21631,6 @@
 				}
 			}
 		},
-		"global-prefix": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-			"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "^2.0.2",
-				"homedir-polyfill": "^1.0.1",
-				"ini": "^1.3.4",
-				"is-windows": "^1.0.1",
-				"which": "^1.2.14"
-			}
-		},
 		"globals": {
 			"version": "11.12.0",
 			"resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -31248,6 +31247,52 @@
 				"util.promisify": "^1.0.0"
 			}
 		},
+		"rechoir": {
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+			"integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+			"dev": true,
+			"requires": {
+				"resolve": "^1.9.0"
+			},
+			"dependencies": {
+				"has": {
+					"version": "1.0.3",
+					"resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+					"integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+					"dev": true,
+					"requires": {
+						"function-bind": "^1.1.1"
+					}
+				},
+				"is-core-module": {
+					"version": "2.9.0",
+					"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+					"integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+					"dev": true,
+					"requires": {
+						"has": "^1.0.3"
+					}
+				},
+				"path-parse": {
+					"version": "1.0.7",
+					"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+					"integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+					"dev": true
+				},
+				"resolve": {
+					"version": "1.22.1",
+					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+					"integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+					"dev": true,
+					"requires": {
+						"is-core-module": "^2.9.0",
+						"path-parse": "^1.0.7",
+						"supports-preserve-symlinks-flag": "^1.0.0"
+					}
+				}
+			}
+		},
 		"recursive-readdir": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
@@ -31693,29 +31738,6 @@
 				}
 			}
 		},
-		"resolve-dir": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-			"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-			"dev": true,
-			"requires": {
-				"expand-tilde": "^2.0.0",
-				"global-modules": "^1.0.0"
-			},
-			"dependencies": {
-				"global-modules": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-					"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-					"dev": true,
-					"requires": {
-						"global-prefix": "^1.0.1",
-						"is-windows": "^1.0.1",
-						"resolve-dir": "^1.0.0"
-					}
-				}
-			}
-		},
 		"resolve-from": {
 			"version": "5.0.0",
 			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -34019,6 +34041,12 @@
 				}
 			}
 		},
+		"supports-preserve-symlinks-flag": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+			"integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+			"dev": true
+		},
 		"symbol-tree": {
 			"version": "3.2.4",
 			"resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
@@ -35548,12 +35576,6 @@
 			"integrity": "sha1-DwWkCu90+eWVHiDvv0SxGHHlZBA=",
 			"dev": true
 		},
-		"v8-compile-cache": {
-			"version": "2.1.1",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
-			"integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ==",
-			"dev": true
-		},
 		"v8flags": {
 			"version": "3.2.0",
 			"resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
@@ -35896,243 +35918,95 @@
 			}
 		},
 		"webpack-cli": {
-			"version": "3.3.12",
-			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
-			"integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
-			"dev": true,
-			"requires": {
-				"chalk": "^2.4.2",
-				"cross-spawn": "^6.0.5",
-				"enhanced-resolve": "^4.1.1",
-				"findup-sync": "^3.0.0",
-				"global-modules": "^2.0.0",
-				"import-local": "^2.0.0",
-				"interpret": "^1.4.0",
-				"loader-utils": "^1.4.0",
-				"supports-color": "^6.1.0",
-				"v8-compile-cache": "^2.1.1",
-				"yargs": "^13.3.2"
+			"version": "4.10.0",
+			"resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
+			"integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
+			"dev": true,
+			"requires": {
+				"@discoveryjs/json-ext": "^0.5.0",
+				"@webpack-cli/configtest": "^1.2.0",
+				"@webpack-cli/info": "^1.5.0",
+				"@webpack-cli/serve": "^1.7.0",
+				"colorette": "^2.0.14",
+				"commander": "^7.0.0",
+				"cross-spawn": "^7.0.3",
+				"fastest-levenshtein": "^1.0.12",
+				"import-local": "^3.0.2",
+				"interpret": "^2.2.0",
+				"rechoir": "^0.7.0",
+				"webpack-merge": "^5.7.3"
 			},
 			"dependencies": {
-				"ansi-regex": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-					"integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+				"colorette": {
+					"version": "2.0.19",
+					"resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
+					"integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
 					"dev": true
 				},
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"big.js": {
-					"version": "5.2.2",
-					"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-					"integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+				"commander": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+					"integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
 					"dev": true
 				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+				"cross-spawn": {
+					"version": "7.0.3",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					},
-					"dependencies": {
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						}
+						"path-key": "^3.1.0",
+						"shebang-command": "^2.0.0",
+						"which": "^2.0.1"
 					}
 				},
-				"cliui": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-					"integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+				"import-local": {
+					"version": "3.1.0",
+					"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
+					"integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
 					"dev": true,
 					"requires": {
-						"string-width": "^3.1.0",
-						"strip-ansi": "^5.2.0",
-						"wrap-ansi": "^5.1.0"
+						"pkg-dir": "^4.2.0",
+						"resolve-cwd": "^3.0.0"
 					}
 				},
-				"emojis-list": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-					"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
+				"path-key": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
 					"dev": true
 				},
-				"find-up": {
+				"resolve-cwd": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-					"integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+					"resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+					"integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
 					"dev": true,
 					"requires": {
-						"locate-path": "^3.0.0"
+						"resolve-from": "^5.0.0"
 					}
 				},
-				"get-caller-file": {
-					"version": "2.0.5",
-					"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-					"integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-					"dev": true
-				},
-				"interpret": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
-					"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
-					"dev": true
-				},
-				"is-fullwidth-code-point": {
+				"shebang-command": {
 					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
-				"json5": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
-					"integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-					"dev": true,
-					"requires": {
-						"minimist": "^1.2.0"
-					}
-				},
-				"loader-utils": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz",
-					"integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-					"dev": true,
-					"requires": {
-						"big.js": "^5.2.2",
-						"emojis-list": "^3.0.0",
-						"json5": "^1.0.1"
-					}
-				},
-				"locate-path": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-					"integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-					"dev": true,
-					"requires": {
-						"p-locate": "^3.0.0",
-						"path-exists": "^3.0.0"
-					}
-				},
-				"p-limit": {
-					"version": "2.3.0",
-					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-					"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 					"dev": true,
 					"requires": {
-						"p-try": "^2.0.0"
+						"shebang-regex": "^3.0.0"
 					}
 				},
-				"p-locate": {
+				"shebang-regex": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-					"integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-					"dev": true,
-					"requires": {
-						"p-limit": "^2.0.0"
-					}
-				},
-				"p-try": {
-					"version": "2.2.0",
-					"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-					"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-					"dev": true
-				},
-				"require-main-filename": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
-					"integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
-					"dev": true
-				},
-				"string-width": {
-					"version": "3.1.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-					"integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-					"dev": true,
-					"requires": {
-						"emoji-regex": "^7.0.1",
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^5.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "5.2.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-					"integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^4.1.0"
-					}
-				},
-				"supports-color": {
-					"version": "6.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-					"integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-					"dev": true,
-					"requires": {
-						"has-flag": "^3.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-					"integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.0",
-						"string-width": "^3.0.0",
-						"strip-ansi": "^5.0.0"
-					}
-				},
-				"y18n": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
-					"integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
+					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 					"dev": true
 				},
-				"yargs": {
-					"version": "13.3.2",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
-					"integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
-					"dev": true,
-					"requires": {
-						"cliui": "^5.0.0",
-						"find-up": "^3.0.0",
-						"get-caller-file": "^2.0.1",
-						"require-directory": "^2.1.1",
-						"require-main-filename": "^2.0.0",
-						"set-blocking": "^2.0.0",
-						"string-width": "^3.0.0",
-						"which-module": "^2.0.0",
-						"y18n": "^4.0.0",
-						"yargs-parser": "^13.1.2"
-					}
-				},
-				"yargs-parser": {
-					"version": "13.1.2",
-					"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
-					"integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
+				"which": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 					"dev": true,
 					"requires": {
-						"camelcase": "^5.0.0",
-						"decamelize": "^1.2.0"
+						"isexe": "^2.0.0"
 					}
 				}
 			}
@@ -36186,6 +36060,16 @@
 				"uuid": "^3.3.2"
 			}
 		},
+		"webpack-merge": {
+			"version": "5.8.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
+			"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+			"dev": true,
+			"requires": {
+				"clone-deep": "^4.0.1",
+				"wildcard": "^2.0.0"
+			}
+		},
 		"webpack-sources": {
 			"version": "1.4.3",
 			"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
@@ -36383,6 +36267,12 @@
 				}
 			}
 		},
+		"wildcard": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+			"dev": true
+		},
 		"window-size": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.3.0.tgz",
diff --git a/package.json b/package.json
index 38a54c67af..b5c0ad2160 100644
--- a/package.json
+++ b/package.json
@@ -215,7 +215,7 @@
 		"style-loader": "^2.0.0",
 		"terser-webpack-plugin": "^4.2.3",
 		"webpack": "^4.44.2",
-		"webpack-cli": "^3.x",
+		"webpack-cli": "^4.x",
 		"webpack-dev-middleware": "^3.7.2",
 		"webpack-hot-middleware": "^2.25.0",
 		"xml2js": "^0.4.23"