diff --git a/CSETWebNg/src/app/assessment/questions/issues/issues.component.html b/CSETWebNg/src/app/assessment/questions/issues/issues.component.html
index 889738b867..8741f7e898 100644
--- a/CSETWebNg/src/app/assessment/questions/issues/issues.component.html
+++ b/CSETWebNg/src/app/assessment/questions/issues/issues.component.html
@@ -38,7 +38,7 @@ <h2 style="color: white;">Issues</h2>
         <div class="form-group">
           <label id="titleLabel" for="title" class="form-label font-weight-bold">Title</label>
           <input id="title" type="text" autocomplete="off" class="form-control" [disabled]="true"
-            [(ngModel)]="finding.title">
+            [(ngModel)]="observation.title">
         </div>
       </div>
       <div class="col">
@@ -46,7 +46,7 @@ <h2 style="color: white;">Issues</h2>
           <label for="issueType" class="form-label font-weight-bold">Issue Type</label>
           <span style="color: red;">*</span><span style="color: red; font-size: 10px;" *ngIf="this.showRequiredHelper">
             (required)</span>
-          <select name="issueType" id="issueType" class="form-control" [(ngModel)]="finding.type" required>
+          <select name="issueType" id="issueType" class="form-control" [(ngModel)]="observation.type" required>
             <option value="Examiner Finding">Examiner Finding</option>
             <option value="DOR">DOR</option>
             <option value="Supplemental Fact">Supplemental Fact</option>
@@ -55,19 +55,19 @@ <h2 style="color: white;">Issues</h2>
         </div>
       </div>
     </div>
-    <div class="row" *ngIf="finding.type !== 'Supplemental Fact'">
+    <div class="row" *ngIf="observation.type !== 'Supplemental Fact'">
       <div class="col-6">
         <div class="form-group">
           <label for="riskArea" class="form-label font-weight-bold">Risk Area</label>
           <input id="riskArea" type="text" autocomplete="off" class="form-control" [disabled]="true"
-            [(ngModel)]="finding.risk_Area">
+            [(ngModel)]="observation.risk_Area">
         </div>
       </div>
       <div class="col-6">
         <div class="form-group">
           <label for="subriskArea" class="form-label font-weight-bold">Sub Risk</label>
           <input id="subRisk" type="text" autocomplete="off" class="form-control" [disabled]="true"
-            [(ngModel)]="finding.sub_Risk">
+            [(ngModel)]="observation.sub_Risk">
         </div>
       </div>
     </div>
@@ -76,32 +76,32 @@ <h2 style="color: white;">Issues</h2>
         <div *ngIf="this.actionItems != null" class="form-group">
           <label for="description" class="form-label font-weight-bold">Description</label>
           <textarea id="description" type="text" rows="5" autocomplete="off" class="form-control"
-            [(ngModel)]="finding.description"></textarea>
+            [(ngModel)]="observation.description"></textarea>
         </div>
       </div>
     </div>
-    <ng-container *ngIf="finding.type === 'Supplemental Fact'">
+    <ng-container *ngIf="observation.type === 'Supplemental Fact'">
       <div class="row">
         <div class="col-12">
           <div class="form-group">
             <label for="suppGuide" class="form-label font-weight-bold">Supplemental Fact</label>
             <textarea id="suppGuide" type="text" rows="10" autocomplete="off" class="form-control"
-              [(ngModel)]="finding.supp_Guidance"></textarea>
+              [(ngModel)]="observation.supp_Guidance"></textarea>
           </div>
         </div>
       </div>
     </ng-container>
-    <ng-container *ngIf="finding.type !== 'Supplemental Fact'">
-      <div *ngIf="this.finding.auto_Generated === 0">
+    <ng-container *ngIf="observation.type !== 'Supplemental Fact'">
+      <div *ngIf="this.observation.auto_Generated === 0">
         <div class="row">
           <div class="col-12">
             <label for="manual-actions" class="form-label font-weight-bold">Action Items</label>
             <textarea id="manual-actions" type="text" rows="5" autocomplete="off" class="form-control"
-              [(ngModel)]="finding.actionItems"></textarea>
+              [(ngModel)]="observation.actionItems"></textarea>
           </div>
         </div>
       </div>
