diff --git a/app/helpers/feedback.php b/app/helpers/feedback.php
new file mode 100644
index 0000000..2e90556
--- /dev/null
+++ b/app/helpers/feedback.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Feedback Helper
+ *
+ * Combines functionality to handle retrieving and displaying feedback messages.
+ */
+
+// Get any flash messages from previous request
+$flash_messages = Feedback::getFlash();
+if (!empty($flash_messages)) {
+    $system_messages = array_merge($system_messages ?? [], array_map(function($flash) {
+        return [
+            'category' => $flash['category'],
+            'key' => $flash['key'],
+            'custom_message' => $flash['custom_message'] ?? null,
+            'dismissible' => $flash['dismissible'] ?? false,
+            'small' => $flash['small'] ?? false
+        ];
+    }, $flash_messages));
+}
+
+// Show feedback messages
+if (isset($system_messages) && is_array($system_messages)) {
+    foreach ($system_messages as $msg) {
+        echo Feedback::render(
+            $msg['category'],
+            $msg['key'],
+            $msg['custom_message'] ?? null,
+            $msg['dismissible'] ?? false,
+            $msg['small'] ?? false
+        );
+    }
+}
+
+?>
diff --git a/app/helpers/securityhelper.php b/app/helpers/security.php
similarity index 94%
rename from app/helpers/securityhelper.php
rename to app/helpers/security.php
index f99d8cc..4c06b09 100644
--- a/app/helpers/securityhelper.php
+++ b/app/helpers/security.php
@@ -1,7 +1,11 @@
 <?php
 
