diff --git a/webapp/api.php b/webapp/api.php
index e79ba52..75c9004 100644
--- a/webapp/api.php
+++ b/webapp/api.php
@@ -1018,7 +1018,7 @@ function logAction($db, $entryId, $action, $oldValues, $newValues) {
         ':action' => $action,
         ':old_values' => $oldValues ? json_encode($oldValues) : null,
         ':new_values' => $newValues ? json_encode($newValues) : null,
-        ':changed_by' => $_SERVER['REMOTE_ADDR'] ?? 'system'
+        ':changed_by' => function_exists('getAuditUser') ? getAuditUser() : ($_SESSION['user'] ?? 'system')
     ]);
 }
 
diff --git a/webapp/settings.php b/webapp/settings.php
index 59033a8..43e4b18 100644
--- a/webapp/settings.php
+++ b/webapp/settings.php
@@ -91,10 +91,12 @@ require_once __DIR__ . '/includes/header.php';
             </a>
             <a href="?tab=advanced" class="settings-nav-item <?php echo $currentTab === 'advanced' ? 'active' : ''; ?>">
                 <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                    <circle cx="12" cy="12" r="3"/>
-                    <path d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"/>
+                    <path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/>
+                    <circle cx="9" cy="7" r="4"/>
+                    <path d="M23 21v-2a4 4 0 0 0-3-3.87"/>
+                    <path d="M16 3.13a4 4 0 0 1 0 7.75"/>
                 </svg>
-                Advanced
+                Client Settings
             </a>
             <a href="?tab=whitelabel" class="settings-nav-item <?php echo $currentTab === 'whitelabel' ? 'active' : ''; ?>">
                 <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
@@ -416,9 +418,30 @@ require_once __DIR__ . '/includes/header.php';
                     </svg>
                     Company Logos
                 </h2>
-                <p class="advanced-section-desc">Upload logos for client shortnames to display in the table.</p>
+                <p class="advanced-section-desc">Manage logo images for client shortnames. Logos will appear in the entries table as 1:1 square icons.</p>
 
-                <div id="logosContainer" style="margin-top: 16px;">
+                <div class="form-row" style="margin-bottom: 16px; margin-top: 16px;">
+                    <div class="form-group" style="margin-bottom: 0;">
+                        <label class="form-label">Client Short Name</label>
+                        <select class="form-select" id="logoShortName">
+                            <option value="">Select or type a shortname...</option>
+                        </select>
+                    </div>
+                    <div class="form-group" style="margin-bottom: 0;">
+                        <label class="form-label">Logo URL (PNG)</label>
+                        <input type="url" class="form-input" id="logoUrl" placeholder="https://example.com/logo.png">
+                    </div>
+                </div>
+                <button class="btn btn-primary" onclick="saveLogo()">
+                    <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
+                        <path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/>
+                        <polyline points="17 21 17 13 7 13 7 21"/>
+                        <polyline points="7 3 7 8 15 8"/>
+                    </svg>
+                    Save Logo
+                </button>
+
+                <div class="logo-grid" id="logoGrid" style="margin-top: 16px;">
                     <div class="loading"><div class="spinner"></div></div>
                 </div>
             </div>
@@ -533,7 +556,7 @@ require_once __DIR__ . '/includes/header.php';
             <!-- System Info -->
             <div class="advanced-section">
                 <h2 class="advanced-section-title">System Information</h2>
-                <div id="systemInfoContainer" style="margin-top: 16px;">
+                <div id="systemInfoContent" style="margin-top: 16px;">
                     <div class="loading"><div class="spinner"></div></div>
                 </div>
             </div>
@@ -541,10 +564,19 @@ require_once __DIR__ . '/includes/header.php';
             <!-- Error Logs -->
             <div class="advanced-section">
                 <h2 class="advanced-section-title">Error Logs</h2>
-                <div style="display: flex; justify-content: flex-end; margin-bottom: 12px;">
+                <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 12px;">
+                    <div style="display: flex; gap: 8px; align-items: center;">
+                        <label class="form-label" style="margin: 0;">Show last</label>
+                        <select id="errorLogLines" class="form-input" style="width: auto;" onchange="loadErrorLogs()">
+                            <option value="50">50 lines</option>
+                            <option value="100" selected>100 lines</option>
+                            <option value="250">250 lines</option>
+                            <option value="500">500 lines</option>
+                        </select>
+                    </div>
                     <button class="btn btn-secondary btn-sm" onclick="clearErrorLogs()">Clear Logs</button>
                 </div>
-                <div id="errorLogsContainer" style="margin-top: 16px; max-height: 400px; overflow-y: auto; background: var(--bg-tertiary); border-radius: var(--radius-md); padding: 16px; font-family: monospace; font-size: 12px;">
+                <div id="errorLogsContent" style="margin-top: 16px;">
                     <div class="loading"><div class="spinner"></div></div>
                 </div>
             </div>