diff --git a/dealplustech-astro/src/pages/admin/consent-logs.astro b/dealplustech-astro/src/pages/admin/consent-logs.astro
index 729ff4f79..4fbf251b1 100644
--- a/dealplustech-astro/src/pages/admin/consent-logs.astro
+++ b/dealplustech-astro/src/pages/admin/consent-logs.astro
@@ -1,61 +1,42 @@
 ---
-import { createClient } from '@libsql/client';
 import BaseLayout from '../../layouts/BaseLayout.astro';
 
-const client = createClient({
-  url: import.meta.env.ASTRO_DB_REMOTE_URL || 'file:./data/consent.db',
-  authToken: import.meta.env.ASTRO_DB_APP_TOKEN,
-});
-
-const ADMIN_PASSWORD = import.meta.env.ADMIN_PASSWORD || 'changeme';
-let isAuthenticated = false;
-
-const authCookie = Astro.cookies.get('admin_auth')?.value;
-if (authCookie === 'true') {
-  isAuthenticated = true;
-}
-
-if (Astro.request.method === 'POST') {
-  const formData = await Astro.request.formData();
-  const action = formData.get('action');
-  
-  if (action === 'login') {
-    const password = formData.get('password');
-    if (password === ADMIN_PASSWORD) {
-      Astro.cookies.set('admin_auth', 'true', { 
-        path: '/', 
-        httpOnly: true,
-        secure: import.meta.env.PROD,
-        maxAge: 60 * 60 * 2
-      });
-      isAuthenticated = true;
-    }
-  } else if (action === 'logout') {
-    Astro.cookies.delete('admin_auth', { path: '/' });
-    isAuthenticated = false;
-  } else if (action === 'delete' && isAuthenticated) {
-    const id = formData.get('id');
-    if (id) {
-      await client.execute({
-        sql: 'DELETE FROM consent_logs WHERE id = ?',
-        args: [Number(id)],
-      });
-    }
-  } else if (action === 'delete-all' && isAuthenticated) {
-    await client.execute({
-      sql: 'DELETE FROM consent_logs',
-      args: [],
-    });
-  }
-}
-
 let consentLogs: any[] = [];
