diff --git a/templates/assets/js/index.js b/templates/assets/js/index.js
index c957bbc..6194bcb 100644
--- a/templates/assets/js/index.js
+++ b/templates/assets/js/index.js
@@ -36,8 +36,8 @@ function getSSL() {
             <li class="list-group-item"><strong>Nameserver TLSA:</strong> <code>${data.tlsa.nameserver}</code> 
                 ${data.tlsa.match ? '<span class="badge bg-success">Match</span>' : '<span class="badge bg-danger">No Match</span>'}
             </li>
-            <li class="list-group-item"><strong>Certificate Names:</strong> ${data.cert.domains.join(", ")}</li>
-            <li class="list-group-item"><strong>Expiry Date:</strong> ${data.cert.expiry_date} UTC</li>
+            <li class="list-group-item"><strong>Certificate Names:</strong> ${data.cert.domains.join(", ")} ${data.cert.domain ? '<span class="badge bg-success">Match</span>' : '<span class="badge bg-danger">No Match</span>'}</li>
+            <li class="list-group-item"><strong>Expiry Date:</strong> ${data.cert.expiry_date} UTC ${data.cert.expired ? '<span class="badge bg-danger">Expired</span>' : '<span class="badge bg-success">Valid</span>'}</li>
             <li class="list-group-item"><strong>Valid:</strong> 
                 ${data.valid ? '<span class="badge bg-success">Yes</span>' : '<span class="badge bg-danger">No</span>'}
             </li>
diff --git a/tools.py b/tools.py
index 61b8bc1..ad3e8be 100644
--- a/tools.py
+++ b/tools.py
@@ -108,6 +108,7 @@ def check_ssl(domain: str):
                         domain_check = True
 
         returns["cert"]["domains"] = cert_domains
+        returns["cert"]["domain"] = domain_check
 
         expiry_date = cert_obj.not_valid_after_utc
         # Check if expiry date is past