diff --git a/query.cfm b/query.cfm
index c926bc6..d3cc16a 100644
--- a/query.cfm
+++ b/query.cfm
@@ -6,15 +6,19 @@
     .status-ok { color: #2ecc71; font-weight: bold; }
     .header { background: #2c3e50; color: white; padding: 10px 20px; margin: -20px -20px 20px -20px; }
     .label-tf { color: #e67e22; font-weight: bold; }
-    details { background: #f9f9f9; padding: 10px; border: 1px solid #ddd; margin-top: 20px; }
-    summary { cursor: pointer; font-weight: bold; color: #2980b9; }
 </style>
 
 <div class="header">
-    <h1>📊 Lucee Connection Report</h1>
+    <h1>📊 Lucee System & Connection Report</h1>
 </div>
 
-<h2>1. Database Test (PostgreSQL)</h2>
+<h2>1. Request Scope</h2>
+<cfdump var="#request#" label="Request Data (Full List)" />
+
+<h2>2. Application Scope (This)</h2>
+<cfdump var="#this#" label="Lucee Component Settings" expand="false" />
+
+<h2>3. Query Result (PostgreSQL)</h2>
 <cftry>
     <cfquery name="qTest" result="res">
         SELECT 
@@ -27,7 +31,7 @@
         <tr><th>Status</th><td class="status-ok">✅ CONNECTED</td></tr>
         <tr><th>Database Name</th><td><cfoutput>#qTest.db_name#</cfoutput></td></tr>
         <tr><th>Connected As</th><td><cfoutput>#qTest.db_user#</cfoutput></td></tr>
-        <tr><th>Server Time</th><td><cfoutput>#qTest.db_time#</cfoutput></td></tr>
+        <tr><th>Current DB Time</th><td><cfoutput>#qTest.db_time#</cfoutput></td></tr>
         <tr><th>Execution Time</th><td><cfoutput>#res.executiontime# ms</cfoutput></td></tr>
     </table>
     
@@ -39,14 +43,7 @@
     </cfcatch>
 </cftry>
 
-<h2>2. DataSource Configuration (testds)</h2>
-<cfif structKeyExists(this, "datasources") AND structKeyExists(this.datasources, "testds")>
-    <cfdump var="#this.datasources.testds#" label="Lucee Engine Settings (testds)" />
-<cfelse>
-    <p style="color:orange;">⚠️ DataSource 'testds' is not defined in this.datasources.</p>
-</cfif>
-
-<h2>3. Environment Variables (Terraform 🟥➡️)</h2>
+<h2>4. System Environment (Terraform 🟥➡️)</h2>
 <table>
     <thead>
         <tr>
@@ -67,11 +64,5 @@
     </tbody>
 </table>
 
-<details>
-    <summary>🔍 Click to view Request Details (Headers, IP, etc.)</summary>
-    <h3>Request Scope</h3>
-    <cfdump var="#request#" label="Request Scope Data" />
-</details>
-
 <hr>
-<p><small>Generated by Lucee Engine | Managed by Terraform Infrastructure</small></p>
\ No newline at end of file
+<p><small>Report Date: <cfoutput>#now()#</cfoutput> | Managed by Terraform</small></p>
\ No newline at end of file