diff --git a/app/helpers/database.php b/app/includes/database.php
similarity index 100%
rename from app/helpers/database.php
rename to app/includes/database.php
diff --git a/app/helpers/errors.php b/app/includes/errors.php
similarity index 100%
rename from app/helpers/errors.php
rename to app/includes/errors.php
diff --git a/app/includes/messages.php b/app/includes/messages.php
new file mode 100644
index 0000000..58b95d5
--- /dev/null
+++ b/app/includes/messages.php
@@ -0,0 +1,17 @@
+<?php
+// Start session if not already started
+if (session_status() === PHP_SESSION_NONE) {
+    session_start();
+}
+
+// Include Messages class
+require_once __DIR__ . '/../classes/messages.php';
+
+// Initialize messages array
+$messages = [];
+
+// Get any flash messages from previous requests
+$flash_messages = Messages::getFlash();
+if (!empty($flash_messages)) {
+    $messages = array_merge($messages, $flash_messages);
+}
diff --git a/app/helpers/sanitize.php b/app/includes/sanitize.php
similarity index 100%
rename from app/helpers/sanitize.php
rename to app/includes/sanitize.php
diff --git a/public_html/index.php b/public_html/index.php
index 90c47a7..30ecb08 100644
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -16,9 +16,15 @@
 ob_start();
 
 // sanitize all input vars that may end up in URLs or forms
-require '../app/helpers/sanitize.php';
+require '../app/includes/sanitize.php';
 
-require '../app/helpers/errors.php';
+require '../app/includes/errors.php';
+
+// Include Messages class
+require_once '../app/classes/messages.php';
+
+// Initialize variables for feedback messages
+$messages = [];
 
 // error reporting, comment out in production
 ini_set('display_errors', 1);
@@ -97,7 +103,7 @@ if ( !isset($_COOKIE['username']) && ($page !== 'login' && $page !== 'register')
 
 // connect to db of Jilo Web
 require '../app/classes/database.php';
-require '../app/helpers/database.php';
+require '../app/includes/database.php';
 $response = connectDB($config);
 if ($response['db'] === null) {
     $error .= $response['error'];
@@ -197,6 +203,8 @@ if ($page == 'logout') {
         $server_status = $serverObject->getServerStatus($server_host, $server_port, $server_endpoint);
         if (!$server_status) {
             $error = 'The Jilo Server is not running. Some data may be old and incorrect.';
+            Messages::get('SECURITY', 'RATE_LIMIT_INFO');
+            Messages::render('SECURITY', 'RATE_LIMIT_INFO');
         }
     }