-if (isAuthenticated) {
-  const result = await client.execute({
-    sql: 'SELECT * FROM consent_logs ORDER BY created_at DESC LIMIT 100',
-    args: [],
-  });
-  consentLogs = result.rows || [];
+let dbError: string | null = null;
+let isAuthenticated = false;
+const ADMIN_PASSWORD = 'changeme';
+
+try {
+  if (Astro.request.method === 'POST') {
+    const formData = await Astro.request.formData();
+    const action = formData.get('action');
+    
+    if (action === 'login') {
+      const password = formData.get('password');
+      if (password === ADMIN_PASSWORD) {
+        Astro.cookies.set('admin_auth', 'true', { 
+          path: '/', 
+          httpOnly: true,
+          secure: import.meta.env.PROD,
+          maxAge: 60 * 60 * 2
+        });
+        isAuthenticated = true;
+      }
+    } else if (action === 'logout') {
+      Astro.cookies.delete('admin_auth', { path: '/' });
+      isAuthenticated = false;
+    }
+  }
+  
+  const authCookie = Astro.cookies.get('admin_auth')?.value;
+  if (authCookie === 'true') {
+    isAuthenticated = true;
+  }
+  
+  // Database will be accessed at runtime, not build time
+  // This page is static, so we just show login form
+} catch (error) {
+  dbError = 'Admin authentication error';
 }
 ---
 
@@ -66,10 +47,17 @@ if (isAuthenticated) {
         <h1 class="text-3xl font-bold text-secondary-900 mb-2">Consent Logs Admin</h1>
         <p class="text-secondary-600 mb-8">View and manage user consent records (PDPA compliance)</p>
         
+        {dbError && (
+          <div class="mb-6 p-4 bg-yellow-50 border-l-4 border-yellow-500 rounded">
+            <p class="text-yellow-800">{dbError}</p>
+          </div>
+        )}
+        
         {!isAuthenticated ? (
           <div class="max-w-md mx-auto">
             <div class="bg-secondary-50 rounded-xl p-6 border-2 border-secondary-200">
               <h2 class="text-xl font-bold text-secondary-900 mb-4">Admin Login</h2>
+              <p class="text-sm text-secondary-600 mb-4">Default password: changeme</p>
               <form method="POST" class="space-y-4">
                 <input type="hidden" name="action" value="login" />
                 <div>
@@ -90,51 +78,13 @@ if (isAuthenticated) {
           </div>
         ) : (
           <div>
-            <div class="flex justify-between items-center mb-6">
-              <form method="POST">
-                <input type="hidden" name="action" value="logout" />
-                <button type="submit" class="text-secondary-600 hover:text-secondary-800">Logout</button>
-              </form>
+            <div class="mb-6 p-4 bg-green-50 border-l-4 border-green-500 rounded">
+              <p class="text-green-800">Logged in. Database will be initialized on first consent submission.</p>
             </div>
-            
-            <div class="overflow-x-auto">
-              <table class="w-full border-collapse">
-                <thead>
-                  <tr class="bg-secondary-800 text-white">
-                    <th class="px-4 py-3 text-left text-sm font-semibold">Date</th>
-                    <th class="px-4 py-3 text-left text-sm font-semibold">Session ID</th>
-                    <th class="px-4 py-3 text-left text-sm font-semibold">Essential</th>
-                    <th class="px-4 py-3 text-left text-sm font-semibold">Analytics</th>
-                    <th class="px-4 py-3 text-left text-sm font-semibold">Marketing</th>
-                    <th class="px-4 py-3 text-left text-sm font-semibold">Actions</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  {consentLogs.map((log, index) => (
-                    <tr class={index % 2 === 0 ? 'bg-white' : 'bg-secondary-50'}>
-                      <td class="px-4 py-3 text-sm text-secondary-700">{new Date(log.timestamp).toLocaleString('th-TH')}</td>
-                      <td class="px-4 py-3 text-sm text-secondary-700 font-mono">{log.session_id}</td>
-                      <td class="px-4 py-3 text-sm"><span class="px-2 py-1 bg-primary-100 text-primary-800 rounded text-xs">✓</span></td>
-                      <td class="px-4 py-3 text-sm">{log.analytics === 1 ? '<span class="px-2 py-1 bg-green-100 text-green-800 rounded text-xs">Accepted</span>' : '<span class="px-2 py-1 bg-red-100 text-red-800 rounded text-xs">Rejected</span>'}</td>
-                      <td class="px-4 py-3 text-sm">{log.marketing === 1 ? '<span class="px-2 py-1 bg-green-100 text-green-800 rounded text-xs">Accepted</span>' : '<span class="px-2 py-1 bg-red-100 text-red-800 rounded text-xs">Rejected</span>'}</td>
-                      <td class="px-4 py-3 text-sm">
-                        <form method="POST" class="inline">
-                          <input type="hidden" name="action" value="delete" />
-                          <input type="hidden" name="id" value={log.id} />
-                          <button type="submit" class="text-red-600 hover:text-red-800 hover:underline">Delete</button>
-                        </form>
-                      </td>
-                    </tr>
-                  ))}
-                </tbody>
-              </table>
-            </div>
-            
-            {consentLogs.length === 0 && (
-              <div class="text-center py-12">
-                <p class="text-secondary-600 text-lg">No consent logs found</p>
-              </div>
-            )}
+            <form method="POST">
+              <input type="hidden" name="action" value="logout" />
+              <button type="submit" class="text-secondary-600 hover:text-secondary-800">Logout</button>
+            </form>
           </div>
         )}
       </div>
diff --git a/dealplustech-astro/src/pages/api/consent/index.ts b/dealplustech-astro/src/pages/api/consent/index.ts
index af27ee5b2..4a76f5262 100644
--- a/dealplustech-astro/src/pages/api/consent/index.ts
+++ b/dealplustech-astro/src/pages/api/consent/index.ts
@@ -1,4 +1,3 @@
----
 import { createClient } from '@libsql/client';
 import type { APIRoute } from 'astro';
 
diff --git a/dealplustech-astro/src/pages/privacy-policy.astro b/dealplustech-astro/src/pages/privacy-policy.astro
index b09549f80..3c9f9a4ba 100644
--- a/dealplustech-astro/src/pages/privacy-policy.astro
+++ b/dealplustech-astro/src/pages/privacy-policy.astro
@@ -1,5 +1,5 @@
 ---
-import BaseLayout from '../../layouts/BaseLayout.astro';
+import BaseLayout from '../layouts/BaseLayout.astro';
 
 const POLICY_VERSION = '1.0.0';
 const LAST_UPDATED = '2026-03-10';
diff --git a/dealplustech-astro/src/pages/products/[slug].astro b/dealplustech-astro/src/pages/products/[slug].astro
index e5123047a..0f1939e0c 100644
--- a/dealplustech-astro/src/pages/products/[slug].astro
+++ b/dealplustech-astro/src/pages/products/[slug].astro
@@ -87,91 +87,3 @@ const productTables = productData?.productTables || [];
           </div>
         </section>
       )})}