-// Security helper, to be used with all the forms in the app
-
+/**
+ * Security Helper
+ * 
+ * Security helper, to be used with all the forms in the app.
+ * Implements singleton pattern for consistent state management.
+ */
 class SecurityHelper {
     private static $instance = null;
     private $session;
@@ -13,7 +17,7 @@ class SecurityHelper {
 
     public static function getInstance() {
         if (self::$instance === null) {
-            self::$instance = new SecurityHelper();
+            self::$instance = new Security();
         }
         return self::$instance;
     }
diff --git a/app/includes/csrf_middleware.php b/app/includes/csrf_middleware.php
index 3f5f1c7..b19937a 100644
--- a/app/includes/csrf_middleware.php
+++ b/app/includes/csrf_middleware.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/../helpers/securityhelper.php';
+require_once __DIR__ . '/../helpers/security.php';
 
 function verifyCsrfToken() {
     $security = SecurityHelper::getInstance();
diff --git a/app/includes/feedback-get.php b/app/includes/feedback-get.php
deleted file mode 100644
index 908e9a9..0000000
--- a/app/includes/feedback-get.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-// Get any flash messages from previous request
-$flash_messages = Feedback::getFlash();
-if (!empty($flash_messages)) {
-    $system_messages = array_merge($system_messages, array_map(function($flash) {
-        return [
-            'category' => $flash['category'],
-            'key' => $flash['key'],
-            'custom_message' => $flash['custom_message'] ?? null,
-            'dismissible' => $flash['dismissible'] ?? false,
-            'small' => $flash['small'] ?? false
-        ];
-    }, $flash_messages));
-}
-
-?>
diff --git a/app/includes/feedback-show.php b/app/includes/feedback-show.php
deleted file mode 100644
index 0fced2d..0000000
--- a/app/includes/feedback-show.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if (isset($system_messages) && is_array($system_messages)) {
-    foreach ($system_messages as $msg) {
-        echo Feedback::render(
-            $msg['category'],
-            $msg['key'],
-            $msg['custom_message'] ?? null,
-            $msg['dismissible'] ?? false,
-            $msg['small'] ?? false
-        );
-    }
-}
-
-?>
diff --git a/app/pages/agents.php b/app/pages/agents.php
index 7b904e7..0f66142 100644
--- a/app/pages/agents.php
+++ b/app/pages/agents.php
@@ -167,8 +167,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
     }
 
     // Get any new feedback messages
-    include '../app/includes/feedback-get.php';
-    include '../app/includes/feedback-show.php';
+    include '../app/helpers/feedback.php';
 
     // Load the template
     include '../app/templates/agents.php';
diff --git a/app/pages/components.php b/app/pages/components.php
index 2e3f5b5..a696eba 100644
--- a/app/pages/components.php
+++ b/app/pages/components.php
@@ -101,8 +101,7 @@ if ($response['db'] === null) {
     }
 
     // Get any new feedback messages
-    include '../app/includes/feedback-get.php';
-    include '../app/includes/feedback-show.php';
+    include '../app/helpers/feedback.php';
 
     // display the widget
     include '../app/templates/components.php';
diff --git a/app/pages/conferences.php b/app/pages/conferences.php
index 4011d91..a2d60aa 100644
--- a/app/pages/conferences.php
+++ b/app/pages/conferences.php
@@ -160,8 +160,7 @@ if ($response['db'] === null) {
     }
 
     // Get any new feedback messages
-    include '../app/includes/feedback-get.php';
-    include '../app/includes/feedback-show.php';
+    include '../app/helpers/feedback.php';
 
     // display the widget
     include '../app/templates/conferences.php';
diff --git a/app/pages/config.php b/app/pages/config.php
index f1a73d6..b34f3aa 100644
--- a/app/pages/config.php
+++ b/app/pages/config.php
@@ -7,8 +7,7 @@
  */
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 require '../app/classes/config.php';
 $configObject = new Config();
diff --git a/app/pages/dashboard.php b/app/pages/dashboard.php
index 3e8138d..45bf8ea 100644
--- a/app/pages/dashboard.php
+++ b/app/pages/dashboard.php
@@ -10,8 +10,7 @@
  */
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 require '../app/classes/conference.php';
 require '../app/classes/participant.php';
diff --git a/app/pages/graphs.php b/app/pages/graphs.php
index 5ef01c9..9e3ec63 100644
--- a/app/pages/graphs.php
+++ b/app/pages/graphs.php
@@ -85,8 +85,7 @@ $widget['name'] = 'Graphs';
 $widget['title'] = 'Jitsi graphs';
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 // Load the template
 include '../app/templates/graphs.php';
diff --git a/app/pages/help.php b/app/pages/help.php
index adfaa1a..00044dd 100644
--- a/app/pages/help.php
+++ b/app/pages/help.php
@@ -1,8 +1,7 @@
 <?php
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 include '../app/templates/help.php';
 
diff --git a/app/pages/latest.php b/app/pages/latest.php
index 21893b0..fa77b1a 100644
--- a/app/pages/latest.php
+++ b/app/pages/latest.php
@@ -100,8 +100,7 @@ foreach ($hosts as $host) {
 }
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 // Load the template
 include '../app/templates/latest.php';
diff --git a/app/pages/livejs.php b/app/pages/livejs.php
index b5df08f..b46697f 100644
--- a/app/pages/livejs.php
+++ b/app/pages/livejs.php
@@ -10,8 +10,7 @@ $settingsObject = new Settings();
 $livejsData = $settingsObject->getPlatformJsFile($platformDetails[0]['jitsi_url'], $item, $raw);
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 // Load the template
 include '../app/templates/livejs.php';
diff --git a/app/pages/login.php b/app/pages/login.php
index 0686c66..faf3ad5 100644
--- a/app/pages/login.php
+++ b/app/pages/login.php
@@ -144,8 +144,7 @@ if (!empty($config['login_message'])) {
 }
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 // Load the template
 include '../app/templates/form-login.php';
diff --git a/app/pages/logs.php b/app/pages/logs.php
index cadca72..1a74f33 100644
--- a/app/pages/logs.php
+++ b/app/pages/logs.php
@@ -9,8 +9,7 @@
  */
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 // Check for rights; user or system
 $has_system_access = ($userObject->hasRight($user_id, 'superuser') ||
diff --git a/app/pages/participants.php b/app/pages/participants.php
index 7e24ca4..62788a9 100644
--- a/app/pages/participants.php
+++ b/app/pages/participants.php
@@ -170,8 +170,7 @@ if ($response['db'] === null) {
     }
 
     // Get any new feedback messages
-    include '../app/includes/feedback-get.php';
-    include '../app/includes/feedback-show.php';
+    include '../app/helpers/feedback.php';
 
     // display the widget
     include '../app/templates/participants.php';
diff --git a/app/pages/profile.php b/app/pages/profile.php
index 11b78c8..367335a 100644
--- a/app/pages/profile.php
+++ b/app/pages/profile.php
@@ -145,8 +145,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $isTimezoneSet = !empty($userDetails[0]['timezone']);
 
             // Get any new feedback messages
-            include '../app/includes/feedback-get.php';
-            include '../app/includes/feedback-show.php';
+            include '../app/helpers/feedback.php';
 
             // Load the template
             include '../app/templates/profile-edit.php';
@@ -154,8 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
         default:
             // Get any new feedback messages
-            include '../app/includes/feedback-get.php';
-            include '../app/includes/feedback-show.php';
+            include '../app/helpers/feedback.php';
 
             // Load the template
             include '../app/templates/profile.php';
diff --git a/app/pages/register.php b/app/pages/register.php
index 3144984..923bf53 100644
--- a/app/pages/register.php
+++ b/app/pages/register.php
@@ -71,8 +71,7 @@ if ($config['registration_enabled'] == true) {
     }
 
     // Get any new feedback messages
-    include '../app/includes/feedback-get.php';
-    include '../app/includes/feedback-show.php';
+    include '../app/helpers/feedback.php';
 
     // Load the template
     include '../app/templates/form-register.php';
diff --git a/app/pages/security.php b/app/pages/security.php
index 64e7017..b0ec586 100644
--- a/app/pages/security.php
+++ b/app/pages/security.php
@@ -160,8 +160,7 @@ $whitelisted = $rateLimiter->getWhitelistedIps();
 $blacklisted = $rateLimiter->getBlacklistedIps();
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 // Load the template
 include '../app/templates/security.php';
diff --git a/app/pages/settings.php b/app/pages/settings.php
index 74ad3d3..ef7041b 100644
--- a/app/pages/settings.php
+++ b/app/pages/settings.php
@@ -8,8 +8,7 @@
  */
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 $action = $_REQUEST['action'] ?? '';
 $agent = $_REQUEST['agent'] ?? '';
diff --git a/app/pages/status.php b/app/pages/status.php
index 4b88dec..7470e21 100644
--- a/app/pages/status.php
+++ b/app/pages/status.php
@@ -9,8 +9,7 @@
  */
 
 // Get any new feedback messages
-include '../app/includes/feedback-get.php';
-include '../app/includes/feedback-show.php';
+include '../app/helpers/feedback.php';
 
 require '../app/classes/agent.php';
 require '../app/classes/host.php';
diff --git a/public_html/index.php b/public_html/index.php
index 105b54c..7b1f9db 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -26,7 +26,7 @@ session_start();
 
 // Initialize security middleware
 require_once '../app/includes/csrf_middleware.php';
-require_once '../app/helpers/securityhelper.php';
+require_once '../app/helpers/security.php';
 $security = SecurityHelper::getInstance();
 
 // Verify CSRF token for POST requests
@@ -126,8 +126,7 @@ try {
 } catch (Exception $e) {
     Feedback::flash('ERROR', 'DEFAULT', getError('Error connecting to the database.', $e->getMessage()));
     include '../app/templates/page-header.php';
-    include '../app/includes/feedback-get.php';
-    include '../app/includes/feedback-show.php';
+    include '../app/helpers/feedback.php';
     include '../app/templates/page-footer.php';
     exit();
 }