-      <div *ngIf="this.finding.auto_Generated === 1">
+      <div *ngIf="this.observation.auto_Generated === 1">
         <div class="mt-2 invalid-feedback d-block text-muted">
           <p>Items marked in red indicate a higher level of risk</p>
         </div>
@@ -146,7 +146,7 @@ <h2 style="color: white;">Issues</h2>
           <div class="form-group">
             <label for="additionalCitations" class="form-label font-weight-bold">Additional Citations</label>
             <input id="additionalCitations" type="text" autocomplete="off" class="form-control"
-              [(ngModel)]="finding.citations">
+              [(ngModel)]="observation.citations">
           </div>
         </div>
       </div>
@@ -155,7 +155,7 @@ <h2 style="color: white;">Issues</h2>
   </mat-dialog-content>
 
   <mat-dialog-actions class="p-3 mb-0">
-    <button style="margin-left: 0%;" [disabled]="finding.auto_Generated == 1 || !isIssueEmpty()" mat-button
+    <button style="margin-left: 0%;" [disabled]="observation.auto_Generated == 1 || !isIssueEmpty()" mat-button
       class="btn btn-secondary" (click)="cancel()">Cancel</button>
 
     <button style="margin-left: auto;" mat-button class="btn btn-primary" (click)="update()">Done</button>
diff --git a/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html b/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html
index 2c4e6ea984..78f540994f 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html
+++ b/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.html
@@ -199,27 +199,27 @@
                                 <th style="width:5%;"></th>
                                 <th style="width:5%;"></th>
                             </tr>
-                            <tr *ngFor="let find of extras?.observations; let i = index"
+                            <tr *ngFor="let obs of extras?.observations; let i = index"
                                 style="box-sizing: content-box;height:20px;">
                                 <td>
                                     <div>Issue {{ i+1 }}</div>
                                 </td>
                                 <td style="height:20px">
-                                    <div>{{find.title}}</div>
+                                    <div>{{obs.title}}</div>
                                 </td>
                                 <td style="text-align: center">
-                                    <div *ngIf="find.auto_Generated === 1">Yes</div>
-                                    <div *ngIf="find.auto_Generated === 0"> - </div>
+                                    <div *ngIf="obs.auto_Generated === 1">Yes</div>
+                                    <div *ngIf="obs.auto_Generated === 0"> - </div>
                                 </td>
                                 <td>
                                     <button class="icon-button fs-base cursor-pointer" aria-label="Edit"
-                                        (click)="addEditIssue(q.parentQuestionId, find.finding_Id)">
+                                        (click)="addEditIssue(q.parentQuestionId, obs.observation_Id)">
                                         <span class="mr-1 cset-icons-pencil"></span>
                                     </button>
                                 </td>
                                 <td>
                                     <button class="icon-button fs-base cursor-pointer" aria-label="Delete"
-                                        (click)="deleteIssue(find.finding_Id, false)">
+                                        (click)="deleteIssue(obs.observation_Id, false)">
                                         <span class="mr-1 cset-icons-trash-can"></span>
                                     </button>
                                 </td>
