diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
index cec603f0e..c0d1f1bed 100755
--- a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
@@ -1,16 +1,14 @@
 import React, {Fragment} from 'react';
-import {Col, Grid, Row} from 'react-bootstrap';
+import {Col} from 'react-bootstrap';
 import AuthComponent from '../AuthComponent';
 import ReportHeader, {ReportTypes} from "../report-components/common/ReportHeader";
-import PillarsOverview from "../report-components/zerotrust/PillarOverview";
-import FindingsSection from "../report-components/zerotrust/FindingsSection";
-import SinglePillarRecommendationsStatus from "../report-components/zerotrust/SinglePillarRecommendationsStatus";
-import MonkeysStillAliveWarning from "../report-components/common/MonkeysStillAliveWarning";
 import ReportLoader from "../report-components/common/ReportLoader";
 import MustRunMonkeyWarning from "../report-components/common/MustRunMonkeyWarning";
 import PrintReportButton from "../report-components/common/PrintReportButton";
 import {extractExecutionStatusFromServerResponse} from "../report-components/common/ExecutionStatus";
-import ZeroTrustReportLegend from "../report-components/zerotrust/ReportLegend";
+import SummarySection from "../report-components/zerotrust/SummarySection";
+import FindingsSection from "../report-components/zerotrust/FindingsSection";
+import RecommendationsSection from "../report-components/zerotrust/RecommendationsSection";
 
 class ZeroTrustReportPageComponent extends AuthComponent {
 
@@ -25,7 +23,7 @@ class ZeroTrustReportPageComponent extends AuthComponent {
 
   componentDidMount() {
     this.updatePageState();
-    const refreshInterval = setInterval(this.updatePageState, 8000)
+    const refreshInterval = setInterval(this.updatePageState, 8000);
     this.setState(
       {refreshDataIntervalHandler: refreshInterval}
     )
@@ -73,9 +71,10 @@ class ZeroTrustReportPageComponent extends AuthComponent {
       content = <ReportLoader loading={true}/>;
     } else {
       content = <div id="MainContentSection">
-        {this.generateOverviewSection()}
-        {this.generateRecommendationsSection()}
-        {this.generateFindingsSection()}
+        <SummarySection allMonkeysAreDead={this.state.allMonkeysAreDead} pillars={this.state.pillars}/>
+        <RecommendationsSection recommendations={this.state.recommendations}
+                                pillarsToStatuses={this.state.pillars.pillarsToStatuses}/>
+        <FindingsSection pillarsToStatuses={this.state.pillars.pillarsToStatuses} findings={this.state.findings}/>
       </div>;
     }
 
@@ -100,75 +99,10 @@ class ZeroTrustReportPageComponent extends AuthComponent {
     )
   }
 
-  generateOverviewSection() {
-    return (<div id="overview-section">
-      <h2>Summary</h2>
-      <Grid fluid={true}>
-        <Row>
-          <Col xs={12} sm={12} md={12} lg={12}>
-            <MonkeysStillAliveWarning allMonkeysAreDead={this.state.allMonkeysAreDead}/>
-            <p>
-              Get a quick glance of the status for each of Zero Trust's seven pillars.
-            </p>
-          </Col>
-        </Row>
-        <Row className="show-grid">
-          <Col xs={8} sm={8} md={8} lg={8}>
-            <PillarsOverview pillarsToStatuses={this.state.pillars.pillarsToStatuses}
-                             grades={this.state.pillars.grades}/>
-          </Col>
-          <Col xs={4} sm={4} md={4} lg={4}>
-            <ZeroTrustReportLegend/>
-          </Col>
-        </Row>
-        <Row>
-          <Col xs={12} sm={12} md={12} lg={12}>
-            <h4>What am I seeing?</h4>
-            <p>
-              The <a href="https://www.forrester.com/report/The+Zero+Trust+eXtended+ZTX+Ecosystem/-/E-RES137210">Zero Trust eXtended framework</a> categorizes its <b>recommendations</b> into 7 <b>pillars</b>. Infection Monkey
-              Zero Trust edition tests some of those recommendations. The <b>tests</b> that the monkey executes
-              produce <b>findings</b>. The tests, recommendations and pillars are then granted a <b>status</b> in accordance
-              with the tests results.
-            </p>
-          </Col>
-        </Row>
-      </Grid>
-    </div>);
-  }
-
-  generateRecommendationsSection() {
-    return (<div id="recommendations-overview">
-      <h2>Recommendations</h2>
-      <p>
-        Analyze each zero trust recommendation by pillar, and see if you've followed through with it. See test results
-        to understand how the monkey tested your adherence to that recommendation.
-      </p>
-      {
-        Object.keys(this.state.recommendations).map((pillar) =>
-          <SinglePillarRecommendationsStatus
-            key={pillar}
-            pillar={pillar}
-            recommendationsStatus={this.state.recommendations[pillar]}
-            pillarsToStatuses={this.state.pillars.pillarsToStatuses}/>
-        )
-      }
-    </div>);
-  }
-
-  generateFindingsSection() {
-    return (<div id="findings-overview">
-      <h2>Findings</h2>
-      <p>
-        Deep-dive into the details of each test, and see the explicit events and exact timestamps in which things
-        happened in your network. This will enable you to match up with your SOC logs and alerts and to gain deeper
-        insight as to what exactly happened during this test.
-      </p>
-      <FindingsSection pillarsToStatuses={this.state.pillars.pillarsToStatuses} findings={this.state.findings}/>
-    </div>);
-  }
-
   stillLoadingDataFromServer() {
-    return typeof this.state.findings === "undefined" || typeof this.state.pillars === "undefined" || typeof this.state.recommendations === "undefined";
+    return typeof this.state.findings === "undefined"
+      || typeof this.state.pillars === "undefined"
+      || typeof this.state.recommendations === "undefined";
   }
 
   getZeroTrustReportFromServer() {
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsSection.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsSection.js
index eed4c0f8c..ebbd09dda 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsSection.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsSection.js
@@ -8,11 +8,17 @@ import {FindingsTable} from "./FindingsTable";
 class FindingsSection extends Component {
   render() {
     return (
-      <Fragment>
+      <div id="findings-overview">
+        <h2>Findings</h2>
+        <p>
+          Deep-dive into the details of each test, and see the explicit events and exact timestamps in which things
+          happened in your network. This will enable you to match up with your SOC logs and alerts and to gain deeper
+          insight as to what exactly happened during this test.
+        </p>
         <FindingsTable data={this.getFilteredFindings(ZeroTrustStatuses.failed)} status={ZeroTrustStatuses.failed}/>
         <FindingsTable data={this.getFilteredFindings(ZeroTrustStatuses.inconclusive)} status={ZeroTrustStatuses.inconclusive}/>
         <FindingsTable data={this.getFilteredFindings(ZeroTrustStatuses.passed)} status={ZeroTrustStatuses.passed}/>
-      </Fragment>
+      </div>
     );
   }
 
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsSection.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsSection.js
new file mode 100644
index 000000000..28fda3f2b
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsSection.js
@@ -0,0 +1,30 @@
+import React, {Component} from "react";
+import SinglePillarRecommendationsStatus from "./SinglePillarRecommendationsStatus";
+import * as PropTypes from "prop-types";
+
+export default class RecommendationsSection extends Component {
+  render() {
+
+    return <div id="recommendations-overview">
+      <h2>Recommendations</h2>
+      <p>
+        Analyze each zero trust recommendation by pillar, and see if you've followed through with it. See test results
+        to understand how the monkey tested your adherence to that recommendation.
+      </p>
+      {
+        Object.keys(this.props.recommendations).map((pillar) =>
+          <SinglePillarRecommendationsStatus
+            key={pillar}
+            pillar={pillar}
+            recommendationsStatus={this.props.recommendations[pillar]}
+            pillarsToStatuses={this.props.pillarsToStatuses}/>
+        )
+      }
+    </div>
+  }
+}
+
+RecommendationsSection.propTypes = {
+  recommendations: PropTypes.any,
+  pillarsToStatuses: PropTypes.any
+};
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js
new file mode 100644
index 000000000..4a56a8b9e
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SummarySection.js
@@ -0,0 +1,52 @@
+import React, {Component} from "react";
+import {Col, Grid, Row} from "react-bootstrap";
+import MonkeysStillAliveWarning from "../common/MonkeysStillAliveWarning";
+import PillarsOverview from "./PillarOverview";
+import ZeroTrustReportLegend from "./ReportLegend";
+import * as PropTypes from "prop-types";
+
+export default class SummarySection extends Component {
+  render() {
+    return <div id="summary-section">
+      <h2>Summary</h2>
+      <Grid fluid={true}>
+        <Row>
+          <Col xs={12} sm={12} md={12} lg={12}>
+            <MonkeysStillAliveWarning allMonkeysAreDead={this.props.allMonkeysAreDead}/>
+            <p>
+              Get a quick glance of the status for each of Zero Trust's seven pillars.
+            </p>
+          </Col>
+        </Row>
+        <Row className="show-grid">
+          <Col xs={8} sm={8} md={8} lg={8}>
+            <PillarsOverview pillarsToStatuses={this.props.pillars.pillarsToStatuses}
+                             grades={this.props.pillars.grades}/>
+          </Col>
+          <Col xs={4} sm={4} md={4} lg={4}>
+            <ZeroTrustReportLegend/>
+          </Col>
+        </Row>
+        <Row>
+          <Col xs={12} sm={12} md={12} lg={12}>
+            <h4>What am I seeing?</h4>
+            <p>
+              The <a href="https://www.forrester.com/report/The+Zero+Trust+eXtended+ZTX+Ecosystem/-/E-RES137210">Zero
+              Trust eXtended framework</a> categorizes its <b>recommendations</b> into 7 <b>pillars</b>. Infection
+              Monkey
+              Zero Trust edition tests some of those recommendations. The <b>tests</b> that the monkey executes
+              produce <b>findings</b>. The tests, recommendations and pillars are then granted a <b>status</b> in
+              accordance
+              with the tests results.
+            </p>
+          </Col>
+        </Row>
+      </Grid>
+    </div>
+  }
+}
+
+SummarySection.propTypes = {
+  allMonkeysAreDead: PropTypes.bool,
+  pillars: PropTypes.object
+};