diff --git a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-filter.component.html b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-filter.component.html
index f2ef50510..e0ad0f919 100644
--- a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-filter.component.html
+++ b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-filter.component.html
@@ -1,104 +1,103 @@
 <div style="margin-top: 4px; margin-bottom: 4px" class="container-fluid">
-    <div
-      style="
-        padding: 0px;
-        border: 1px double lightgray;
-        border-bottom: 0px;
-        cursor: pointer;
-      "
-      class="row"
-      (click)="filterCollapsed = !filterCollapsed"
+  <div
+    style="
+      padding: 0px;
+      border: 1px double lightgray;
+      border-bottom: 0px;
+      cursor: pointer;
+    "
+    class="row"
+    (click)="filterCollapsed = !filterCollapsed"
+  >
+    <span class="text-info" style="margin: 2px; font-weight: bold">
+      <span
+        class="glyphicon glyphicon-filter"
+        style="font-weight: normal"
+      ></span>
+      Report filters</span
     >
-      <span class="text-info" style="margin: 2px; font-weight: bold">
-        <span
-          class="glyphicon glyphicon-filter"
-          style="font-weight: normal"
-        ></span>
-        Report filters</span
+    <span style="margin: 2px" class="label label-default pull-right">
+      <span
+        class="glyphicon glyphicon-chevron-down"
+        *ngIf="!filterCollapsed"
+      ></span>
+      <span
+        class="glyphicon glyphicon-chevron-up"
+        *ngIf="filterCollapsed"
+      ></span>
+    </span>
+  </div>
+  <div style="padding: 0px; border: 1px double lightgray" class="row">
+    <div *ngIf="!filterCollapsed">
+      <div
+        class="col-xs-10"
+        style="padding: 4px; border-left: 4px solid lightgray"
       >
-      <span style="margin: 2px" class="label label-default pull-right">
-        <span
-          class="glyphicon glyphicon-chevron-down"
-          *ngIf="!filterCollapsed"
-        ></span>
-        <span
-          class="glyphicon glyphicon-chevron-up"
-          *ngIf="filterCollapsed"
-        ></span>
-      </span>
-    </div>
-    <div style="padding: 0px; border: 1px double lightgray" class="row">
-      <div *ngIf="!filterCollapsed">
-        <div
-          class="col-xs-10"
-          style="padding: 4px; border-left: 4px solid lightgray"
-        >
-          <div *ngIf="!isMonthMode" class="form-row">
-            <label for="startDate">Start Date</label>
-            <input
-              id="startDate"
-              type="date"
-              class="form-control"
-              [(ngModel)]="startDateString"
-            />
-          </div>
-          <div *ngIf="!isMonthMode" class="form-row">
-            <label for="endDate">End Date</label>
-            <input
-              id="endDate"
-              type="date"
-              class="form-control"
-              [(ngModel)]="endDateString"
-            />
-          </div>
-          <div *ngIf="isMonthMode" class="form-row">
-            <label for="month">Month:</label>
-            <input
-              id="month"
-              type="month"
-              class="form-control"
-              [(ngModel)]="monthString"
-            />
-          </div>
-          <div class="form-row" *ngIf="showIsAggregateControl">
-            <label for="isAggregate">Aggregate Locations</label>
-            <input
-              id="isAggregate"
-              type="checkbox"
-              name="aggregated"
-              [checked]="isAggregated"
-              (change)="isAggregated = !isAggregated"
-            />
-          </div>
+        <div *ngIf="!isMonthMode" class="form-row">
+          <label for="startDate">Start Date</label>
+          <input
+            id="startDate"
+            type="date"
+            class="form-control"
+            [(ngModel)]="startDateString"
+          />
+        </div>
+        <div *ngIf="!isMonthMode" class="form-row">
+          <label for="endDate">End Date</label>
+          <input
+            id="endDate"
+            type="date"
+            class="form-control"
+            [(ngModel)]="endDateString"
+          />
+        </div>
+        <div *ngIf="isMonthMode" class="form-row">
+          <label for="month">Month:</label>
+          <input
+            id="month"
+            type="month"
+            class="form-control"
+            [(ngModel)]="monthString"
+          />
+        </div>
+        <div class="form-row" *ngIf="showIsAggregateControl">
+          <label for="isAggregate">Aggregate Locations</label>
+          <input
+            id="isAggregate"
+            type="checkbox"
+            name="aggregated"
+            [checked]="isAggregated"
+            (change)="isAggregated = !isAggregated"
+          />
         </div>
       </div>
     </div>
-    <div
-      style="padding: 0px; border: 1px double lightgray"
-      class="row"
-      *ngIf="showLocationsControl"
+  </div>
+  <div
+    style="padding: 0px; border: 1px double lightgray"
+    class="row"
+    *ngIf="showLocationsControl"
+  >
+    <location-filter
+      [multiple]="true"
+      [locationUuids]="locationUuids"
+      (onLocationChange)="onLocationsSelected($event)"
+    ></location-filter>
+  </div>
+  <div class="row" style="margin-top: 4px; padding: 0px">
+    <button
+      type="button"
+      *ngIf="!parentIsBusy"
+      class="btn btn-primary pull-right"
+      (click)="onClickedGenerate()"
+    >
+      Generate Report
+    </button>
+    <span
+      class="pull-right"
+      style="font-weight: bold; color: gray"
+      *ngIf="parentIsBusy"
+      >Loading report..</span
     >
