diff --git a/app/pages/logs.php b/app/pages/logs.php
index 8c6a21a..a2c2d26 100644
--- a/app/pages/logs.php
+++ b/app/pages/logs.php
@@ -3,8 +3,9 @@
 /**
  * Logs listings
  *
- * This page ("logs") retrieves and displays logs for a specified user within a time range.
- * It supports pagination and filtering, and generates a widget to display the logs.
+ * This page ("logs") retrieves and displays logs within a time range
+ * either for a specified user or for all users.
+ * It supports pagination and filtering.
  */
 
 // Get any new messages
@@ -103,22 +104,9 @@ if (!empty($search)) {
     }
 }
 
-// prepare the widget
-$widget['full'] = false;
-$widget['name'] = 'Logs';
 $username = $userObject->getUserDetails($user_id)[0]['username'];
-$widget['title'] = "Log events";
-$widget['filter'] = true;
-$widget['scope'] = $scope;
-$widget['has_system_access'] = $has_system_access;
 
-if (!empty($logs['records'])) {
-    $widget['full'] = true;
-    $widget['table_records'] = $logs['records'];
-}
-$widget['pagination'] = true;
-
-// display the widget
-include '../app/templates/logs-list.php';
+// Load the template
+include '../app/templates/logs.php';
 
 ?>