diff --git a/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.ts b/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.ts
index 931eba3c67..55dc411aec 100644
--- a/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.ts
+++ b/CSETWebNg/src/app/assessment/questions/question-block-ise/question-block-ise.component.ts
@@ -131,16 +131,16 @@ export class QuestionBlockIseComponent implements OnInit {
           this.extras = details;
           this.extras.questionId = this.myGrouping.questions[0].questionId;
 
-          this.extras.observations.forEach(find => {
-            if (find.auto_Generated === 1) {
-              find.question_Id = this.myGrouping.questions[0].questionId;
+          this.extras.observations.forEach(obs => {
+            if (obs.auto_Generated === 1) {
+              obs.question_Id = this.myGrouping.questions[0].questionId;
 
               // This is a check for post-merging ISE assessments.
               // If an issue existed, but all answers were changed to "Yes" on merge, delete the issue.
-              if (this.ncuaSvc.questionCheck.get(find.question_Id) !== undefined) {
-                this.ncuaSvc.issueFindingId.set(find.question_Id, find.observation_Id);
+              if (this.ncuaSvc.questionCheck.get(obs.question_Id) !== undefined) {
+                this.ncuaSvc.issueObservationId.set(obs.question_Id, obs.observation_Id);
               } else {
-                this.deleteIssue(find.observation_Id, true);
+                this.deleteIssue(obs.observation_Id, true);
               }
 
             }
@@ -225,15 +225,15 @@ export class QuestionBlockIseComponent implements OnInit {
     });
   }
 
-  deleteIssueMaps(findingId: number) {
-    const iterator = this.ncuaSvc.issueFindingId.entries();
+  deleteIssueMaps(observation: number) {
+    const iterator = this.ncuaSvc.issueObservationId.entries();
     let parentKey = 0;
 
     for (let value of iterator) {
-      if (value[1] === findingId) {
+      if (value[1] === observation) {
         parentKey = value[0];
         this.ncuaSvc.questionCheck.delete(parentKey);
-        this.ncuaSvc.issueFindingId.delete(parentKey);
+        this.ncuaSvc.issueObservationId.delete(parentKey);
         this.ncuaSvc.deleteHistory.add(parentKey);
       }
     }
@@ -338,7 +338,7 @@ export class QuestionBlockIseComponent implements OnInit {
       value++;
       this.ncuaSvc.questionCheck.set(q.parentQuestionId, value);
 
-      if (value >= 1 && !this.ncuaSvc.issueFindingId.has(q.parentQuestionId)) {
+      if (value >= 1 && !this.ncuaSvc.issueObservationId.has(q.parentQuestionId)) {
         if (!this.ncuaSvc.deleteHistory.has(q.parentQuestionId)) {
           this.autoGenerateIssue(q.parentQuestionId, 0);
         }
@@ -348,10 +348,10 @@ export class QuestionBlockIseComponent implements OnInit {
       if (value < 1) {
         this.ncuaSvc.questionCheck.delete(q.parentQuestionId);
 
-        if (this.ncuaSvc.issueFindingId.has(q.parentQuestionId)) {
-          let findId = this.ncuaSvc.issueFindingId.get(q.parentQuestionId);
-          this.ncuaSvc.issueFindingId.delete(q.parentQuestionId);
-          this.deleteIssue(findId, true);
+        if (this.ncuaSvc.issueObservationId.has(q.parentQuestionId)) {
+          let observationId = this.ncuaSvc.issueObservationId.get(q.parentQuestionId);
+          this.ncuaSvc.issueObservationId.delete(q.parentQuestionId);
+          this.deleteIssue(observationId, true);
         }
       } else {
         this.ncuaSvc.questionCheck.set(q.parentQuestionId, value);
@@ -741,9 +741,9 @@ export class QuestionBlockIseComponent implements OnInit {
 
   /**
    *
-   * @param findid
+   * @param observationid
    */
-  addEditIssue(parentId, findid) {
+  addEditIssue(parentId, observationId) {
     /* 
     * Per the customer's requests, an Issue's title should include the main 
     * grouping header text and the sub grouping header text.
@@ -758,11 +758,11 @@ export class QuestionBlockIseComponent implements OnInit {
       name = ("Cybersecurity Controls, " + this.myGrouping.title);
     }
 
-    const find: Observation = {
+    const observation: Observation = {
       question_Id: parentId,
       questionType: this.myGrouping.questions[0].questionType,
       answer_Id: this.myGrouping.questions[0].answer_Id,
-      observation_Id: findid,
+      observation_Id: observationId,
       summary: '',
       observation_Contacts: null,
       impact: '',
@@ -784,28 +784,28 @@ export class QuestionBlockIseComponent implements OnInit {
     };
 
     this.dialog.open(IssuesComponent, {
-      data: find,
+      data: observation,
       disableClose: true,
     }).afterClosed().subscribe(result => {
       let stringResult = result.toString();
       if (stringResult != 'true') {
-        find.observation_Id = result;
+        observation.observation_Id = result;
 
-        this.observationSvc.saveObservation(find, true).subscribe((r: any) => {
+        this.observationSvc.saveObservation(observation, true).subscribe((r: any) => {
           this.myGrouping.questions[0].hasObservation = (this.extras.observations.length > 0);
-          this.myGrouping.questions[0].answer_Id = find.answer_Id;
+          this.myGrouping.questions[0].answer_Id = observation.answer_Id;
         });
 
       }
       else {
-        const answerID = find.answer_Id;
+        const answerID = observation.answer_Id;
         // if (result == true) {
         this.observationSvc.getAllObservations(answerID).subscribe(
 
           (response: Observation[]) => {
             this.extras.observations = response;
             this.myGrouping.questions[0].hasObservation = (this.extras.observations.length > 0);
-            this.myGrouping.questions[0].answer_Id = find.answer_Id;
+            this.myGrouping.questions[0].answer_Id = observation.answer_Id;
           }
         ),
 
@@ -816,20 +816,19 @@ export class QuestionBlockIseComponent implements OnInit {
 
   }
 
-  isIssueEmpty(finding: Observation) {
-    if (finding.actionItems == null
-      && finding.citations == null
-      && finding.description == null
-      && finding.issue == null
-      && finding.type == null) {
+  isIssueEmpty(observation: Observation) {
+    if (observation.actionItems == null
+      && observation.citations == null
+      && observation.description == null
+      && observation.issue == null
+      && observation.type == null) {
       return true;
     }
     return false;
   }
 
   // ISE "issues" should be generated if an examiner answers 'No' to
-  // 2 or more important questions with no popup.
-  autoGenerateIssue(parentId, findId) {
+  autoGenerateIssue(parentId, observationId) {
     let name = "";
     let desc = "";
 
@@ -839,16 +838,16 @@ export class QuestionBlockIseComponent implements OnInit {
       name = ("Cybersecurity Controls, " + this.myGrouping.title);
     }
 
-    this.questionsSvc.getActionItems(parentId, findId).subscribe(
+    this.questionsSvc.getActionItems(parentId, observationId).subscribe(
       (data: any) => {
         // Used to generate a description for ISE reports even if a user doesn't open the issue.
         desc = data[0]?.description;
 
-        const find: Observation = {
+        const obs: Observation = {
           question_Id: parentId,
           questionType: this.myGrouping.questions[0].questionType,
           answer_Id: this.myGrouping.questions[0].answer_Id,
-          observation_Id: findId,
+          observation_Id: observationId,
           summary: '',
           observation_Contacts: null,
           impact: '',
@@ -869,20 +868,20 @@ export class QuestionBlockIseComponent implements OnInit {
           supp_Guidance: null
         };
 
-        this.ncuaSvc.issueFindingId.set(parentId, findId);
+        this.ncuaSvc.issueObservationId.set(parentId, observationId);
 
-        this.observationSvc.saveObservation(find).subscribe(() => {
-          const answerID = find.answer_Id;
+        this.observationSvc.saveObservation(obs).subscribe(() => {
+          const answerID = obs.answer_Id;
           this.observationSvc.getAllObservations(answerID).subscribe(
             (response: Observation[]) => {
               for (let i = 0; i < response.length; i++) {
                 if (response[i].auto_Generated === 1) {
-                  this.ncuaSvc.issueFindingId.set(parentId, response[i].observation_Id);
+                  this.ncuaSvc.issueObservationId.set(parentId, response[i].observation_Id);
                 }
               }
               this.extras.observations = response;
               this.myGrouping.questions[0].hasObservation = (this.extras.observations.length > 0);
-              this.myGrouping.questions[0].answer_Id = find.answer_Id;
+              this.myGrouping.questions[0].answer_Id = obs.answer_Id;
             },
             error => console.log('Error updating observations | ' + (<Error>error).message)
           );
diff --git a/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.html b/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.html
index 293f805ace..e964df7ca9 100644
--- a/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.html
+++ b/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.html
@@ -20,32 +20,141 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   SOFTWARE.
 -------------------------->
+<!-- State Led -->
+<div *ngIf="assessSvc.assessment.isE_StateLed">
+    <div *ngIf="!isAssessmentPageFilled() || disableIseReportLinks || ncuaSvc.unassignedIssues">
+        <div class="alert-warning mt-2 mb-2 d-flex flex-row justify-content-center align-items-center flex-11a ng-star-inserted">
+            <span class="p-md-3 p-2 fs-medium cset-icons-exclamation-triangle"></span>
+            <span class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
+
+                <div class="mt-2 mr-4" *ngIf="!isAssessmentPageFilled()">
+                    The following required fields are missing from the "Demographics" page:
+                    <ul class="list-type">
+                        <span *ngFor="let field of missingFields; let i = index">
+                            <li>{{ field }}</li>
+                        </span>
+                    </ul>
+                </div>
+
+                <div class="mt-2 mr-4" *ngIf="disableIseReportLinks">
+                    There are unanswered statements. Some domains will be incomplete.
+                    <br /><br />
+                </div>
+
+                <div class="mt-2 mr-4" *ngIf="ncuaSvc.unassignedIssues">
+                    Some reports are disabled until all Issues have
+                    an "Issue Type" assigned.<br /><br />
+
+                    Assign an "Issue Type" to the following issues which were
+                    <br />generated on the "Statements" page:
+                    <ul class="list-type">
+                        <span *ngFor="let title of ncuaSvc.unassignedIssueTitles; let i = index">
+                            <li>{{ title }}</li>
+                        </span>
+                    </ul>
+                </div>
+
+            </span>
+        </div>
+    </div>
+</div>
+
+<!-- Not State Led -->
+<div *ngIf="!assessSvc.assessment.isE_StateLed">
+    <div *ngIf="!isAssessmentPageFilled() || disableIseReportLinks || ncuaSvc.unassignedIssues">
+        <div class="alert-warning mt-2 mb-2 d-flex flex-row justify-content-center align-items-center flex-11a ng-star-inserted">
+            <span class="p-md-3 p-2 fs-medium cset-icons-exclamation-triangle"></span>
+            <span class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
+
+                <div class="mt-2 mr-4">"Submit" button and some reports are disabled until all issues are resolved</div>
+                <br />
+
+                <div class="mt-2 mr-4" *ngIf="!isAssessmentPageFilled()">
+                    The following required fields are missing from the "Demographics" page:
+                    <ul class="list-type">
+                        <span *ngFor="let field of missingFields; let i = index">
+                            <li>{{ field }}</li>
+                        </span>
+                    </ul>
+                </div>
+
+                <div class="mt-2 mr-4" *ngIf="disableIseReportLinks">
+                    There are unanswered examination statements that need to be answered.
+                    <br /><br />
+                </div>
+
+                <div class="mt-2 mr-4" *ngIf="ncuaSvc.unassignedIssues">
+                    All Issues require an "Issue Type" to be assigned. Assign an "Issue Type" <br />
+                    to the following issues which were generated on the "Statements" page:
+                    <ul class="list-type">
+                        <span *ngFor="let title of ncuaSvc.unassignedIssueTitles; let i = index">
+                            <li>{{ title }}</li>
+                        </span>
+                    </ul>
+                </div>
+
+            </span>
+        </div>
+    </div>
+</div>
+
+<!-- If we have no issues and we are not state led, check for submission status -->
+<div *ngIf="!assessSvc.assessment.isE_StateLed">
+    <div *ngIf="(isAssessmentPageFilled() && !disableIseReportLinks && !ncuaSvc.unassignedIssues)">
+        <div *ngIf="(!iseHasBeenSubmitted && !ncuaSvc.iseHasBeenSubmitted)">
+            <div class="alert-warning mt-2 mb-2 d-flex flex-row justify-content-center align-items-center flex-11a ng-star-inserted">
+                <span class="p-md-3 p-2 fs-medium cset-icons-exclamation-triangle"></span>
+                <div class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
+                    This assessment has not been submitted yet. If this assessment is complete, please click submit.
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+
+
+<!--
 
 <div *ngIf="disableIseReportLinks || ncuaSvc.unassignedIssues
     || (!isAssessmentPageFilled() && !assessSvc.assessment.isE_StateLed); else readyToSubmit"
     class="alert-warning mt-2 mb-2 d-flex flex-row justify-content-center align-items-center flex-11a ng-star-inserted">
     <span class="p-md-3 p-2 fs-medium cset-icons-exclamation-triangle"></span>
 
-    <!-- Don't submit to MERIT without a Credit Union name or asset value above $0
-        If state-led, we don't care because submit button is hidden -->
+    Don't submit to MERIT without a Credit Union name or asset value above $0
+        If state-led, we don't care about the submit button, because it's hidden
     <span *ngIf="!isAssessmentPageFilled()" class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
 
-        <span class="mt-2 mr-4" *ngIf="!disableIseReportLinks && !ncuaSvc.unassignedIssues">
-            "Submit" button is disabled until all required fields on <br>the
-            "Demographics" page have been specified.
-            <br><br>
-            <span>The following required fields are missing from the "Demographics" page:</span>
-            <ul class="list-type">
-                <span *ngFor="let field of missingFields; let i = index">
-                    <li>{{ field }}</li>
-                </span>
-            </ul>
-        </span>
+        <div class="!ncuaSvc.isE_StateLed">
+            <span class="mt-2 mr-4" *ngIf="!disableIseReportLinks && !ncuaSvc.unassignedIssues">
+                "Submit" button is disabled until all required fields on <br>the
+                "Demographics" page have been specified.
+                <br><br>
+                <span>The following required fields are missing from the "Demographics" page:</span>
+                <ul class="list-type">
+                    <span *ngFor="let field of missingFields; let i = index">
+                        <li>{{ field }}</li>
+                    </span>
+                </ul>
+            </span>
+        </div>
+
+        <div class="ncuaSvc.isE_StateLed">
+            <span class="mt-2 mr-4" *ngIf="!disableIseReportLinks && !ncuaSvc.unassignedIssues">
+                <span>The following required fields are missing from the "Demographics" page:</span>
+                <ul class="list-type">
+                    <span *ngFor="let field of missingFields; let i = index">
+                        <li>{{ field }}</li>
+                    </span>
+                </ul>
+            </span>
+        </div>
 
         <span *ngIf="disableIseReportLinks">
-            <!-- have all 3 types of warnings -->
+             have all 3 types of warnings 
             <span *ngIf="ncuaSvc.unassignedIssues"><br />
-                <!-- non-state-led -->
+                 non-state-led 
                 <span *ngIf="!assessSvc.assessment.isE_StateLed">
                     "Submit" button and some reports are disabled until
                     <ul class="list-type">
@@ -61,20 +170,27 @@
                         </span>
                     </ul>
                 </span>
-                <!-- state-led -->
-                <span *ngIf="assessSvc.assessment.isE_StateLed">
+                 state-led 
+                <span class="mt-2 mr-4" *ngIf="assessSvc.assessment.isE_StateLed">
+                    <span>The following required fields are missing from the "Demographics" page:</span>
+                    <ul class="list-type">
+                        <span *ngFor="let field of missingFields; let i = index">
+                            <li>{{ field }}</li>
+                        </span>
+                    </ul>
+                    
                     There are unanswered statements. Some domains will be incomplete.
                     <br /><br />
                     Some reports are disabled until all Issues have
                     an "Issue Type" assigned.<br /><br />
                 </span>
 
-                <!-- singular -->
+                 singular 
                 <span *ngIf="ncuaSvc.unassignedIssueTitles.length == 1">
                     Assign an "Issue Type" to the following issue which was
                     <br />generated on the "Statements" page:
                 </span>
-                <!-- plural -->
+                 plural 
                 <span *ngIf="ncuaSvc.unassignedIssueTitles.length > 1">
                     Assign an "Issue Type" to the following issues which were
                     <br />generated on the "Statements" page:
@@ -86,9 +202,9 @@
                     </span>
                 </ul>
             </span>
-            <!-- Assessment COnfig and Unanswered Statements -->
+             Assessment Config and Unanswered Statements
             <span *ngIf="!ncuaSvc.unassignedIssues">
-                <!-- non-state-led -->
+                 non-state-led
                 <span *ngIf="!assessSvc.assessment.isE_StateLed">
                     <br />"Submit" button and some reports are disabled until
                     <ul class="list-type">
@@ -103,9 +219,17 @@
                         </span>
                     </ul>
                 </span>
-                <!-- state-led -->
+                 state-led
                 <span *ngIf="assessSvc.assessment.isE_StateLed">
+                    <span class="mt-2 mr-4">
+                        <span>The following required fields are missing from the "Demographics" page:</span>
+                        <ul class="list-type">
+                            <span *ngFor="let field of missingFields; let i = index">
+                                <li>{{ field }}</li>
+                            </span>
+                        </ul>
                     There are unanswered statements. Some domains will be incomplete.
+                    </span>
                 </span>
             </span>
 
@@ -113,40 +237,47 @@
     </span>
 
     <span *ngIf="disableIseReportLinks && !ncuaSvc.unassignedIssues && isAssessmentPageFilled()">
-        <!-- Submit and reports disabled because unanswered statements -->
+         Submit and reports disabled because unanswered statements 
         <span *ngIf="!assessSvc.assessment.isE_StateLed && isAssessmentPageFilled(); else stateLedUnanswered"
             class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
             "Submit" button and some reports are disabled until all statements have been answered.
         </span>
 
-        <!-- can get here in the case it's state-led and isAssessmentPageFilled() is false, but we don't care 
-        about isAssessmentPageFilled() if it's state-led, so the below section can be skipped -->
+         can get here in the case it's state-led and isAssessmentPageFilled() is false 
         <span *ngIf="assessSvc.assessment.isE_StateLed"
             class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
+            <span class="mt-2 mr-4">
+                <span>The following required fields are missing from the "Demographics" page:</span>
+                <ul class="list-type">
+                    <span *ngFor="let field of missingFields; let i = index">
+                        <li>{{ field }}</li>
+                    </span>
+                </ul>
             There are unanswered statements. Some domains will be incomplete.
+            </span>
         </span>
     </span>
 
 
-    <!-- only Issue Type warning -->
+     only Issue Type warning 
     <span *ngIf="(!disableIseReportLinks && ncuaSvc.unassignedIssues) && isAssessmentPageFilled()"
         class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a">
-        <!-- non-state-led -->
+         non-state-led
         <span *ngIf="!assessSvc.assessment.isE_StateLed">
             <br />"Submit" button and some reports are disabled until all
             Issues have an "Issue Type" assigned.<br /><br />
         </span>
-        <!-- state-led -->
+         state-led 
         <span *ngIf="assessSvc.assessment.isE_StateLed">
             <br />Some reports are disabled until all
             Issues have an "Issue Type" assigned.<br /><br />
         </span>
-        <!-- singular -->
+         singular
         <span *ngIf="ncuaSvc.unassignedIssueTitles.length == 1">
             Assign an "Issue Type" to the following issue which was
             <br />generated on the "Statements" page:
         </span>
-        <!-- plural -->
+         plural
         <span *ngIf="ncuaSvc.unassignedIssueTitles.length > 1">
             Assign an "Issue Type" to the following issues which were
             <br />generated on the "Statements" page:
@@ -158,10 +289,10 @@
         </ul>
     </span>
 
-    <!-- Unanswered Statements and Issue Types (also with state-led and Issue Type) -->
+     Unanswered Statements and Issue Types (also with state-led and Issue Type) 
     <span *ngIf="ncuaSvc.unassignedIssues && disableIseReportLinks && isAssessmentPageFilled()"
         class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a"><br />
-        <!-- Unanswered and Issue Type for non-state-led -->
+        Unanswered and Issue Type for non-state-led 
         <span *ngIf="!assessSvc.assessment.isE_StateLed">
             "Submit" button and some reports are disabled until
             <ul class="list-type">
@@ -170,7 +301,7 @@
             </ul>
         </span>
 
-        <!-- Unanswered and Issue Type for state-led -->
+         Unanswered and Issue Type for state-led
         <span *ngIf="assessSvc.assessment.isE_StateLed">
             There are unanswered statements. Some domains will be incomplete.
             <br /><br />
@@ -178,12 +309,12 @@
             an "Issue Type" assigned.<br /><br />
         </span>
 
-        <!-- singular -->
+        singular
         <span *ngIf="ncuaSvc.unassignedIssueTitles.length == 1">
             Assign an "Issue Type" to the following issue which was
             <br />generated on the "Statements" page:
         </span>
-        <!-- plural -->
+         plural 
         <span *ngIf="ncuaSvc.unassignedIssueTitles.length > 1">
             Assign an "Issue Type" to the following issues which were
             <br />generated on the "Statements" page:
@@ -196,10 +327,10 @@
         </ul>
     </span>
 
-    <!-- Assessment Config and Issue Types -->
+     Assessment Config and Issue Types
     <span *ngIf="!isAssessmentPageFilled() && ncuaSvc.unassignedIssues && !disableIseReportLinks"
         class="fs-base-2 p-2 d-flex flex-column justify-content-center flex-11a"><br />
-        <!-- Assessment Config and Issue Type for non-state-led -->
+     Assessment Config and Issue Type for non-state-led
         <span *ngIf="!assessSvc.assessment.isE_StateLed">
             "Submit" button and some reports are disabled until
             <ul class="list-type">
@@ -216,18 +347,26 @@
             <br>
         </span>
 
-        <!-- Unanswered and Issue Type for state-led -->
+         Unanswered and Issue Type for state-led
         <span *ngIf="assessSvc.assessment.isE_StateLed">
+            <span class="mt-2 mr-4">
+                <span>The following required fields are missing from the "Demographics" page:</span>
+                <ul class="list-type">
+                    <span *ngFor="let field of missingFields; let i = index">
+                        <li>{{ field }}</li>
+                    </span>
+                </ul>
+            </span><br>
             Some reports are disabled until all Issues have
             an "Issue Type" assigned<br /><br />
         </span>
 
-        <!-- singular -->
+        singular
         <span *ngIf="ncuaSvc.unassignedIssueTitles.length == 1">
             Assign an "Issue Type" to the following issue which was
             <br />generated on the "Statements" page:
         </span>
-        <!-- plural -->
+        plural
         <span *ngIf="ncuaSvc.unassignedIssueTitles.length > 1">
             Assign an "Issue Type" to the following issues which were
             <br />generated on the "Statements" page:
@@ -242,8 +381,8 @@
 
 </div>
 
-<!-- If no warnings exist that disable the "Submit" button, check if it has already been submitted 
-    (or if it's state-led and doesn't need a reminder to submit) -->
+If no warnings exist that disable the "Submit" button, check if it has already been submitted 
+    (or if it's state-led and doesn't need a reminder to submit)
 <ng-template #readyToSubmit>
     <div *ngIf="(!iseHasBeenSubmitted && !ncuaSvc.iseHasBeenSubmitted) && !ncuaSvc.ISE_StateLed"
         class="alert-warning mt-2 mb-2 d-flex flex-row justify-content-center align-items-center flex-11a ng-star-inserted">
@@ -252,4 +391,5 @@
             This assessment has not been submitted yet. If this assessment is complete, please click submit.
         </div>
     </div>
-</ng-template>
\ No newline at end of file
+</ng-template>
+-->
diff --git a/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.ts b/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.ts
index 04189fe55f..01764d2c65 100644
--- a/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.ts
+++ b/CSETWebNg/src/app/assessment/results/reports/ise-warnings/ise-warnings.component.ts
@@ -10,7 +10,7 @@ import { NCUAService } from '../../../../services/ncua.service';
 })
 export class IseWarningsComponent {
   @Input() iseHasBeenSubmitted;
-  @Input() disableIseReportLinks;
+  @Input() disableIseReportLinks; // <-- Checks for unanswered questions
 
   missingFields = [];
 
@@ -20,15 +20,15 @@ export class IseWarningsComponent {
   ) {}
 
   ngOnInit() {
-    this.getMissingFields();
+    this.checkMissingFields();
   }
 
-  getMissingFields() {
+  checkMissingFields() {
     if (this.ncuaSvc.creditUnionName == '' || this.ncuaSvc.creditUnionName === null) {
       this.missingFields.push("Credit union name");
     }
 
-    if (this.ncuaSvc.assetsAsNumber == 0 || this.ncuaSvc.assetsAsString == null) {
+    if (this.ncuaSvc.assetsAsNumber == 0 || this.ncuaSvc.assetsAsString == null || this.assessSvc.assessment.assets == null) {
       this.missingFields.push("Assets");
     }
   }
diff --git a/CSETWebNg/src/app/services/ncua.service.ts b/CSETWebNg/src/app/services/ncua.service.ts
index 4c560eabb4..258827e0e6 100644
--- a/CSETWebNg/src/app/services/ncua.service.ts
+++ b/CSETWebNg/src/app/services/ncua.service.ts
@@ -83,7 +83,7 @@ export class NCUAService {
   // Variables to manage ISE issues state
   issuesFinishedLoading: boolean = false;
   questionCheck = new Map();
-  issueFindingId = new Map();
+  issueObservationId = new Map();
   deleteHistory = new Set();
 
   // Keeps track of Issues with unassigned Types for report notification
@@ -295,7 +295,7 @@ export class NCUAService {
   // Clears necessary variables on assessment drop
   reset() {
     this.questionCheck.clear();
-    this.issueFindingId.clear();
+    this.issueObservationId.clear();
     this.deleteHistory.clear();
   }