-      <location-filter
-        [multiple]="true"
-        [locationUuids]="locationUuids"
-        (onLocationChange)="onLocationsSelected($event)"
-      ></location-filter>
-    </div>
-    <div class="row" style="margin-top: 4px; padding: 0px">
-      <button
-        type="button"
-        *ngIf="!parentIsBusy"
-        class="btn btn-primary pull-right"
-        (click)="onClickedGenerate()"
-      >
-        Generate Report
-      </button>
-      <span
-        class="pull-right"
-        style="font-weight: bold; color: gray"
-        *ngIf="parentIsBusy"
-        >Loading report..</span
-      >
-    </div>
   </div>
-  
\ No newline at end of file
+</div>
diff --git a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-patient-list.component.html b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-patient-list.component.html
index 0d65edd35..87c57d88a 100644
--- a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-patient-list.component.html
+++ b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-patient-list.component.html
@@ -1,40 +1,39 @@
 <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
-        <h4 align="center" class="section-title">
-          {{ title }} Patient List for {{ params.startDate }} to
-          {{ params.endDate }}
-        </h4>
-        <hr class="intro-divider" width="40%" />
-      </div>
-      <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
-        <button class="btn btn-primary back-btn" (click)="backToSummary()">
-          <i class="fa fa-angle-left fa-fw"></i>Back to Summary
-        </button>
-      </div>
-      <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
-        <ag-grid-angular
-          style="width: 100%; height: 500px"
-          class="ag-blue"
-          #agPatientGrid
-          [enableSorting]="true"
-          [rowData]="rowData"
-          [columnDefs]="rriSummaryColdef"
-          [pagination]="true"
-          [gridOptions]="gridOptions"
-          (cellClicked)="onCellClicked($event)"
-        >
-        </ag-grid-angular>
-        <button
-          class="btn btn-info pull-right"
-          *ngIf="patientList.length > 0"
-          (click)="exportPatientListToCsv()"
-          style="color: #fff"
-        >
-          <i class="inline fa fa-file-excel-o"></i>
-          <span>Export</span>
-        </button>
-      </div>
+  <div class="row">
+    <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
+      <h4 align="center" class="section-title">
+        {{ title }} Patient List for {{ params.startDate }} to
+        {{ params.endDate }}
+      </h4>
+      <hr class="intro-divider" width="40%" />
+    </div>
+    <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
+      <button class="btn btn-primary back-btn" (click)="backToSummary()">
+        <i class="fa fa-angle-left fa-fw"></i>Back to Summary
+      </button>
+    </div>
+    <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
+      <ag-grid-angular
+        style="width: 100%; height: 500px"
+        class="ag-blue"
+        #agPatientGrid
+        [enableSorting]="true"
+        [rowData]="rowData"
+        [columnDefs]="rriSummaryColdef"
+        [pagination]="true"
+        [gridOptions]="gridOptions"
+        (cellClicked)="onCellClicked($event)"
+      >
+      </ag-grid-angular>
+      <button
+        class="btn btn-info pull-right"
+        *ngIf="patientList.length > 0"
+        (click)="exportPatientListToCsv()"
+        style="color: #fff"
+      >
+        <i class="inline fa fa-file-excel-o"></i>
+        <span>Export</span>
+      </button>
     </div>
   </div>
-  
\ No newline at end of file
+</div>
diff --git a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.html b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.html
index 565bcef27..b98709620 100644
--- a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.html
+++ b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.html
@@ -1,62 +1,61 @@
 <div class="wrapper">
-    <div class="panel panel-info">
-      <div class="panel-heading" style="min-height: 50px !important">
-        <strong class="text-primary">
-          <span class="fa fa-file-pdf-o"> </span>
-          RRI Report
-          <span *ngIf="locations.length > 0"
-            >for {{ params.startDate }} to {{ params.endDate }}
-          </span>
-          <div class="btn-group pull-right">
-            <button class="btn btn-primary" (click)="downloadPdf()">
-              <i class="fa fa-download"> </i> Download Pdf
-            </button>
-          </div>
-        </strong>
-      </div>
-      <div
-        id="contentToConvert"
-        class="panel-body"
-        style="background-color: #ffffff"
-      >
+  <div class="panel panel-info">
+    <div class="panel-heading" style="min-height: 50px !important">
+      <strong class="text-primary">
+        <span class="fa fa-file-pdf-o"> </span>
+        RRI Report
+        <span *ngIf="locations.length > 0"
+          >for {{ params.startDate }} to {{ params.endDate }}
+        </span>
+        <div class="btn-group pull-right">
+          <button class="btn btn-primary" (click)="downloadPdf()">
+            <i class="fa fa-download"> </i> Download Pdf
+          </button>
+        </div>
+      </strong>
+    </div>
+    <div
+      id="contentToConvert"
+      class="panel-body"
+      style="background-color: #ffffff"
+    >
+      <table class="fixed" style="width: 100%">
+        <tr>
+          <th [attr.colspan]="2"><b class="section-title"></b></th>
+        </tr>
+        <tr>
+          <td><b>Locations</b></td>
+          <td *ngFor="let location of locations">
+            <b>{{ location }}</b>
+          </td>
+        </tr>
+      </table>
+      <div *ngFor="let section of sectionDefs">
         <table class="fixed" style="width: 100%">
           <tr>
