diff --git a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
index 76ad5bcd..fe7b544d 100644
--- a/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
+++ b/HIRS_AttestationCA/src/main/java/hirs/attestationca/service/SupplyChainValidationServiceImpl.java
@@ -445,6 +445,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
                             passed = false;
                             fwStatus = new AppraisalStatus(FAIL,
                                     "Firmware validation failed: invalid certificate path.");
+                            validationObject = baseReferenceManifest;
                         }
                     } catch (IOException e) {
                         LOGGER.error("Error getting X509 cert from manager: " + e.getMessage());
@@ -467,7 +468,7 @@ public class SupplyChainValidationServiceImpl implements SupplyChainValidationSe
                 }
             }
 
-            if (signingCert == null) {
+            if (passed && signingCert == null) {
                 passed = false;
                 fwStatus = new AppraisalStatus(FAIL,
                         "Firmware validation failed: signing cert not found.");
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
index 366a3e0a..7fa24d81 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -70,7 +70,7 @@
                     <h3>
                         <a href="${portal}/rim-database"><img src="${icons}/ic_devices_black_24dp.png" /> RIM Database</a>
                     </h3>
-                    <h4>View a list of TPM events </h4>
+                    <h4>View a list of Reference Integrity Measurements</h4>
                 </div>
             </div>
         </div>
diff --git a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
index d63a48b8..e4503d4c 100644
--- a/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
+++ b/HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/rim-details.jsp
@@ -13,10 +13,12 @@
     <jsp:attribute name="pageHeaderTitle">
     <c:choose>
         <c:when test="${initialData.rimType=='Measurement'}">
-            TCG Event Log
-            <a href="${portal}/reference-manifests/download?id=${param.id}">
-                <img src="${icons}/ic_file_download_black_24dp.png" title="Download ${initialData.rimType} RIM">
-            </a>
+            <c:if test="${initialData.validationResult=='PASS'}">
+                TCG Log events
+            </c:if>
+            <c:if test="${initialData.validationResult=='FAIL'}">
+                TCG Log event(s) not found in the RIM DB
+            </c:if>
         </c:when>
         <c:otherwise>
             ${initialData.rimType} Reference Integrity Manifest
@@ -38,19 +40,19 @@
                 <c:when test="${initialData.rimType=='Support' || (initialData.rimType=='Measurement' && initialData.validationResult=='PASS')}">
                     <div class="row">
                         <div class="col-md-1 col-md-offset-1"><span class="colHeader">Additional<br />RIM Info</span></div>
-                        <div id="baseRim" class="col col-md-8">
+                        <div class="col col-md-8">
                             <c:choose>
                                 <c:when test="${not empty initialData.associatedRim}">
                                     <a href="${portal}/rim-details?id=${initialData.associatedRim}">
                                         ${initialData.tagId}
                                     </a>
-                            <c:if test="${not empty initialData.hostName}">
-                                <div>Device:&nbsp;<span>${initialData.hostName}</span></div>
-                            </c:if>
-                            <c:if test="${not empty initialData.supportId}">
-                                <div>Support:&nbsp;<span><a href="${portal}/rim-details?id=${initialData.supportId}">${initialData.supportFilename}</a></span>
-                                </div>
-                            </c:if>
+                                    <c:if test="${not empty initialData.hostName}">
+                                        <div>Device:&nbsp;<span>${initialData.hostName}</span></div>
+                                    </c:if>
+                                    <c:if test="${not empty initialData.supportId}">
+                                        <div>Support:&nbsp;<span><a href="${portal}/rim-details?id=${initialData.supportId}">${initialData.supportFilename}</a></span>
+                                        </div>
+                                    </c:if>
                                 </c:when>
                                 <c:otherwise>
                                     <div class="component col col-md-10" style="color: red; padding-left: 20px">RIM not uploaded from the ACA RIM Page</div>
@@ -272,6 +274,13 @@
                     <div class="row">
                         <div class="col-md-1 col-md-offset-1"><span class="colHeader">Base/Support</span></div>
                         <div id="measurements" class="col col-md-8">
+                            <div>Download Measurement:&nbsp;
+                                <span>
+                                    <a href="${portal}/reference-manifests/download?id=${param.id}">
+                                        BIOS Measurements
+                                    </a>
+                                </span>
+                            </div>
                             <c:if test="${not empty initialData.hostName}">
                                 <div>Device:&nbsp;<span>${initialData.hostName}</span>
                                 </div>
@@ -306,7 +315,7 @@
                                     </div>
                                     <div style="display: flex;">
                                         <div class="mappedButton">
-                                            Baseline Events of Type:<br />
+                                            Expected Events from RIM DB:<br />
                                             <span style="word-wrap: break-word"><a role="button" data-toggle="collapse" href="#eventContent${iterator}">${lEvent.getEventTypeString()}</a></span>
                                         </div>
                                         <div id="eventContent${iterator}" class="panel-collapse collapse in" style="flex: 2">