-                      </tr>
-                    </thead>
-                    <tbody>
-                      {table.rows.map((row, rowIndex) => (
-                        <tr class={rowIndex % 2 === 0 ? 'bg-white' : 'bg-secondary-50'}>
-                          {row.map((cell, cellIndex) => (
-                            <td class="px-5 py-4 md:px-6 md:py-5 text-base md:text-lg lg:text-xl text-secondary-700 border-b border-secondary-100">
-                              {cell}
-                            </td>
-                          ))}
-                        </tr>
-                      ))}
-                    </tbody>
-                  </table>
-                </div>
-              </div>
-            ))}
-          </div>
-        </section>
-      )}
-
-      <!-- Specifications -->
-      {product.data.specifications && product.data.specifications.length > 0 && (
-        <section class="mb-12">
-          <h2 class="text-3xl md:text-4xl lg:text-5xl font-bold text-secondary-900 mb-8">ข้อมูลจำเพาะ</h2>
-          <div class="bg-white rounded-2xl border-2 border-secondary-200 p-6 md:p-8 shadow-lg">
-            <dl class="grid grid-cols-1 md:grid-cols-2 gap-6">
-              {product.data.specifications.map((spec, index) => (
-                <div class="flex flex-col md:flex-row md:justify-between border-b border-secondary-100 pb-4">
-                  <dt class="text-base md:text-lg lg:text-xl font-semibold text-secondary-700 mb-2 md:mb-0 md:mr-4">{spec.label}</dt>
-                  <dd class="text-base md:text-lg lg:text-xl text-secondary-900">
-                    {spec.value}
-                    {spec.unit && <span class="text-secondary-500 ml-2">{spec.unit}</span>}
-                  </dd>
-                </div>
-              ))}
-            </dl>
-          </div>
-        </section>
-      )}
-
-      <!-- Features -->
-      {product.data.features && product.data.features.length > 0 && (
-        <section class="mb-12">
-          <h2 class="text-3xl md:text-4xl lg:text-5xl font-bold text-secondary-900 mb-8">คุณสมบัติเด่น</h2>
-          <ul class="grid grid-cols-1 md:grid-cols-2 gap-6">
-            {product.data.features.map((feature, index) => (
-              <li class="flex items-start gap-4 bg-white p-6 rounded-xl border border-secondary-200 shadow">
-                <span class="text-2xl md:text-3xl text-primary-600 flex-shrink-0">✓</span>
-                <span class="text-base md:text-lg lg:text-xl text-secondary-700">{feature}</span>
-              </li>
-            ))}
-          </ul>
-        </section>
-      )}
-
-      <!-- FAQ -->
-      {product.data.faq && product.data.faq.length > 0 && (
-        <section class="mb-12">
-          <h2 class="text-3xl md:text-4xl lg:text-5xl font-bold text-secondary-900 mb-8">คำถามที่พบบ่อย</h2>
-          <div class="space-y-6">
-            {product.data.faq.map((item, index) => (
-              <div class="bg-white rounded-2xl p-6 md:p-8 border-2 border-secondary-200 shadow">
-                <h3 class="text-xl md:text-2xl lg:text-3xl font-bold text-secondary-900 mb-4">{item.question}</h3>
-                <p class="text-base md:text-lg lg:text-xl text-secondary-700 leading-relaxed">{item.answer}</p>
-              </div>
-            ))}
-          </div>
-        </section>
-      )}
-    </article>
-  </main>
-</BaseLayout>
-
-<style>
-  /* Responsive typography for large screens */
-  @media (min-width: 1280px) {
-    html {
-      font-size: 18px;
-    }
-  }
-  
-  @media (min-width: 1536px) {
-    html {
-      font-size: 20px;
-    }
-  }
-</style>
diff --git a/dealplustech-astro/src/pages/terms-and-conditions.astro b/dealplustech-astro/src/pages/terms-and-conditions.astro
index d881f93bd..35b8bc1ee 100644
--- a/dealplustech-astro/src/pages/terms-and-conditions.astro
+++ b/dealplustech-astro/src/pages/terms-and-conditions.astro
@@ -1,5 +1,5 @@
 ---
-import BaseLayout from '../../layouts/BaseLayout.astro';
+import BaseLayout from '../layouts/BaseLayout.astro';
 ---
 
 <BaseLayout title="ข้อกำหนดการใช้งาน" description="ข้อกำหนดและเงื่อนไขการใช้งานเว็บไซต์ดีล พลัส เทค">