diff --git a/src/models/Analysis.js b/src/models/Analysis.js
index af97463..c7966da 100644
--- a/src/models/Analysis.js
+++ b/src/models/Analysis.js
@@ -22,6 +22,24 @@ export class Analysis {
       ORDER BY created_at DESC 
       LIMIT 1
     `;
+    
+    if (result && result.findings) {
+      // Ensure findings is parsed as an object
+      if (typeof result.findings === 'string') {
+        result.findings = JSON.parse(result.findings);
+      }
+      // Ensure nested arrays exist
+      if (!result.findings.positive) result.findings.positive = [];
+      if (!result.findings.negative) result.findings.negative = [];
+      if (!result.findings.neutral) result.findings.neutral = [];
+    }
+    
+    // Ensure other array fields exist
+    if (result) {
+      if (!result.data_types_collected) result.data_types_collected = [];
+      if (!result.third_parties) result.third_parties = [];
+    }
+    
     return result || null;
   }
 
diff --git a/src/views/admin/dashboard.ejs b/src/views/admin/dashboard.ejs
index b300b0c..dde741f 100644
--- a/src/views/admin/dashboard.ejs
+++ b/src/views/admin/dashboard.ejs
@@ -45,7 +45,7 @@
                             <p class="service-url"><%= service.url %></p>
                             <% if (service.grade) { %>
                                 <span class="grade grade-<%= service.grade.toLowerCase() %>">
-                                    Grade <%= service.grade %>
+                                    <%= service.grade %>
                                 </span>
                                 <p class="last-analyzed">
                                     Last analyzed: <%= new Date(service.last_analyzed).toLocaleDateString() %>
diff --git a/src/views/public/index.ejs b/src/views/public/index.ejs
index 1686d53..8b7a85f 100644
--- a/src/views/public/index.ejs
+++ b/src/views/public/index.ejs
@@ -41,7 +41,7 @@
                     <% if (service.grade) { %>
                         <div class="grade-display">
                             <span class="grade grade-<%= service.grade.toLowerCase() %>" id="service-<%= service.id %>-grade">
-                                Grade <%= service.grade %>
+                                <%= service.grade %>
                             </span>
                             <span class="visually-hidden">Privacy Grade <%= service.grade %></span>
                         </div>
diff --git a/src/views/public/service.ejs b/src/views/public/service.ejs
index ba0f0ee..ce246c7 100644
--- a/src/views/public/service.ejs
+++ b/src/views/public/service.ejs
@@ -47,7 +47,7 @@
         <% if (analysis) { %>
             <div class="grade-section">
                 <div class="grade-large grade-<%= analysis.overall_score.toLowerCase() %>">
-                    Grade <%= analysis.overall_score %>
+                    <%= analysis.overall_score %>
                 </div>
                 
                 <p class="last-analyzed">