diff --git a/public/assets/js/server-show.js b/public/assets/js/server-show.js
index 7ba0230..a667c15 100644
--- a/public/assets/js/server-show.js
+++ b/public/assets/js/server-show.js
@@ -152,9 +152,10 @@ function confirmAgentAction() {
 
     closeAgentModal();
 
-    fetch('/servers/serverId/agent/' + action, {
+    fetch('/servers/' + serverId + '/agent/' + action, {
         method: 'POST',
         headers: {
+            'Accept': 'application/json',
             'Content-Type': 'application/x-www-form-urlencoded',
             'X-CSRF-Token': getCsrfToken(),
         },
@@ -192,9 +193,10 @@ function copyAgentKey() {
 function regenerateAgentKey() {
     if (!confirm('Regenerate agent key? The current key will stop working immediately.')) return;
 
-    fetch('/servers/serverId/agent/regenerate-key', {
+    fetch('/servers/' + serverId + '/agent/regenerate-key', {
         method: 'POST',
         headers: {
+            'Accept': 'application/json',
             'Content-Type': 'application/x-www-form-urlencoded',
             'X-CSRF-Token': getCsrfToken(),
         },
@@ -221,9 +223,10 @@ function serverAction(action) {
         if (!confirm('Are you sure you want to ' + action + ' this server?')) return;
     }
 
-    fetch('/servers/serverId/' + action, {
+    fetch('/servers/' + serverId + '/' + action, {
         method: 'POST',
         headers: {
+            'Accept': 'application/json',
             'Content-Type': 'application/x-www-form-urlencoded',
             'X-CSRF-Token': getCsrfToken(),
         },
@@ -240,9 +243,10 @@ function restartService() {
     const service = prompt('Enter service name to restart (e.g., nginx, mysql, apache2):');
     if (!service) return;
 
-    fetch('/servers/serverId/restart-service', {
+    fetch('/servers/' + serverId + '/restart-service', {
         method: 'POST',
         headers: {
+            'Accept': 'application/json',
             'Content-Type': 'application/x-www-form-urlencoded',
             'X-CSRF-Token': getCsrfToken(),
         },
@@ -256,7 +260,9 @@ function restartService() {
 }
 
 function refreshMetrics() {
-    fetch('/servers/serverId/metrics')
+    fetch('/servers/' + serverId + '/metrics', {
+        headers: { 'Accept': 'application/json' },
+    })
         .then(r => r.json())
         .then(data => {
             if (data.success && data.data) {
@@ -303,9 +309,10 @@ function saveThresholds() {
 
     document.querySelector('#thresholdModal .btn-primary').disabled = true;
 
-    fetch('/servers/serverId/thresholds', {
+    fetch('/servers/' + serverId + '/thresholds', {
         method: 'POST',
         headers: {
+            'Accept': 'application/json',
             'Content-Type': 'application/x-www-form-urlencoded',
             'X-CSRF-Token': getCsrfToken(),
         },
diff --git a/public/assets/js/terminal.js b/public/assets/js/terminal.js
index bbcd415..bafc71a 100644
--- a/public/assets/js/terminal.js
+++ b/public/assets/js/terminal.js
@@ -12,6 +12,12 @@ terminalInput.addEventListener('keydown', function(e) {
     }
 });
 
+function escapeHtml(str) {
+    const d = document.createElement('div');
+    d.textContent = str;
+    return d.innerHTML;
+}
+
 function executeCommand() {
     const command = terminalInput.value.trim();
     if (!command) return;
@@ -27,6 +33,7 @@ function executeCommand() {
     fetch('/terminal/' + serverId + '/execute', {
         method: 'POST',
         headers: {
+            'Accept': 'application/json',
             'Content-Type': 'application/x-www-form-urlencoded',
             'X-CSRF-Token': getCsrfToken(),
         },
@@ -45,6 +52,9 @@ function executeCommand() {
             if (data.stderr) {
                 appendTerminalLine(data.stderr, 'error');
             }
+            if (data.history) {
+                appendHistoryRow(data.history);
+            }
             updateStatus('connected', 'Connected');
         } else {
             appendTerminalLine(data.message || 'Command failed', 'error');
@@ -83,6 +93,23 @@ function clearTerminal() {
     terminalOutput.innerHTML = '';
 }
 
+function appendHistoryRow(h) {
+    const tbody = document.querySelector('.card-body .table tbody');
+    if (!tbody) return;
+    const emptyState = tbody.closest('.card-body')?.querySelector('.empty-state');
+    if (emptyState) emptyState.remove();
+    const row = document.createElement('tr');
+    const time = h.executed_at ? new Date(h.executed_at.replace(' ', 'T')).toLocaleTimeString('en-US', { hour12: false }) : '';
+    row.innerHTML =
+        '<td>' + time + '</td>' +
+        '<td><code>' + escapeHtml(h.command) + '</code></td>' +
+        '<td><span class="badge ' + (h.exit_status === 0 ? 'badge-success' : 'badge-danger') + '">' + (h.exit_status === 0 ? 'OK' : 'ERR') + '</span></td>' +
+        '<td>' + escapeHtml(h.username || 'System') + '</td>';
+    tbody.prepend(row);
+    const container = tbody.closest('.table-responsive');
+    if (container) container.scrollTop = 0;
+}
+
 function clearHistory() {
     if (!confirm('Clear all command history for this server?')) return;
 
diff --git a/src/Controllers/TerminalController.php b/src/Controllers/TerminalController.php
index 7565150..8e22e0b 100755
--- a/src/Controllers/TerminalController.php
+++ b/src/Controllers/TerminalController.php
@@ -100,7 +100,7 @@ class TerminalController
             $ssh->disconnect();
 
             $commandHistory = new CommandHistory();
-            $commandHistory->log(
+            $historyId = $commandHistory->log(
                 $id,
                 Session::get('user_id'),
                 $command,
@@ -115,6 +115,13 @@ class TerminalController
                 'output' => $result['output'],
                 'exit_status' => $result['exit_status'],
                 'stderr' => $result['stderr'],
+                'history' => [
+                    'id' => $historyId,
+                    'command' => $command,
+                    'exit_status' => $result['exit_status'] ?? 0,
+                    'executed_at' => date('Y-m-d H:i:s'),
+                    'username' => Session::get('username'),
+                ],
             ]);
         } catch (\Throwable $e) {
             $this->view->json([
@@ -122,6 +129,7 @@ class TerminalController
                 'message' => 'Failed to execute command.',
             ]);
         }
+    }
 
     public function history(int $id): void
     {
diff --git a/src/Core/View.php b/src/Core/View.php
index 1736420..9b9d8a6 100755
--- a/src/Core/View.php
+++ b/src/Core/View.php
@@ -10,6 +10,7 @@ class View
     private string $layout = 'main';
     private array $data = [];
     private Security $security;
+    private ?string $csrfTokenCache = null;
 
     public function __construct(Security $security)
     {
@@ -80,7 +81,10 @@ class View
 
     public function csrfToken(): string
     {
-        return $this->security->generateCSRFToken();
+        if ($this->csrfTokenCache === null) {
+            $this->csrfTokenCache = $this->security->generateCSRFToken();
+        }
+        return $this->csrfTokenCache;
     }
 
     public function csrfField(): string
diff --git a/src/Models/CommandHistory.php b/src/Models/CommandHistory.php
index 2f1c610..c2af2ad 100755
--- a/src/Models/CommandHistory.php
+++ b/src/Models/CommandHistory.php
@@ -23,6 +23,7 @@ class CommandHistory
             'command' => $command,
             'output' => mb_substr($output ?? '', 0, 65535),
             'exit_status' => $exitStatus,
+            'status' => 'active',
             'executed_at' => date('Y-m-d H:i:s'),
         ]);
     }