-            <th [attr.colspan]="2"><b class="section-title"></b></th>
+            <th [attr.colspan]="2">
+              <b class="section-title">{{ section.sectionTitle }}</b>
+            </th>
           </tr>
-          <tr>
-            <td><b>Locations</b></td>
-            <td *ngFor="let location of locations">
-              <b>{{ location }}</b>
+          <tr *ngFor="let indicator of section.indicators">
+            <td class="section-data" title="{{ indicator.label }}">
+              {{ indicator.label }}
+            </td>
+            <td
+              title="Click to View Patientlist"
+              *ngFor="let locationData of indicator.data"
+              class="section-data"
+            >
+              <span
+                class="value"
+                (click)="viewPatientList(locationData, indicator.indicator)"
+                >{{ locationData[indicator.indicator] }}</span
+              >
             </td>
           </tr>
         </table>
-        <div *ngFor="let section of sectionDefs">
-          <table class="fixed" style="width: 100%">
-            <tr>
-              <th [attr.colspan]="2">
-                <b class="section-title">{{ section.sectionTitle }}</b>
-              </th>
-            </tr>
-            <tr *ngFor="let indicator of section.indicators">
-              <td class="section-data" title="{{ indicator.label }}">
-                {{ indicator.label }}
-              </td>
-              <td
-                title="Click to View Patientlist"
-                *ngFor="let locationData of indicator.data"
-                class="section-data"
-              >
-                <span
-                  class="value"
-                  (click)="viewPatientList(locationData, indicator.indicator)"
-                  >{{ locationData[indicator.indicator] }}</span
-                >
-              </td>
-            </tr>
-          </table>
-        </div>
       </div>
-      <div class="panel-footer" style="min-height: 50px"></div>
     </div>
+    <div class="panel-footer" style="min-height: 50px"></div>
   </div>
-  
\ No newline at end of file
+</div>
diff --git a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.ts b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.ts
index efbe3aeb4..d5b294dc2 100644
--- a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.ts
+++ b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-pdf-view.component.ts
@@ -58,7 +58,6 @@ export class PmtctCalhivPdfViewComponent implements OnInit, OnChanges {
   public setRowData(results) {
     const sectionDefs = this.sectionDefs;
     _.each(results, (result: any) => {
-      // console.log('result', result);
       this.locations.push(result.location);
       Object.keys(result).forEach((key, index) => {
         _.each(sectionDefs, (sectionDef: any) => {
diff --git a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-tabular.component.html b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-tabular.component.html
index 1100d8cdd..283b658e9 100644
--- a/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-tabular.component.html
+++ b/src/app/hiv-care-lib/pmtct-calhiv-rri-report/pmtct-calhiv-tabular.component.html
@@ -1,20 +1,19 @@
 <div class="row">
-    <div class="col-md-12 col-lg-12 col-xs-12 col-sm-12">
-      <h4 align="center" class="section-title">
-        {{reportTitle}} for {{params.startDate}} to {{params.endDate}}
-      </h4>
-      <hr class="intro-divider" width="40%" />
-      <ag-grid-angular
-        style="width: 100%; height: 150px"
-        class="ag-blue"
-        #agSummaryGrid
-        [enableSorting]="true"
-        [rowData]="data"
-        [columnDefs]="rriSummaryColdef"
-        [gridOptions]="rrisummaryGridOptions"
-        (cellClicked)="onCellClicked($event)"
-      >
-      </ag-grid-angular>
-    </div>
+  <div class="col-md-12 col-lg-12 col-xs-12 col-sm-12">
+    <h4 align="center" class="section-title">
+      {{ reportTitle }} for {{ params.startDate }} to {{ params.endDate }}
+    </h4>
+    <hr class="intro-divider" width="40%" />
+    <ag-grid-angular
+      style="width: 100%; height: 150px"
+      class="ag-blue"
+      #agSummaryGrid
+      [enableSorting]="true"
+      [rowData]="data"
+      [columnDefs]="rriSummaryColdef"
+      [gridOptions]="rrisummaryGridOptions"
+      (cellClicked)="onCellClicked($event)"
+    >
+    </ag-grid-angular>
   </div>
-  
\ No newline at end of file
+</div>