diff --git a/app/templates/logs-filter.php b/app/templates/logs-filter.php
deleted file mode 100644
index b9c13ab..0000000
--- a/app/templates/logs-filter.php
+++ /dev/null
@@ -1,41 +0,0 @@
-                    <!-- Logs filter -->
-                    <div class="card mb-3">
-                        <div class="card-body">
-                            <form method="get" action="" class="row g-3 align-items-end">
-                                <input type="hidden" name="page" value="logs">
-                                <input type="hidden" name="tab" value="<?= htmlspecialchars($widget['scope']) ?>">
-
-                                <div class="col-md-3">
-                                    <label for="from_time" class="form-label">From date</label>
-                                    <input type="date" class="form-control" id="from_time" name="from_time" value="<?= htmlspecialchars($_REQUEST['from_time'] ?? '') ?>">
-                                </div>
-
-                                <div class="col-md-3">
-                                    <label for="until_time" class="form-label">Until date</label>
-                                    <input type="date" class="form-control" id="until_time" name="until_time" value="<?= htmlspecialchars($_REQUEST['until_time'] ?? '') ?>">
-                                </div>
-
-<?php if ($widget['scope'] === 'system') { ?>
-                                <div class="col-md-2">
-                                    <label for="id" class="form-label">User ID</label>
-                                    <input type="text" class="form-control" id="id" name="id" value="<?= htmlspecialchars($_REQUEST['id'] ?? '') ?>" placeholder="Enter user ID">
-                                </div>
-<?php } ?>
-
-                                <div class="col-md">
-                                    <label for="message" class="form-label">Message</label>
-                                    <input type="text" class="form-control" id="message" name="message" value="<?= htmlspecialchars($_REQUEST['message'] ?? '') ?>" placeholder="Search in log messages">
-                                </div>
-
-                                <div class="col-md-auto">
-                                    <button type="submit" class="btn btn-primary me-2">
-                                        <i class="fas fa-search me-2"></i>Search
-                                    </button>
-                                    <a href="?page=logs&tab=<?= htmlspecialchars($widget['scope']) ?>" class="btn btn-outline-secondary">
-                                        <i class="fas fa-times me-2"></i>Clear
-                                    </a>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                    <!-- /Logs filter -->
diff --git a/app/templates/logs-list.php b/app/templates/logs-list.php
deleted file mode 100644
index 6ffa5fc..0000000
--- a/app/templates/logs-list.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<!-- log events -->
-<div class="container-fluid mt-2">
-    <div class="row mb-4">
-        <div class="col">
-            <h2 class="mb-3"><?= htmlspecialchars($widget['title']) ?></h2>
-            <ul class="nav nav-tabs mb-3">
-                <li class="nav-item">
-                    <a class="nav-link <?= $widget['scope'] === 'user' ? 'active' : '' ?>" href="?page=logs&tab=user">
-                        Logs for current user
-                    </a>
-                </li>
-<?php if ($widget['has_system_access']) { ?>
-                <li class="nav-item">
-                    <a class="nav-link <?= $widget['scope'] === 'system' ? 'active' : '' ?>" href="?page=logs&tab=system">
-                        Logs for all users
-                    </a>
-                </li>
-<?php } ?>
-            </ul>
-
-<?php if ($widget['filter'] === true) {
-    include '../app/templates/logs-filter.php';
-} ?>
-
-            <!-- widget "<?= htmlspecialchars($widget['name']) ?>" -->
-            <div class="collapse show" id="collapse<?= htmlspecialchars($widget['name']) ?>">
-<?php if ($time_range_specified) { ?>
-                <div class="alert alert-info m-3">
-                    <i class="fas fa-calendar-alt me-2"></i>Time period: <strong><?= htmlspecialchars($from_time) ?> - <?= htmlspecialchars($until_time) ?></strong>
-                </div>
-<?php } ?>
-                <div class="mb-5">
-<?php if ($widget['full'] === true) { ?>
-                    <div class="table-responsive">
-                        <table class="table table-hover align-middle mb-0">
-                            <thead class="table-light">
-                                <tr>
-<?php if ($widget['scope'] === 'system') { ?>
-                                    <th>Username (id)</th>
-<?php } ?>
-                                    <th>Time</th>
-                                    <th>Log message</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-<?php     foreach ($widget['table_records'] as $row) { ?>
-                                <tr>
-<?php         if ($widget['scope'] === 'system') { ?>
-                                    <td><strong><?= htmlspecialchars($row['username']) ?> (<?= htmlspecialchars($row['userID']) ?>)</strong></td>
-<?php         } ?>
-                                    <td><span class="text-muted"><?= date('d M Y H:i', strtotime($row['time'])) ?></span></td>
-                                    <td><?= htmlspecialchars($row['log message']) ?></td>
-                                </tr>
-<?php     } ?>
-                            </tbody>
-                        </table>
-                    </div>
-<?php
-if ($widget['pagination'] === true) {
-    include '../app/templates/pagination.php';
-}
-?>
-<?php } else { ?>
-                    <div class="alert alert-info m-3">
-                        <i class="fas fa-info-circle me-2"></i>No log entries found for the specified criteria.
-                    </div>
-<?php } ?>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<!-- /log events -->
diff --git a/app/templates/logs.php b/app/templates/logs.php
new file mode 100644
index 0000000..1f103a2
--- /dev/null
+++ b/app/templates/logs.php
@@ -0,0 +1,108 @@
+
+<!-- log events -->
+<div class="container-fluid mt-2">
+    <div class="row mb-4">
+        <div class="col-md-6 mb-5">
+            <h2>Log events</h2>
+        </div>
+        <div class="row mb-4">
+            <ul class="nav nav-tabs mb-3">
+                <li class="nav-item">
+                    <a class="nav-link <?= $scope === 'user' ? 'active' : '' ?>" href="?page=logs&tab=user">
+                        Logs for current user
+                    </a>
+                </li>
+<?php if ($has_system_access) { ?>
+                <li class="nav-item">
+                    <a class="nav-link <?= $scope === 'system' ? 'active' : '' ?>" href="?page=logs&tab=system">
+                        Logs for all users
+                    </a>
+                </li>
+<?php } ?>
+            </ul>
+
+            <!-- logs filter -->
+            <div class="card mb-3">
+                <div class="card-body">
+                    <form method="get" action="" class="row g-3 align-items-end">
+                        <input type="hidden" name="page" value="logs">
+                        <input type="hidden" name="tab" value="<?= htmlspecialchars($scope) ?>">
+
+                        <div class="col-md-3">
+                            <label for="from_time" class="form-label">From date</label>
+                            <input type="date" class="form-control" id="from_time" name="from_time" value="<?= htmlspecialchars($_REQUEST['from_time'] ?? '') ?>">
+                        </div>
+
+                        <div class="col-md-3">
+                            <label for="until_time" class="form-label">Until date</label>
+                            <input type="date" class="form-control" id="until_time" name="until_time" value="<?= htmlspecialchars($_REQUEST['until_time'] ?? '') ?>">
+                        </div>
+
+<?php if ($scope === 'system') { ?>
+                        <div class="col-md-2">
+                            <label for="id" class="form-label">User ID</label>
+                            <input type="text" class="form-control" id="id" name="id" value="<?= htmlspecialchars($_REQUEST['id'] ?? '') ?>" placeholder="Enter user ID">
+                        </div>
+<?php } ?>
+
+                        <div class="col-md">
+                            <label for="message" class="form-label">Message</label>
+                            <input type="text" class="form-control" id="message" name="message" value="<?= htmlspecialchars($_REQUEST['message'] ?? '') ?>" placeholder="Search in log messages">
+                        </div>
+
+                        <div class="col-md-auto">
+                            <button type="submit" class="btn btn-primary me-2">
+                                <i class="fas fa-search me-2"></i>Search
+                            </button>
+                            <a href="?page=logs&tab=<?= htmlspecialchars($scope) ?>" class="btn btn-outline-secondary">
+                                <i class="fas fa-times me-2"></i>Clear
+                            </a>
+                        </div>
+                    </form>
+                </div>
+            </div>
+            <!-- /logs filter -->
+
+            <!-- logs -->
+<?php if ($time_range_specified) { ?>
+            <div class="alert alert-info m-3">
+                <i class="fas fa-calendar-alt me-2"></i>Time period: <strong><?= htmlspecialchars($from_time) ?> - <?= htmlspecialchars($until_time) ?></strong>
+            </div>
+<?php } ?>
+            <div class="mb-5">
+<?php if (!empty($logs['records'])) { ?>
+                <div class="table-responsive">
+                    <table class="table table-hover align-middle mb-0">
+                        <thead class="table-light">
+                            <tr>
+<?php if ($scope === 'system') { ?>
+                                <th>Username (id)</th>
+<?php } ?>
+                                <th>Time</th>
+                                <th>Log message</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+<?php     foreach ($logs['records'] as $row) { ?>
+                            <tr>
+<?php         if ($scope === 'system') { ?>
+                                <td><strong><?= htmlspecialchars($row['username']) ?> (<?= htmlspecialchars($row['userID']) ?>)</strong></td>
+<?php         } ?>
+                                <td><span class="text-muted"><?= date('d M Y H:i', strtotime($row['time'])) ?></span></td>
+                                <td><?= htmlspecialchars($row['log message']) ?></td>
+                            </tr>
+<?php     } ?>
+                        </tbody>
+                    </table>
+                </div>
+<?php include '../app/templates/pagination.php'; ?>
+<?php } else { ?>
+                <div class="alert alert-info m-3">
+                    <i class="fas fa-info-circle me-2"></i>No log entries found for the specified criteria.
+                </div>
+<?php } ?>
+            </div>
+        </div>
+    </div>
+</div>
+<!-- /log events -->