diff --git a/app/templates/admin.php b/app/templates/admin.php
index 2c91227..612c9ed 100644
--- a/app/templates/admin.php
+++ b/app/templates/admin.php
@@ -417,7 +417,7 @@ if (!empty($adminOverviewStatuses) && is_array($adminOverviewStatuses)) {
                                 $statusBadges = [];
                                 $statusBadges[] = $plugin['enabled']
                                     ? '<span class="badge text-uppercase" style="background-color:#198754;color:#fff;">Enabled</span>'
-                                    : '<span class="badge text-uppercase" style="background-color:#6c757d;color:#fff;">Disabled</span>';
+                                    : '<span class="badge text-uppercase" style="background-color:#c6c6c6;color:#fff;">Disabled</span>';
                                 if ($plugin['enabled'] && empty($depErrors) && $plugin['loaded']) {
                                     $statusBadges[] = '<span class="badge text-uppercase" style="background-color:#0dcaf0;color:#052c65;">Loaded</span>';
                                 }
diff --git a/plugins/logs/controllers/logs.php b/plugins/logs/controllers/logs.php
index 813debb..9e7670c 100644
--- a/plugins/logs/controllers/logs.php
+++ b/plugins/logs/controllers/logs.php
@@ -143,15 +143,11 @@ function logs_plugin_render_list($logObject, $db, int $userId, bool $validSessio
     $username = $userObject->getUserDetails($userId)[0]['username'];
     $page = 'logs'; // For pagination template
 
-    \App\Helpers\Theme::include('page-header');
-    \App\Helpers\Theme::include('page-menu');
-    if ($validSession) {
-        \App\Helpers\Theme::include('page-sidebar');
-    }
+    // Get any new feedback messages            
+    include_once APP_PATH . 'helpers/feedback.php';
 
-    include APP_PATH . 'helpers/feedback.php';
     require_once PLUGIN_LOGS_PATH . 'helpers/logs_view_helper.php';
-    include PLUGIN_LOGS_PATH . 'views/logs.php';
 
-    \App\Helpers\Theme::include('page-footer');
+    // Load the view
+    include PLUGIN_LOGS_PATH . 'views/logs.php';
 }
diff --git a/plugins/register/controllers/register.php b/plugins/register/controllers/register.php
index 2e445fb..b971489 100644
--- a/plugins/register/controllers/register.php
+++ b/plugins/register/controllers/register.php
@@ -142,18 +142,12 @@ function register_plugin_render_form(bool $validSession, string $app_root, array
     $formValues = $data['values'] ?? ['username' => ''];
     $registrationEnabled = $data['registrationEnabled'] ?? true;
 
-    \App\Helpers\Theme::include('page-header');
-    \App\Helpers\Theme::include('page-menu');
-    if ($validSession) {
-        \App\Helpers\Theme::include('page-sidebar');
-    }
+    // Get any new feedback messages
+    include_once APP_PATH . 'helpers/feedback.php';
 
-    include APP_PATH . 'helpers/feedback.php';
-
-    $values = $formValues;
-    $app_root = $app_root;
+    $csrf_token = \SecurityHelper::getInstance()->generateCsrfToken();
+    $registerCsrfToken = $csrf_token;
 
+    // Load the view
     include PLUGIN_REGISTER_PATH . 'views/form-register.php';
-
-    \App\Helpers\Theme::include('page-footer');
 }