diff --git a/monkey/monkey_island/cc/ui/src/components/Main.js b/monkey/monkey_island/cc/ui/src/components/Main.js
index 982791782..3a51103c9 100644
--- a/monkey/monkey_island/cc/ui/src/components/Main.js
+++ b/monkey/monkey_island/cc/ui/src/components/Main.js
@@ -29,6 +29,8 @@ let infectionMonkeyImage = require('../images/infection-monkey.svg');
 let guardicoreLogoImage = require('../images/guardicore-logo.png');
 let notificationIcon = require('../images/notification-logo-512x512.png');
 
+const reportZeroTrustPath = '/report/zero_trust';
+
 class AppComponent extends AuthComponent {
   updateStatus = () => {
     this.auth.loggedIn()
@@ -200,7 +202,7 @@ class AppComponent extends AuthComponent {
               {this.renderRoute('/infection/telemetry', <TelemetryPage onStatusChange={this.updateStatus}/>)}
               {this.renderRoute('/start-over', <StartOverPage onStatusChange={this.updateStatus}/>)}
               {this.renderRoute('/report/security', <ReportPage onStatusChange={this.updateStatus}/>)}
-              {this.renderRoute('/report/zero_trust', <ZeroTrustReportPage onStatusChange={this.updateStatus}/>)}
+              {this.renderRoute(reportZeroTrustPath, <ZeroTrustReportPage onStatusChange={this.updateStatus}/>)}
               {this.renderRoute('/license', <LicensePage onStatusChange={this.updateStatus}/>)}
             </Col>
           </Row>
@@ -211,8 +213,9 @@ class AppComponent extends AuthComponent {
 
   showInfectionDoneNotification() {
     if (this.state.completedSteps.infection_done) {
-      let hostname = window.location.hostname;
-      let url = `https://${hostname}:5000/report`;
+      const hostname = window.location.hostname;
+      const port = window.location.port;
+      let url = `https://${hostname}:${port}/${reportZeroTrustPath}`;
       console.log("Trying to show notification. URL: " + url + " | icon: " + notificationIcon);
 
       Notifier.start(
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
index 143120793..34c18eb26 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
@@ -27,19 +27,18 @@ class ZeroTrustReportLegend extends Component {
 
   getLegendContent() {
     return <div id={this.constructor.name}>
-      <h4>Statuses</h4>
       <ul style={{listStyle: "none"}}>
         <li>
           <div style={{display: "inline-block"}}>
             <StatusLabel showText={true} status={ZeroTrustStatuses.failed}/>
           </div>
-          {"\t"}Some tests failed; the monkeys found something wrong.
+          {"\t"}At least one of the tests related to this component failed. This means that the Infection Monkey detected an unmet Zero Trust requirement.
         </li>
         <li>
           <div style={{display: "inline-block"}}>
             <StatusLabel showText={true} status={ZeroTrustStatuses.inconclusive}/>
           </div>
-          {"\t"}The test ran; manual verification is required to determine the results.
+          {"\t"}At least one of the tests’ results related to this component requires further manual verification.
         </li>
         <li>
           <div style={{display: "inline-block"}}>
@@ -55,7 +54,7 @@ class ZeroTrustReportLegend extends Component {
         </li>
       </ul>
       <hr />
-      Some of the tests can be activated using the <NavLink to="/configuration"><u>configuration</u></NavLink>.
+      To activate more tests, go to the Monkey <NavLink to="/configuration"><u>configuration</u></NavLink> page.n
     </div>;
   }
 }