diff --git a/query.cfm b/query.cfm
index d3cc16a..00fc1d6 100644
--- a/query.cfm
+++ b/query.cfm
@@ -1,68 +1,74 @@
 <style>
-    body { font-family: sans-serif; line-height: 1.5; color: #333; margin: 20px; }
-    table { border-collapse: collapse; width: 100%; margin-bottom: 20px; border: 1px solid #ddd; }
-    th, td { text-align: left; padding: 12px; border: 1px solid #ddd; }
-    th { background-color: #f4f4f4; width: 30%; }
-    .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; }
+    body { font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; line-height: 1.6; color: #333; margin: 30px; background-color: #f8f9fa; }
+    .container { background: white; padding: 25px; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); }
+    .header { background: #2c3e50; color: white; padding: 15px 25px; margin: -30px -30px 30px -30px; border-radius: 8px 8px 0 0; display: flex; justify-content: space-between; align-items: center; }
+    h2 { border-bottom: 2px solid #eee; padding-bottom: 10px; color: #2c3e50; margin-top: 30px; }
+    table { border-collapse: collapse; width: 100%; background: white; margin: 10px 0; }
+    th, td { text-align: left; padding: 12px; border: 1px solid #dee2e6; }
+    th { background-color: #f1f3f5; width: 30%; font-weight: 600; }
+    .status-badge { background: #2ecc71; color: white; padding: 4px 12px; border-radius: 20px; font-size: 0.9em; font-weight: bold; }
+    .val-highlight { color: #d35400; font-family: monospace; font-weight: bold; }
 </style>
 
-<div class="header">
-    <h1>📊 Lucee System & Connection Report</h1>
-</div>
+<div class="container">
+    <div class="header">
+        <h1 style="margin:0;">📊 System Connectivity Report</h1>
+        <span>Lucee 5.4 | managed by Terraform</span>
+    </div>
 
-<h2>1. Request Scope</h2>
-<cfdump var="#request#" label="Request Data (Full List)" />
+    <h2>1. Request Information</h2>
+    <cfdump var="#request#" label="HTTP Request Context" />
 
-<h2>2. Application Scope (This)</h2>
-<cfdump var="#this#" label="Lucee Component Settings" expand="false" />
+    <h2>2. Application Configuration (this)</h2>
+    <cfdump var="#this#" label="Application.cfc Settings" expand="false" />
 
-<h2>3. Query Result (PostgreSQL)</h2>
-<cftry>
-    <cfquery name="qTest" result="res">
-        SELECT 
-            CURRENT_TIMESTAMP as db_time,
-            current_database() as db_name,
-            current_user as db_user;
-    </cfquery>
-    
+    <h2>3. Database Verification (PostgreSQL)</h2>
+    <cftry>
+        <cfquery name="qTest" result="res">
+            SELECT 
+                CURRENT_TIMESTAMP as db_time,
+                current_database() as db_name,
+                current_user as db_user;
+        </cfquery>
+        
+        <table>
+            <tr><th>Connection Status</th><td><span class="status-badge">✅ ACTIVE</span></td></tr>
+            <tr><th>Database Name</th><td class="val-highlight"><cfoutput>#qTest.db_name#</cfoutput></td></tr>
+            <tr><th>Database User</th><td class="val-highlight"><cfoutput>#qTest.db_user#</cfoutput></td></tr>
+            <tr><th>Server Timestamp</th><td><cfoutput>#qTest.db_time#</cfoutput></td></tr>
+            <tr><th>Query Performance</th><td><cfoutput>#res.executiontime# ms</cfoutput></td></tr>
+        </table>
+        
+        <cfcatch>
+            <div style="background: #ff7675; color: white; padding: 15px; border-radius: 5px;">
+                <strong>❌ DATABASE ERROR:</strong><br>
+                <cfoutput>#cfcatch.message#</cfoutput>
+            </div>
+        </cfcatch>
+    </cftry>
+
+    <h2>4. Environment Variables (Terraform Mapping)</h2>
     <table>
-        <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>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>
+        <thead>
+            <tr>
+                <th>Variable Key</th>
+                <th>Value (Decoded)</th>
+            </tr>
+        </thead>
+        <tbody>
+            <cfset env = createObject("java", "java.lang.System").getEnv()>
+            <cfloop collection="#env#" item="key">
+                <cfif findNoCase("testds_", key) OR findNoCase("PG", key)>
+                    <tr>
+                        <td><strong><cfoutput>#key#</cfoutput></strong></td>
+                        <td class="val-highlight"><cfoutput>#env[key]#</cfoutput></td>
+                    </tr>
+                </cfif>
+            </cfloop>
+        </tbody>
     </table>
-    
-    <cfcatch>
-        <div style="background: #e74c3c; color: white; padding: 15px; border-radius: 5px;">
-            <strong>❌ CONNECTION FAILED:</strong><br>
-            <cfoutput>#cfcatch.message#</cfoutput>
-        </div>
-    </cfcatch>
-</cftry>
 
-<h2>4. System Environment (Terraform 🟥➡️)</h2>
-<table>
-    <thead>
-        <tr>
-            <th>Variable Name</th>
-            <th>Value</th>
-        </tr>
-    </thead>
-    <tbody>
-        <cfset env = createObject("java", "java.lang.System").getEnv()>
-        <cfloop collection="#env#" item="key">
-            <cfif findNoCase("testds_", key) OR findNoCase("PG", key)>
-                <tr>
-                    <td><span class="label-tf"><cfoutput>#key#</cfoutput></span></td>
-                    <td><cfoutput>#env[key]#</cfoutput></td>
-                </tr>
-            </cfif>
-        </cfloop>
-    </tbody>
-</table>
-
-<hr>
-<p><small>Report Date: <cfoutput>#now()#</cfoutput> | Managed by Terraform</small></p>
\ No newline at end of file
+    <p style="text-align: right; color: #95a5a6; font-size: 0.8em; margin-top: 40px;">
+        Report Generated: <cfoutput>#dateTimeFormat(now(), "yyyy-mm-dd HH:nn:ss")#</cfoutput>
+    </p>
+</div>
\ No newline at end of file