diff --git a/launcher.sh b/launcher.sh
index 6ca139d..5f37f61 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -1,46 +1,27 @@
 #!/bin/bash
 
 #############################################################################
-# Server Management Toolkit - BETA/DEV Version
-# Version: 2.1-beta
+# Server Management Toolkit - Main Launcher
+# Version: 2.1
 #
-# Development and testing version - SEPARATE FROM PRODUCTION
-# Uses independent cache, config, and data directories
+# Streamlined menu showing only implemented features
 #############################################################################
 
 set -eo pipefail
 
-# Check if running in interactive mode
-if [[ $- != *i* ]]; then
-    # Non-interactive mode - set flag for read operations
-    INTERACTIVE_MODE=0
-else
-    INTERACTIVE_MODE=1
-fi
-
 # Configuration
-SUITE_VERSION="2.1.0-BETA"
+SUITE_VERSION="2.1.0"
 BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 MODULES_DIR="$BASE_DIR/modules"
 LIB_DIR="$BASE_DIR/lib"
 CONFIG_DIR="$BASE_DIR/config"
 
 # Load core libraries
-source "$LIB_DIR/common-functions.sh" || { echo "ERROR: Failed to load common-functions.sh"; return 1; }
-source "$LIB_DIR/system-detect.sh" || { echo "ERROR: Failed to load system-detect.sh"; return 1; }
-source "$LIB_DIR/log-paths.sh" || { echo "ERROR: Failed to load log-paths.sh"; return 1; }
-source "$LIB_DIR/database-paths.sh" || { echo "ERROR: Failed to load database-paths.sh"; return 1; }
-source "$LIB_DIR/service-info.sh" || { echo "ERROR: Failed to load service-info.sh"; return 1; }
-source "$LIB_DIR/control-panel-paths.sh" || { echo "ERROR: Failed to load control-panel-paths.sh"; return 1; }
-source "$LIB_DIR/web-server-config.sh" || { echo "ERROR: Failed to load web-server-config.sh"; return 1; }
-source "$LIB_DIR/firewall-operations.sh" || { echo "ERROR: Failed to load firewall-operations.sh"; return 1; }
-source "$LIB_DIR/security-tools.sh" || { echo "ERROR: Failed to load security-tools.sh"; return 1; }
-source "$LIB_DIR/system-authentication.sh" || { echo "ERROR: Failed to load system-authentication.sh"; return 1; }
-source "$LIB_DIR/system-variables.sh" || { echo "ERROR: Failed to load system-variables.sh"; return 1; }
-source "$LIB_DIR/domain-discovery.sh" || { echo "ERROR: Failed to load domain-discovery.sh"; return 1; }
-source "$LIB_DIR/user-manager.sh" || { echo "ERROR: Failed to load user-manager.sh"; return 1; }
-source "$LIB_DIR/reference-db.sh" || { echo "ERROR: Failed to load reference-db.sh"; return 1; }
-source "$LIB_DIR/menu-functions.sh" || { echo "ERROR: Failed to load menu-functions.sh"; return 1; }
+source "$LIB_DIR/common-functions.sh"
+source "$LIB_DIR/system-detect.sh"
+source "$LIB_DIR/domain-discovery.sh"
+source "$LIB_DIR/user-manager.sh"
+source "$LIB_DIR/reference-db.sh"
 
 # Color codes
 RED='\033[0;31m'
@@ -55,12 +36,10 @@ NC='\033[0m'
 # Banner
 show_banner() {
     clear
-    echo "═══════════════════════════════════════════════════════════════"
-    echo "     ⚠️  Server Management Toolkit v${SUITE_VERSION}"
-    echo "     🧪 BETA/DEV VERSION - Testing & Development"
-    echo "     Complete cPanel/Linux Server Administration Suite"
-    echo "═══════════════════════════════════════════════════════════════"
-    echo "     ⚠️  This is a SEPARATE INSTANCE from production"
+    echo -e "${CYAN}═══════════════════════════════════════════════════════════════${NC}"
+    echo -e "${CYAN}     ⚡ Server Management Toolkit v${SUITE_VERSION}${NC}"
+    echo -e "${CYAN}     Complete cPanel/Linux Server Administration Suite${NC}"
+    echo -e "${CYAN}═══════════════════════════════════════════════════════════════${NC}"
     echo ""
 }
 
@@ -72,17 +51,15 @@ run_module() {
 
     if [ ! -f "$MODULES_DIR/$category/$module" ]; then
         echo ""
-        echo -e "✗ Module not found: $category/$module"
+        echo -e "${RED}✗ Module not found: $category/$module${NC}"
         echo ""
-        if ! read -p "Press Enter to continue..." </dev/tty 2>/dev/null; then
-            true  # Continue even if read fails
-        fi
+        read -p "Press Enter to continue..." < /dev/tty 2>/dev/null || true
         return 1
     fi
 
     echo ""
-    echo -e "Launching: $category/$module"
-    echo -e "──────────────────────────────────────────────────────────────"
+    echo -e "${CYAN}Launching: $category/$module${NC}"
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
 
     # Run module directly - keep SYS_ variables cached for performance
     # Modules will use cached detection instead of re-detecting on every run
@@ -90,71 +67,14 @@ run_module() {
     local exit_code=$?
 
     echo ""
-    echo -e "──────────────────────────────────────────────────────────────"
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
     if [ "${exit_code:-0}" -eq 0 ]; then
-        echo -e "✓ Completed successfully"
+        echo -e "${GREEN}✓ Completed successfully${NC}"
     else
-        echo -e "✗ Exited with code: $exit_code"
+        echo -e "${RED}✗ Exited with code: $exit_code${NC}"
     fi
     echo ""
-    if ! read -p "Press Enter to continue..." </dev/tty 2>/dev/null; then
-        true  # Continue even if read fails
-    fi
-}
-
-#############################################################################
-# SYSTEM INFO DISPLAY (Quick View)
-#############################################################################
-
-show_system_overview() {
-    # Only show if detection is complete
-    if [ -z "${SYS_DETECTION_COMPLETE:-}" ]; then
-        return
-    fi
-
-    echo ""
-    echo "🖥️  System Information:"
-
-    # Control Panel
-    if [ "$SYS_CONTROL_PANEL" != "none" ]; then
-        echo -n "  Control Panel: ${SYS_CONTROL_PANEL^^}"
-        [ -n "$SYS_CONTROL_PANEL_VERSION" ] && echo -n " v${SYS_CONTROL_PANEL_VERSION}" || echo -n " (version unknown)"
-        echo ""
-    else
-        echo "  Control Panel: Standalone (no control panel)"
-    fi
-
-    # OS
-    echo "  OS: ${SYS_OS_TYPE^^} ${SYS_OS_VERSION}"
-    [ "${SYS_CLOUDLINUX:-}" = "yes" ] && echo "  ➜ CloudLinux detected"
-
-    # Web Server
-    echo -n "  Web Server: ${SYS_WEB_SERVER^^}"
-    [ -n "$SYS_WEB_SERVER_VERSION" ] && echo " v${SYS_WEB_SERVER_VERSION}" || echo ""
-
-    # Database
-    if [ "$SYS_DB_TYPE" != "none" ]; then
-        echo -n "  Database: ${SYS_DB_TYPE^^}"
-        [ -n "$SYS_DB_VERSION" ] && echo " v${SYS_DB_VERSION}" || echo ""
-    fi
-
-    # PHP Versions
-    if [ ${#SYS_PHP_VERSIONS[@]} -gt 0 ]; then
-        echo -n "  PHP Versions: "
-        local php_list=$(printf '%s, ' "${SYS_PHP_VERSIONS[@]}")
-        echo "${php_list%, }"
-    fi
-
-    # Firewall
-    if [ "$SYS_FIREWALL" != "none" ]; then
-        echo -n "  Firewall: ${SYS_FIREWALL^^}"
-        [ "$SYS_FIREWALL_ACTIVE" = "yes" ] && echo " (active)" || echo " (inactive)"
-    fi
-
-    # Cloudflare
-    [ "$SYS_CLOUDFLARE_ACTIVE" = "yes" ] && echo "  Cloudflare: Detected"
-
-    echo ""
+    read -p "Press Enter to continue..." < /dev/tty 2>/dev/null || true
 }
 
 #############################################################################
@@ -164,31 +84,26 @@ show_system_overview() {
 show_main_menu() {
     show_banner
 
-    # Show quick system overview if detection is complete
-    [ -n "${SYS_DETECTION_COMPLETE:-}" ] && show_system_overview
-
-    menu_header "Server Management Toolkit"
-
-    menu_section "Quick Diagnostics"
-    menu_option 1 "System Health Check" "Full server diagnostics"
-
+    echo -e "${BOLD}Quick Diagnostics:${NC}"
     echo ""
-    menu_section "Main Categories"
-    menu_option 2 "Security & Monitoring"
-    menu_option 3 "Website Diagnostics"
-    menu_option 4 "Performance & Maintenance"
-    menu_option 5 "Backup & Recovery"
-    menu_option 6 "Email Troubleshooting"
-
+    echo -e "  ${MAGENTA}1)${NC} 🏥 System Health Check        - Full server diagnostics"
     echo ""
-    menu_section "System"
-    menu_option 7 "Cleanup Toolkit Data" "Clear cached data"
-
+    echo -e "${BOLD}Main Categories:${NC}"
     echo ""
-    menu_exit
-    menu_divider
-
-    read_menu_choice "Select option" 0 7
+    echo -e "  ${GREEN}2)${NC} 🛡️  Security & Monitoring"
+    echo -e "  ${BLUE}3)${NC} 🌐 Website Diagnostics"
+    echo -e "  ${MAGENTA}4)${NC} 🔧 Performance & Maintenance"
+    echo -e "  ${YELLOW}5)${NC} 💾 Backup & Recovery"
+    echo -e "  ${CYAN}6)${NC} 📧 Email Troubleshooting"
+    echo ""
+    echo -e "${BOLD}System:${NC}"
+    echo ""
+    echo -e "  ${YELLOW}7)${NC} 🗑️  Cleanup Toolkit Data      - Clear cached data"
+    echo ""
+    echo -e "  ${RED}0)${NC} Exit"
+    echo ""
+    echo -e "${CYAN}═══════════════════════════════════════════════════════════════${NC}"
+    echo -n "Select option: "
 }
 
 #############################################################################
@@ -202,31 +117,29 @@ show_main_menu() {
 # Threat Analysis Sub-Menu
 show_threat_analysis_menu() {
     show_banner
-    menu_header "Threat Analysis"
-
-    menu_option 1 "Bot & Traffic Analyzer" "Full analysis (all logs)"
-    menu_option 2 "Quick Scan (1 hour)" "Recent activity only"
-    menu_option 3 "IP Reputation Manager" "Query/manage IP database"
-    menu_option 4 "Suspicious Login Monitor" "SSH/Panel login analysis"
-    menu_option 5 "Malware Scanner" "ImunifyAV, ClamAV, Maldet"
-    menu_option 6 "Historical Attack Analysis" "Scan past logs (ET Open)"
-
+    echo -e "${GREEN}${BOLD}📊 Threat Analysis${NC}"
     echo ""
-    menu_back "Security Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 6
+    echo -e "  ${CYAN}1)${NC} 🤖 Bot & Traffic Analyzer     - Full analysis (all logs)"
+    echo -e "  ${CYAN}2)${NC} 🤖 Quick Scan (1 hour)        - Recent activity only"
+    echo -e "  ${CYAN}3)${NC} 📊 IP Reputation Manager      - Query/manage IP database"
+    echo -e "  ${CYAN}4)${NC} 🔐 Suspicious Login Monitor   - SSH/Panel login analysis"
+    echo -e "  ${CYAN}5)${NC} 🦠 Malware Scanner            - ImunifyAV, ClamAV, Maldet"
+    echo -e "  ${CYAN}6)${NC} 🛡️  Historical Attack Analysis - Scan past logs (ET Open)"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Security Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_threat_analysis_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_threat_analysis_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "security" "bot-analyzer.sh" ;;
             2) run_module "security" "bot-analyzer.sh" -H 1 ;;
             3) run_module "security" "ip-reputation-manager.sh" ;;
@@ -234,7 +147,7 @@ handle_threat_analysis_menu() {
             5) run_module "security" "malware-scanner.sh" ;;
             6) bash "$BASE_DIR/tools/analyze-historical-attacks.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -242,35 +155,33 @@ handle_threat_analysis_menu() {
 # Live Monitoring Sub-Menu
 show_live_monitoring_menu() {
     show_banner
-    menu_header "Live Monitoring"
-
-    menu_option 1 "Live Attack Monitor" "Unified threat intelligence"
-    menu_option 2 "SSH Attack Monitor" "SSH brute force detection"
-    menu_option 3 "Web Traffic Monitor" "HTTP attack detection"
-    menu_option 4 "Firewall Activity Monitor" "CSF/iptables monitoring"
-
+    echo -e "${MAGENTA}${BOLD}🔴 Live Monitoring${NC}"
     echo ""
-    menu_back "Security Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 4
+    echo -e "  ${MAGENTA}1)${NC} 📡 Live Attack Monitor         - Unified threat intelligence"
+    echo -e "  ${MAGENTA}2)${NC} 🔐 SSH Attack Monitor          - SSH brute force detection"
+    echo -e "  ${MAGENTA}3)${NC} 🌐 Web Traffic Monitor         - HTTP attack detection"
+    echo -e "  ${MAGENTA}4)${NC} 🔥 Firewall Activity Monitor   - CSF/iptables monitoring"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Security Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_live_monitoring_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_live_monitoring_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "security" "live-attack-monitor.sh" ;;
             2) run_module "security" "ssh-attack-monitor.sh" ;;
             3) run_module "security" "web-traffic-monitor.sh" ;;
             4) run_module "security" "firewall-activity-monitor.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -278,35 +189,33 @@ handle_live_monitoring_menu() {
 # Log Viewers Sub-Menu
 show_log_viewers_menu() {
     show_banner
-    menu_header "Log Viewers"
-
-    menu_option 1 "Apache Access Log" "Live web access"
-    menu_option 2 "Apache Error Log" "Live web errors"
-    menu_option 3 "Mail Log" "Live email activity"
-    menu_option 4 "Security Log" "Live auth attempts"
-
+    echo -e "${BLUE}${BOLD}📋 Log Viewers${NC}"
     echo ""
-    menu_back "Security Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 4
+    echo -e "  ${BLUE}1)${NC} 🌐 Apache Access Log          - Live web access"
+    echo -e "  ${BLUE}2)${NC} ❌ Apache Error Log           - Live web errors"
+    echo -e "  ${BLUE}3)${NC} 📧 Mail Log                   - Live email activity"
+    echo -e "  ${BLUE}4)${NC} 🔐 Security Log               - Live auth attempts"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Security Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_log_viewers_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_log_viewers_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "security" "tail-apache-access.sh" ;;
             2) run_module "security" "tail-apache-error.sh" ;;
             3) run_module "security" "tail-mail-log.sh" ;;
             4) run_module "security" "tail-secure-log.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -314,33 +223,31 @@ handle_log_viewers_menu() {
 # Security Actions Sub-Menu
 show_security_actions_menu() {
     show_banner
-    menu_header "Security Actions"
-
-    menu_option 1 "Enable cPHulk Protection" "Brute force protection"
-    menu_option 2 "Optimize CT_LIMIT" "Connection tracking tuning"
-    menu_option 3 "Block Malicious Bots" "User-Agent blocking (Apache)"
-
+    echo -e "${YELLOW}${BOLD}🔒 Security Actions${NC}"
     echo ""
-    menu_back "Security Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 3
+    echo -e "  ${YELLOW}1)${NC} 🔒 Enable cPHulk Protection  - Brute force protection"
+    echo -e "  ${YELLOW}2)${NC} ⚙️  Optimize CT_LIMIT         - Connection tracking tuning"
+    echo -e "  ${YELLOW}3)${NC} 🤖 Block Malicious Bots      - User-Agent blocking (Apache)"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Security Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_security_actions_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_security_actions_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "security" "enable-cphulk.sh" ;;
             2) run_module "security" "optimize-ct-limit.sh" ;;
             3) run_module "security" "bot-blocker.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -351,35 +258,33 @@ handle_security_actions_menu() {
 
 show_security_menu() {
     show_banner
-    menu_header "Security & Monitoring"
-
-    menu_option 1 "Threat Analysis" "Analyze threats & reputation"
-    menu_option 2 "Live Monitoring" "Real-time attack detection"
-    menu_option 3 "Log Viewers" "Tail system/security logs"
-    menu_option 4 "Security Actions" "Hardening & protection"
-
+    echo -e "${GREEN}${BOLD}🛡️  Security & Monitoring${NC}"
     echo ""
-    menu_back "Main Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 4
+    echo -e "  ${CYAN}1)${NC} 📊 Threat Analysis        → Analyze threats & reputation"
+    echo -e "  ${MAGENTA}2)${NC} 🔴 Live Monitoring         → Real-time attack detection"
+    echo -e "  ${BLUE}3)${NC} 📋 Log Viewers             → Tail system/security logs"
+    echo -e "  ${YELLOW}4)${NC} 🔒 Security Actions        → Hardening & protection"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Main Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_security_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_security_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) handle_threat_analysis_menu ;;
             2) handle_live_monitoring_menu ;;
             3) handle_log_viewers_menu ;;
             4) handle_security_actions_menu ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -390,47 +295,47 @@ handle_security_menu() {
 
 show_website_menu() {
     show_banner
-    menu_header "Website Diagnostics"
-
-    menu_section "Error Analysis"
-    menu_option 1 "Website Error Analyzer" "Find 500/config errors"
-    menu_option 2 "Fast 500 Error Tracker" "ONLY 500s + root cause"
-
+    echo -e "${BLUE}${BOLD}🌐 Website Diagnostics${NC}"
     echo ""
-    menu_section "Performance & Slowness"
-    menu_option 3 "Website Slowness Diagnostics" "Multi-framework analysis"
-
+    echo -e "${BOLD}Error Analysis:${NC}"
     echo ""
-    menu_section "WordPress Management"
-    menu_option 4 "WordPress Tools" "WP-Cron manager & tools"
-
+    echo -e "  ${BLUE}1)${NC} 🔍 Website Error Analyzer    - Find 500/config errors (filters bots)"
+    echo -e "  ${RED}2)${NC} 🔥 Fast 500 Error Tracker    - ONLY 500s + root cause diagnosis"
     echo ""
-    menu_section "Domain Analysis"
-    menu_option 5 "Cloudflare Detector" "Domains using Cloudflare"
-
+    echo -e "${BOLD}Performance & Slowness:${NC}"
     echo ""
-    menu_back "Main Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 5
+    echo -e "  ${MAGENTA}3)${NC} 🐢 Website Slowness Diagnostics - Multi-framework analysis"
+    echo "     └─ WordPress, Drupal, Joomla, Magento, Laravel, Node.js, etc."
+    echo ""
+    echo -e "${BOLD}WordPress Management:${NC}"
+    echo ""
+    echo -e "  ${BLUE}4)${NC} 📦 WordPress Tools           → WP-Cron manager & more tools"
+    echo ""
+    echo -e "${BOLD}Domain Analysis:${NC}"
+    echo ""
+    echo -e "  ${BLUE}5)${NC} 🔶 Cloudflare Detector       - Which domains use Cloudflare + location"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Main Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_website_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_website_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "website" "website-error-analyzer.sh" ;;
             2) run_module "website" "500-error-tracker.sh" ;;
             3) run_module "website" "website-slowness-diagnostics.sh" ;;
             4) bash "$MODULES_DIR/website/wordpress-menu.sh" ;;
             5) run_module "website" "cloudflare-detector.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -441,45 +346,44 @@ handle_website_menu() {
 
 show_performance_menu() {
     show_banner
-    menu_header "Performance & Maintenance"
-
-    menu_section "Database"
-    menu_option 1 "MySQL Query Analyzer" "Find slow queries & optimize"
-
+    echo -e "${MAGENTA}${BOLD}🔧 Performance & Maintenance${NC}"
     echo ""
-    menu_section "Network & Resources"
-    menu_option 2 "Network & Bandwidth" "Traffic & top consumers"
-    menu_option 3 "Hardware Health Check" "SMART, memory, CPU sensors"
-
+    echo -e "${BOLD}Database:${NC}"
     echo ""
-    menu_section "PHP Optimization"
-    menu_option 4 "PHP Configuration Optimizer" "Per-domain PHP tuning"
-
+    echo -e "  ${MAGENTA}1)${NC} 🗄️  MySQL Query Analyzer      - Find slow queries & optimize"
     echo ""
-    menu_section "System Health"
-    menu_option 5 "Loadwatch Health Analyzer" "Historical system analysis"
-    menu_option 6 "Disk Space Analyzer" "Find space issues"
-
+    echo -e "${BOLD}Network & Resources:${NC}"
     echo ""
-    menu_section "Caching Solutions"
-    menu_option 7 "Nginx + Varnish Manager" "Setup/manage caching stack"
-
+    echo -e "  ${MAGENTA}2)${NC} 🌐 Network & Bandwidth        - Traffic & top consumers"
+    echo -e "  ${MAGENTA}3)${NC} 💻 Hardware Health Check      - SMART, memory, CPU sensors"
     echo ""
-    menu_back "Main Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 7
+    echo -e "${BOLD}PHP Optimization:${NC}"
+    echo ""
+    echo -e "  ${MAGENTA}4)${NC} ⚙️  PHP Configuration Optimizer - Per-domain PHP tuning"
+    echo ""
+    echo -e "${BOLD}System Health:${NC}"
+    echo ""
+    echo -e "  ${MAGENTA}5)${NC} 📊 Loadwatch Health Analyzer  - Historical system analysis"
+    echo -e "  ${MAGENTA}6)${NC} 💿 Disk Space Analyzer        - Find space issues & cleanup files"
+    echo ""
+    echo -e "${BOLD}Caching Solutions:${NC}"
+    echo ""
+    echo -e "  ${MAGENTA}7)${NC} ⚡ Nginx + Varnish Manager   - Setup/manage caching stack"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Main Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_performance_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_performance_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "performance" "mysql-query-analyzer.sh" ;;
             2) run_module "performance" "network-bandwidth-analyzer.sh" ;;
             3) run_module "performance" "hardware-health-check.sh" ;;
@@ -488,40 +392,38 @@ handle_performance_menu() {
             6) run_module "maintenance" "disk-space-analyzer.sh" ;;
             7) run_module "performance" "nginx-varnish-manager.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
 
 handle_loadwatch_analyzer() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     show_banner
-    menu_header "Loadwatch Health Analyzer"
-
-    menu_section "Select time range for analysis"
-    menu_option 1 "Last 1 Hour" "Recent activity"
-    menu_option 2 "Last 6 Hours" "Mid-term trending"
-    menu_option 3 "Last 24 Hours" "Full day analysis"
-    menu_option 4 "Last 7 Days" "Weekly patterns"
-    menu_option 5 "Last 30 Days" "Monthly overview"
-
+    echo -e "${MAGENTA}${BOLD}📊 Loadwatch Health Analyzer${NC}"
     echo ""
-    menu_back "Performance Menu"
-    menu_divider
+    echo -e "Select time range for analysis:"
+    echo ""
+    echo -e "  ${CYAN}1)${NC} Last 1 Hour      - Recent activity"
+    echo -e "  ${CYAN}2)${NC} Last 6 Hours     - Mid-term trending"
+    echo -e "  ${CYAN}3)${NC} Last 24 Hours    - Full day analysis"
+    echo -e "  ${CYAN}4)${NC} Last 7 Days      - Weekly patterns"
+    echo -e "  ${CYAN}5)${NC} Last 30 Days     - Monthly overview"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select time range: "
 
-    read_menu_choice "Select time range" 0 5
+    read -r range_choice
 
-    case "$MENU_CHOICE" in
+    case $range_choice in
         1) run_module "diagnostics" "loadwatch-analyzer.sh" "-r" "1h" ;;
         2) run_module "diagnostics" "loadwatch-analyzer.sh" "-r" "6h" ;;
         3) run_module "diagnostics" "loadwatch-analyzer.sh" "-r" "24h" ;;
         4) run_module "diagnostics" "loadwatch-analyzer.sh" "-r" "7d" ;;
         5) run_module "diagnostics" "loadwatch-analyzer.sh" "-r" "30d" ;;
         0) return ;;
-        *) menu_invalid_choice ;;
+        *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
     esac
 }
 
@@ -531,84 +433,82 @@ handle_loadwatch_analyzer() {
 
 show_backup_menu() {
     show_banner
-    menu_header "Backup & Recovery"
-
-    menu_section "Acronis Cyber Protect"
-    menu_option 1 "Acronis Management" "Complete backup management"
-
+    echo -e "${YELLOW}${BOLD}💾 Backup & Recovery${NC}"
     echo ""
-    menu_section "Database Tools"
-    menu_option 2 "MySQL File Restore" "Convert restored DB files"
-
+    echo -e "${BOLD}Acronis Cyber Protect:${NC}"
     echo ""
-    menu_section "Maintenance"
-    menu_option 3 "Cleanup Toolkit Data" "Remove temp files"
-
+    echo -e "  ${YELLOW}1)${NC} 🔷 Acronis Management        → Complete backup management"
     echo ""
-    menu_back "Main Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 3
+    echo -e "${BOLD}Database Tools:${NC}"
+    echo ""
+    echo -e "  ${CYAN}2)${NC} 🔄 MySQL File Restore        - Convert restored DB files to .sql"
+    echo ""
+    echo -e "${BOLD}Maintenance:${NC}"
+    echo ""
+    echo -e "  ${RED}3)${NC} 🗑️  Cleanup Toolkit Data      - Remove IP reputation & temp files"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Main Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 show_acronis_menu() {
     show_banner
-    menu_header "Acronis Cyber Protect"
-
-    menu_section "Installation & Setup"
-    menu_option 1 "Install Acronis Agent" "Download and install"
-    menu_option 2 "Register with Cloud" "Connect to Acronis Cloud"
-    menu_option 3 "Configure Agent" "Adjust settings"
-
+    echo -e "${YELLOW}${BOLD}🔷 Acronis Cyber Protect${NC}"
     echo ""
-    menu_section "Backup Management"
-    menu_option 4 "Manage Backups" "Complete backup interface"
-
+    echo -e "${BOLD}Installation & Setup:${NC}"
     echo ""
-    menu_section "Status & Monitoring"
-    menu_option 5 "Check Agent Status" "Verify Acronis running"
-    menu_option 6 "View Logs" "Check Acronis logs"
-    menu_option 7 "Troubleshoot" "Diagnose backup failures"
-
+    echo -e "  ${YELLOW}1)${NC} Install Acronis Agent       - Download and install"
+    echo -e "  ${YELLOW}2)${NC} Register with Cloud         - Connect to Acronis Cloud"
+    echo -e "  ${YELLOW}3)${NC} Configure Agent             - Adjust settings"
     echo ""
-    menu_section "Maintenance"
-    menu_option 8 "Update Agent" "Upgrade to latest version"
-    menu_option 9 "Uninstall Acronis" "Remove agent"
-
+    echo -e "${BOLD}Backup Management:${NC}"
     echo ""
-    menu_back "Backup Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 9
+    echo -e "  ${GREEN}4)${NC} 📊 Manage Backups            - Complete backup interface"
+    echo ""
+    echo -e "${BOLD}Status & Monitoring:${NC}"
+    echo ""
+    echo -e "  ${CYAN}5)${NC} Check Agent Status          - Verify Acronis is running"
+    echo -e "  ${CYAN}6)${NC} View Logs                   - Check Acronis logs"
+    echo -e "  ${CYAN}7)${NC} Troubleshoot                - Diagnose backup failures"
+    echo ""
+    echo -e "${BOLD}Maintenance:${NC}"
+    echo ""
+    echo -e "  ${YELLOW}8)${NC} Update Agent                - Upgrade to latest version"
+    echo -e "  ${RED}9)${NC} Uninstall Acronis           - Remove agent"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Backup Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_backup_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_backup_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) handle_acronis_menu ;;
             2) run_module "backup" "mysql-restore-to-sql.sh" ;;
             3) run_module "maintenance" "cleanup-toolkit-data.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
 
 handle_acronis_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_acronis_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "backup" "acronis-install.sh" ;;
             2) run_module "backup" "acronis-register.sh" ;;
             3) run_module "backup" "acronis-configure.sh" ;;
@@ -619,7 +519,7 @@ handle_acronis_menu() {
             8) run_module "backup" "acronis-update.sh" ;;
             9) run_module "backup" "acronis-uninstall.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -630,42 +530,41 @@ handle_acronis_menu() {
 
 show_email_menu() {
     show_banner
-    menu_header "Email Troubleshooting & Maintenance"
-
-    menu_section "Diagnostics"
-    menu_option 1 "Email Diagnostics" "Verify email/domain working"
-    menu_option 2 "Email Deliverability Test" "Test sending/receiving"
-    menu_option 3 "Mail Queue Inspector" "View stuck emails"
-    menu_option 4 "SMTP Connection Test" "Verify mail server"
-    menu_option 5 "SPF/DKIM/DMARC Check" "Email authentication"
-
+    echo -e "${CYAN}${BOLD}📧 Email Troubleshooting & Maintenance${NC}"
     echo ""
-    menu_section "Troubleshooting"
-    menu_option 6 "Blacklist Check" "Check IP reputation"
-    menu_option 7 "Mail Log Analyzer" "Search mail logs"
-    menu_option 8 "Flush Mail Queue" "Clear stuck emails"
-
+    echo -e "${BOLD}Diagnostics:${NC}"
     echo ""
-    menu_section "Maintenance"
-    menu_option 9 "Clean Mailboxes" "Remove old emails"
-    menu_option 10 "Mailbox Size Report" "Show usage per account"
-
+    echo -e "  ${CYAN}1)${NC} 🔍 Email Diagnostics           - Verify email/domain is working ⭐"
+    echo -e "  ${CYAN}2)${NC} 📬 Email Deliverability Test   - Test sending/receiving"
+    echo -e "  ${CYAN}3)${NC} 🔍 Mail Queue Inspector        - View stuck emails"
+    echo -e "  ${CYAN}4)${NC} 📊 SMTP Connection Test        - Verify mail server"
+    echo -e "  ${CYAN}5)${NC} 🔐 SPF/DKIM/DMARC Check        - Email authentication"
     echo ""
-    menu_back "Main Menu"
-    menu_divider
-
-    read_menu_choice "Select option" 0 10
+    echo -e "${BOLD}Troubleshooting:${NC}"
+    echo ""
+    echo -e "  ${YELLOW}6)${NC} 🚫 Blacklist Check             - Check IP reputation"
+    echo -e "  ${YELLOW}7)${NC} 📧 Mail Log Analyzer           - Search mail logs"
+    echo -e "  ${YELLOW}8)${NC} 🔄 Flush Mail Queue            - Clear stuck emails"
+    echo ""
+    echo -e "${BOLD}Maintenance:${NC}"
+    echo ""
+    echo -e "  ${GREEN}9)${NC} 🧹 Clean Mailboxes             - Remove old emails"
+    echo -e "  ${GREEN}10)${NC} 📈 Mailbox Size Report        - Show usage per account"
+    echo ""
+    echo -e "  ${RED}0)${NC} Back to Main Menu"
+    echo ""
+    echo -e "${CYAN}──────────────────────────────────────────────────────────────${NC}"
+    echo -n "Select option: "
 }
 
 handle_email_menu() {
-    if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-        return 0  # Non-interactive mode, exit
-    fi
-
     while true; do
         show_email_menu
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            return 0
+        fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "email" "email-diagnostics.sh" ;;
             2) run_module "email" "deliverability-test.sh" ;;
             3) run_module "email" "mail-queue-inspector.sh" ;;
@@ -677,7 +576,7 @@ handle_email_menu() {
             9) run_module "email" "clean-mailboxes.sh" ;;
             10) run_module "email" "mailbox-size-report.sh" ;;
             0) return ;;
-            *) menu_invalid_choice ;;
+            *) echo -e "${RED}Invalid option${NC}"; sleep 1 ;;
         esac
     done
 }
@@ -687,33 +586,14 @@ handle_email_menu() {
 #############################################################################
 
 init_directories() {
-    mkdir -p "$MODULES_DIR"/{security,website,performance,backup,diagnostics,maintenance,email} || {
-        echo "ERROR: Failed to create module directories"; return 1
-    }
-    mkdir -p "$LIB_DIR" "$CONFIG_DIR" "$BASE_DIR/logs" || {
-        echo "ERROR: Failed to create base directories"; return 1
-    }
-    touch "$CONFIG_DIR/whitelist-ips.txt" 2>/dev/null || true
-    touch "$CONFIG_DIR/whitelist-user-agents.txt" 2>/dev/null || true
+    mkdir -p "$MODULES_DIR"/{security,website,performance,backup,diagnostics,maintenance,email}
+    mkdir -p "$LIB_DIR" "$CONFIG_DIR" "$BASE_DIR/logs"
+    touch "$CONFIG_DIR/whitelist-ips.txt" 2>/dev/null
+    touch "$CONFIG_DIR/whitelist-user-agents.txt" 2>/dev/null
 }
 
 startup_detection() {
-    # Auto-clear cache if toolkit files are newer (fresh git pull)
-    # This ensures users always get fresh data after git updates
-    if [ -f "$BASE_DIR/.sysref.beta" ] && [ -f "$BASE_DIR/launcher.sh" ]; then
-        if [ "$BASE_DIR/launcher.sh" -nt "$BASE_DIR/.sysref.beta" ]; then
-            rm -f "$BASE_DIR/.sysref.beta" "$BASE_DIR/.sysref.beta.timestamp" 2>/dev/null || true
-        fi
-    fi
-
-    # Also check production cache name for backward compatibility
-    if [ -f "$BASE_DIR/.sysref" ] && [ -f "$BASE_DIR/launcher.sh" ]; then
-        if [ "$BASE_DIR/launcher.sh" -nt "$BASE_DIR/.sysref" ]; then
-            rm -f "$BASE_DIR/.sysref" "$BASE_DIR/.sysref.timestamp" 2>/dev/null || true
-        fi
-    fi
-
-    # Initialize system detection first (required for show_system_overview)
+    # Initialize system detection first (required for proper reference database)
     if [ -z "${SYS_DETECTION_COMPLETE:-}" ]; then
         initialize_system_detection
     fi
@@ -731,18 +611,19 @@ startup_detection() {
         print_section "Detection Summary"
         echo ""
 
-        echo -e "System:"
+        echo -e "${BOLD}System:${NC}"
         echo "  Control Panel: $SYS_CONTROL_PANEL $SYS_CONTROL_PANEL_VERSION"
         echo "  OS: $SYS_OS_TYPE $SYS_OS_VERSION"
         echo "  Web Server: $SYS_WEB_SERVER $SYS_WEB_SERVER_VERSION"
         echo "  Database: $SYS_DB_TYPE $SYS_DB_VERSION"
         echo ""
 
-        # Count records in database with single awk pass (instead of 4 separate grep -c calls)
-        local counts=$(awk -F'|' '{a[$1]++} END {printf "%d %d %d %d", a["USER"]+0, a["DOMAIN"]+0, a["DB"]+0, a["WP"]+0}' "$SYSREF_DB" 2>/dev/null || echo "0 0 0 0")
-        read -r user_count domain_count db_count wp_count <<< "$counts"
+        local user_count=$(grep -c "^USER|" "$SYSREF_DB" 2>/dev/null || echo 0)
+        local domain_count=$(grep -c "^DOMAIN|" "$SYSREF_DB" 2>/dev/null || echo 0)
+        local db_count=$(grep -c "^DB|" "$SYSREF_DB" 2>/dev/null || echo 0)
+        local wp_count=$(grep -c "^WP|" "$SYSREF_DB" 2>/dev/null || echo 0)
 
-        echo -e "Server Content:"
+        echo -e "${BOLD}Server Content:${NC}"
         echo "  Users: $user_count"
         echo "  Domains: $domain_count"
         echo "  Databases: $db_count"
@@ -752,17 +633,7 @@ startup_detection() {
         print_success "Detection complete! Cached for 1 hour."
         echo ""
 
-        # Read from terminal (use /dev/tty directly)
-        if ! read -p "Press Enter to continue..." </dev/tty 2>/dev/null; then
-            true  # Continue even if read fails
-        fi
-    else
-        # Database is cached and fresh, but still ensure detection was completed
-        # (this addresses issue where detection output not shown on cached runs)
-        if [ -z "${SYS_DETECTION_COMPLETE:-}" ]; then
-            print_error "System detection failed - please check system configuration"
-            return 1
-        fi
+        read -p "Press Enter to continue..." < /dev/tty 2>/dev/null || true
     fi
 }
 
@@ -771,117 +642,19 @@ startup_detection() {
 #############################################################################
 
 main() {
-    # Handle command-line arguments
-    case "${1:-}" in
-        --detect-only|--check-detection)
-            # Initialize directories
-            init_directories || {
-                echo "ERROR: Failed to initialize directories"
-                return 1
-            }
-
-            # Force fresh detection regardless of cache
-            echo "Forcing system re-detection..."
-            echo ""
-            rm -f "$BASE_DIR/.sysref.beta" "$BASE_DIR/.sysref.beta.timestamp" 2>/dev/null || true
-
-            # Run detection
-            initialize_system_detection
-
-            # Show results
-            echo ""
-            echo "═══════════════════════════════════════════════════════════════"
-            echo "                    DETECTION RESULTS"
-            echo "═══════════════════════════════════════════════════════════════"
-            echo ""
-            echo "Control Panel:      ${SYS_CONTROL_PANEL:-unknown} ${SYS_CONTROL_PANEL_VERSION:-}"
-            echo "Operating System:   ${SYS_OS_TYPE:-unknown} ${SYS_OS_VERSION:-}"
-            echo "Web Server:         ${SYS_WEB_SERVER:-unknown} ${SYS_WEB_SERVER_VERSION:-}"
-            echo "Database:           ${SYS_DB_TYPE:-unknown} ${SYS_DB_VERSION:-}"
-            echo "Firewall:           ${SYS_FIREWALL:-unknown} ${SYS_FIREWALL_VERSION:-} (${SYS_FIREWALL_ACTIVE:-unknown})"
-            echo "PHP Versions:       ${SYS_PHP_VERSIONS[*]:-none detected}"
-            echo ""
-            echo "═══════════════════════════════════════════════════════════════"
-            return 0
-            ;;
-        --clear-cache)
-            # Initialize directories first
-            init_directories || {
-                echo "ERROR: Failed to initialize directories"
-                return 1
-            }
-
-            # Clear all caches
-            local cache_cleared=0
-
-            # Production cache
-            if [ -f "$BASE_DIR/.sysref" ] || [ -f "$BASE_DIR/.sysref.timestamp" ]; then
-                rm -f "$BASE_DIR/.sysref" "$BASE_DIR/.sysref.timestamp" 2>/dev/null || true
-                echo "✓ Cleared production cache (.sysref)"
-                cache_cleared=1
-            fi
-
-            # Dev cache
-            if [ -f "$BASE_DIR/.sysref.beta" ] || [ -f "$BASE_DIR/.sysref.beta.timestamp" ]; then
-                rm -f "$BASE_DIR/.sysref.beta" "$BASE_DIR/.sysref.beta.timestamp" 2>/dev/null || true
-                echo "✓ Cleared dev cache (.sysref.beta)"
-                cache_cleared=1
-            fi
-
-            # Temp files
-            if [ -d "$BASE_DIR/tmp" ]; then
-                rm -rf "$BASE_DIR/tmp"/* 2>/dev/null || true
-                echo "✓ Cleared temporary files"
-                cache_cleared=1
-            fi
-
-            if [ $cache_cleared -eq 0 ]; then
-                echo "ℹ️  No cache files to clear"
-            else
-                echo ""
-                echo "Cache cleared successfully!"
-                echo "System will auto-detect and rebuild cache on next run."
-            fi
-            return 0
-            ;;
-        --help|--usage|-h|-?)
-            echo "Usage: launcher.sh [OPTIONS]"
-            echo ""
-            echo "Options:"
-            echo "  --detect-only        Show system detection results and exit"
-            echo "  --clear-cache        Clear all cache and temporary files"
-            echo "  --help               Show this help message"
-            echo ""
-            echo "Examples:"
-            echo "  bash launcher.sh --detect-only      # Check what was detected"
-            echo "  bash launcher.sh --clear-cache      # Clear stale cache data"
-            echo "  bash launcher.sh                    # Normal interactive mode"
-            echo ""
-            return 0
-            ;;
-    esac
-
-    # Initialize directories once at startup
-    init_directories || {
-        echo "ERROR: Failed to initialize directories"
-        return 1
-    }
-
-    # Detect system configuration (builds database if cache expired)
-    startup_detection || true
+    init_directories
+    startup_detection
 
     while true; do
         show_main_menu
 
-        # Check if interactive mode
-        if [ "$INTERACTIVE_MODE" -eq 0 ]; then
-            echo ""
-            echo "Non-interactive mode: Use this toolkit in an interactive terminal."
-            echo "Try: source run.sh"
+        # Read from terminal (use /dev/tty directly for interaction)
+        if ! read -r choice 2>/dev/null </dev/tty; then
+            # No terminal available, return from function gracefully
             return 0
         fi
 
-        case "$MENU_CHOICE" in
+        case $choice in
             1) run_module "diagnostics" "system-health-check.sh" ;;
             2) handle_security_menu ;;
             3) handle_website_menu ;;
@@ -891,29 +664,23 @@ main() {
             7) run_module "maintenance" "cleanup-toolkit-data.sh" ;;
             0)
                 echo ""
-                echo "Clean history and remove traces? (yes/no): " >&2
-                if ! read -r clean_hist </dev/tty 2>/dev/null; then
-                    # Exit if read fails - just assume no cleanup
-                    echo ""
-                    echo "Thanks for using Server Management Toolkit!"
-                    echo ""
-                    return 0
-                fi
+                read -p "Clean history and remove traces? (yes/no): " clean_hist
 
                 if [ "$clean_hist" = "yes" ]; then
-                    touch /tmp/.cleanup_requested 2>/dev/null || true
+                    touch /tmp/.cleanup_requested
                     echo ""
                     echo "Cleanup will happen automatically..."
                     echo ""
                 else
                     echo ""
-                    echo "Thanks for using Server Management Toolkit!"
+                    echo -e "${GREEN}Thanks for using Server Management Toolkit!${NC}"
                     echo ""
                 fi
-                return 0
+                exit 0
                 ;;
             *)
-                menu_invalid_choice
+                echo -e "${RED}Invalid option${NC}"
+                sleep 1
                 ;;
         esac
     done
diff --git a/lib/common-functions.sh b/lib/common-functions.sh
index 8747604..dda7563 100755
--- a/lib/common-functions.sh
+++ b/lib/common-functions.sh
@@ -5,12 +5,6 @@
 # Shared utilities for all Server Management Toolkit modules
 #############################################################################
 
-# Source guard - prevent re-sourcing
-if [ -n "${_COMMON_FUNCTIONS_LOADED:-}" ]; then
-    return 0
-fi
-readonly _COMMON_FUNCTIONS_LOADED=1
-
 #############################################################################
 # Professional Color Scheme
 # - Uses ONLY basic ANSI colors (works on ANY terminal)
diff --git a/lib/reference-db.sh b/lib/reference-db.sh
index 3b923d7..97a0cfe 100755
--- a/lib/reference-db.sh
+++ b/lib/reference-db.sh
@@ -6,12 +6,6 @@
 # Format: Pipe-delimited structured data
 #############################################################################
 
-# Source guard - prevent re-sourcing
-if [ -n "${_REFERENCE_DB_LOADED:-}" ]; then
-    return 0
-fi
-readonly _REFERENCE_DB_LOADED=1
-
 # Source dependencies
 if [ -z "$TOOLKIT_BASE_DIR" ]; then
     SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -21,34 +15,9 @@ if [ -z "$TOOLKIT_BASE_DIR" ]; then
     [ -f "$SCRIPT_DIR/user-manager.sh" ] && source "$SCRIPT_DIR/user-manager.sh" || { echo "ERROR: user-manager.sh not found" >&2; return 1; }
 fi
 
-# Reference database location - BETA VERSION (separate from production)
-export SYSREF_DB="${TOOLKIT_BASE_DIR}/.sysref.beta"
-export SYSREF_TIMESTAMP="${TOOLKIT_BASE_DIR}/.sysref.beta.timestamp"
-
-# Timeout for domain HTTP checks
-export DOMAIN_CHECK_TIMEOUT=${DOMAIN_CHECK_TIMEOUT:-3}
-
-#############################################################################
-# URL Encoding Helper
-#############################################################################
-
-# URL encode a string for safe use in curl requests
-url_encode() {
-    local string="${1:-}"
-    local strlen=${#string}
-    local encoded=""
-    local pos c o
-
-    for (( pos=0 ; pos<strlen ; pos++ )); do
-        c=${string:$pos:1}
-        case "$c" in
-            [-_.~a-zA-Z0-9] ) o="${c}" ;;
-            * ) printf -v o '%%%02X' "'$c"
-        esac
-        encoded+="${o}"
-    done
-    echo "${encoded}"
-}
+# Reference database location
+export SYSREF_DB="${TOOLKIT_BASE_DIR}/.sysref"
+export SYSREF_TIMESTAMP="${TOOLKIT_BASE_DIR}/.sysref.timestamp"
 
 #############################################################################
 # DATABASE STRUCTURE
@@ -131,6 +100,7 @@ build_reference_database() {
     echo "  - $db_count databases"
     echo "  - $domain_count domains"
     echo "  - $wp_count WordPress sites"
+    echo "  - $total_lines total entries"
 }
 
 build_system_section() {
@@ -155,13 +125,7 @@ build_system_section() {
 build_users_section() {
     echo "[USERS]" >> "$SYSREF_DB"
 
-    # Safely populate users array from function output
-    local users=()
-    while IFS= read -r user; do
-        [ -z "$user" ] && continue
-        users+=("$user")
-    done < <(list_all_users)
-
+    local users=($(list_all_users))
     local total_users=${#users[@]}
     local current=0
 
@@ -169,19 +133,15 @@ build_users_section() {
         current=$((current + 1))
         show_progress $current $total_users "Indexing users..."
 
-        # Get all domains once and reuse (avoid duplicate function calls)
-        local user_all_domains=$(get_user_domains "$user")
-        local primary_domain=$(echo "$user_all_domains" | head -1)
-        # Use || echo 0 to handle grep failure with set -eo pipefail (when no domains exist)
-        local domain_count=$(echo "$user_all_domains" | grep -v "^$" | wc -l || echo 0)
-        local db_count=$(get_user_databases "$user" | grep -v "^$" | wc -l || echo 0)
+        local primary_domain=$(get_user_domains "$user" | head -1)
+        local domain_count=$(get_user_domains "$user" | grep -v "^$" | wc -l)
+        local db_count=$(get_user_databases "$user" | grep -v "^$" | wc -l)
 
         # Get disk usage (quick du)
-        # Use || echo "" to handle grep failure with set -eo pipefail
-        local home_dir=$(get_user_info "$user" | grep "^HOME_DIR=" | cut -d= -f2 || echo "")
+        local home_dir=$(get_user_info "$user" | grep "^HOME_DIR=" | cut -d= -f2)
         local disk_mb=0
         if [ -n "$home_dir" ] && [ -d "$home_dir" ]; then
-            disk_mb=$(du -sm "$home_dir" 2>/dev/null | awk '{print $1}' || echo 0)
+            disk_mb=$(du -sm "$home_dir" 2>/dev/null | awk '{print $1}')
         fi
 
         echo "USER|$user|$primary_domain|$db_count|$domain_count|$disk_mb|$home_dir" >> "$SYSREF_DB"
@@ -201,31 +161,15 @@ build_databases_section() {
 
     # Build MySQL command with credentials if needed
     local mysql_cmd="mysql"
-    local plesk_password=""
     if [ "$SYS_CONTROL_PANEL" = "plesk" ] && [ -f /etc/psa/.psa.shadow ]; then
-        plesk_password=$(cat /etc/psa/.psa.shadow)
-        # DO NOT export password - keep it in variable only
+        export MYSQL_PWD=$(cat /etc/psa/.psa.shadow)
+        mysql_cmd="mysql -uadmin"
     fi
 
-    # Query databases - set MYSQL_PWD only for this command
-    local total_dbs
-    if [ -n "$plesk_password" ]; then
-        # Use || echo 0 to handle grep failure (when all databases are system databases)
-        total_dbs=$(MYSQL_PWD="$plesk_password" mysql -u admin -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" | wc -l || echo 0)
-    else
-        total_dbs=$(mysql -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" | wc -l || echo 0)
-    fi
+    local total_dbs=$($mysql_cmd -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" | wc -l)
     local current=0
 
     # Use process substitution instead of pipe to avoid subshell shadowing (fixes current variable loss)
-    # Get database list - set MYSQL_PWD only for this command
-    local databases
-    if [ -n "$plesk_password" ]; then
-        databases=$(MYSQL_PWD="$plesk_password" mysql -u admin -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" || echo "")
-    else
-        databases=$(mysql -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$" || echo "")
-    fi
-
     while IFS= read -r db; do
         [ -z "$db" ] && continue
         current=$((current + 1))
@@ -234,35 +178,21 @@ build_databases_section() {
         local owner=$(get_database_owner "$db")
         local domain=$(get_database_domain "$db")
 
-        # Escape single quotes in database name for SQL safety
-        local db_escaped="${db//\'/\'\'}"
-
-        # Query database size - set MYSQL_PWD only for this command
-        local size_mb
-        if [ -n "$plesk_password" ]; then
-            size_mb=$(MYSQL_PWD="$plesk_password" mysql -u admin -Ns -e "SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2)
-                                           FROM information_schema.TABLES
-                                           WHERE table_schema='$db_escaped'" 2>/dev/null)
-        else
-            size_mb=$(mysql -Ns -e "SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2)
-                                   FROM information_schema.TABLES
-                                   WHERE table_schema='$db_escaped'" 2>/dev/null)
-        fi
+        local size_mb=$($mysql_cmd -Ns -e "SELECT ROUND(SUM(data_length + index_length) / 1024 / 1024, 2)
+                                       FROM information_schema.TABLES
+                                       WHERE table_schema=\`$db\`" 2>/dev/null)
         [ -z "$size_mb" ] && size_mb=0
 
-        # Query table count - set MYSQL_PWD only for this command
-        local table_count
-        if [ -n "$plesk_password" ]; then
-            table_count=$(MYSQL_PWD="$plesk_password" mysql -u admin -Ns "$db" -e "SHOW TABLES" 2>/dev/null | wc -l)
-        else
-            table_count=$(mysql -Ns "$db" -e "SHOW TABLES" 2>/dev/null | wc -l)
-        fi
+        local table_count=$($mysql_cmd -Ns "$db" -e "SHOW TABLES" 2>/dev/null | wc -l)
 
         echo "DB|$db|$owner|$domain|$size_mb|$table_count" >> "$SYSREF_DB"
-    done <<< "$databases"
+    done < <($mysql_cmd -Ns -e "SHOW DATABASES" 2>/dev/null | grep -v "^information_schema$\|^mysql$\|^performance_schema$\|^sys$")
 
     finish_progress
     echo "" >> "$SYSREF_DB"
+
+    # Clean up password environment variable
+    unset MYSQL_PWD
 }
 
 # Check domain HTTP/HTTPS status codes
@@ -285,17 +215,14 @@ check_domain_status() {
         return 0
     fi
 
-    # URL encode domain for safe curl request (handles special characters)
-    local encoded_domain=$(url_encode "$domain")
-
-    # Try HTTP (with configurable timeout, max 2 redirects)
-    http_code=$(timeout "$DOMAIN_CHECK_TIMEOUT" curl -s -o /dev/null -w "%{http_code}" --max-redirs 2 -m "$DOMAIN_CHECK_TIMEOUT" "http://$encoded_domain" 2>/dev/null)
+    # Try HTTP (timeout 3 seconds, max 2 redirects, check for valid response)
+    http_code=$(timeout 3 curl -s -o /dev/null -w "%{http_code}" --max-redirs 2 -m 3 "http://$domain" 2>/dev/null)
     if [ $? -ne 0 ] || [ -z "$http_code" ]; then
         http_code="timeout"
     fi
 
-    # Try HTTPS (with configurable timeout, max 2 redirects, ignore cert errors)
-    https_code=$(timeout "$DOMAIN_CHECK_TIMEOUT" curl -s -o /dev/null -w "%{http_code}" --max-redirs 2 -m "$DOMAIN_CHECK_TIMEOUT" -k "https://$encoded_domain" 2>/dev/null)
+    # Try HTTPS (timeout 3 seconds, max 2 redirects, ignore cert errors)
+    https_code=$(timeout 3 curl -s -o /dev/null -w "%{http_code}" --max-redirs 2 -m 3 -k "https://$domain" 2>/dev/null)
     if [ $? -ne 0 ] || [ -z "$https_code" ]; then
         https_code="timeout"
     fi
@@ -381,7 +308,7 @@ build_domains_section() {
                     domain_type="primary"
                 elif [[ "$domain" =~ \. ]] && [[ "$domain" =~ ^[^.]+\. ]]; then
                     # Check if it's a subdomain of the primary
-                    local base_domain=$(echo "$domain" | rev | cut -d. -f1-2 | rev || echo "$domain")
+                    local base_domain=$(echo "$domain" | rev | cut -d. -f1-2 | rev)
                     if [ "$base_domain" = "$primary_domain" ]; then
                         domain_type="subdomain"
                     fi
@@ -406,32 +333,27 @@ build_domains_section() {
                 # Also add aliases as separate entries
                 if [ -n "$server_alias" ]; then
                     # Convert space-separated aliases to newline-separated for safe iteration
-                    # Use here-document instead of pipe to avoid subshell
-                    while IFS= read -r alias; do
+                    echo "$server_alias" | tr ' ' '\n' | while IFS= read -r alias; do
                         [ -z "$alias" ] && continue
                         [ -n "${seen_domains[$alias]:-}" ] && continue
 
                         # Alias points to same document root and logs (inherit status from parent)
                         echo "DOMAIN|$alias|$user|$doc_root|$log_path|$php_version|no|alias|$domain|$http_code|$https_code|alias_of_$status_summary" >> "$SYSREF_DB"
                         seen_domains["$alias"]=1
-                    done <<< "$(echo "$server_alias" | tr ' ' '\n')"
+                    done
                 fi
             done
         else
             # Fallback for non-cPanel or if userdata not available
-            local user_domains=$(get_user_domains "$user")
-            local primary_domain=$(echo "$user_domains" | head -1)
+            local primary_domain=$(get_user_domains "$user" | head -1)
 
-            # Use here-document instead of pipe to avoid subshell (allows seen_domains updates to persist)
-            while IFS= read -r domain; do
+            # Use while read to safely iterate over domains (handles spaces)
+            get_user_domains "$user" | while IFS= read -r domain; do
                 [ -z "$domain" ] && continue
                 [ -n "${seen_domains[$domain]:-}" ] && continue
 
                 local is_primary="no"
-                # Only mark as primary if primary_domain is not empty AND matches
-                if [ -n "$primary_domain" ] && [ "$domain" = "$primary_domain" ]; then
-                    is_primary="yes"
-                fi
+                [ "$domain" = "$primary_domain" ] && is_primary="yes"
 
                 # Find log path
                 local log_path="${SYS_LOG_DIR}/${domain}"
@@ -446,7 +368,7 @@ build_domains_section() {
                 # Simple format for non-cPanel (with status codes)
                 echo "DOMAIN|$domain|$user||$log_path||$is_primary|local||$http_code|$https_code|$status_summary" >> "$SYSREF_DB"
                 seen_domains["$domain"]=1
-            done <<< "$user_domains"
+            done
         fi
     done
 
@@ -501,7 +423,7 @@ build_wordpress_section() {
         local username=$(echo "$wp_dir" | cut -d'/' -f3)
 
         # Try to get domain from path - check if it's in a subdomain or addon domain folder
-        local path_after_home=$(echo "$wp_dir" | sed "s|^/home/$username/||" || echo "$wp_dir")
+        local path_after_home=$(echo "$wp_dir" | sed "s|^/home/$username/||")
         local domain=""
 
         # Check for common domain folder patterns
@@ -558,41 +480,9 @@ build_wordpress_section() {
 build_logs_section() {
     echo "[LOGS]" >> "$SYSREF_DB"
 
-    # Control panel-specific log discovery
-    case "$SYS_CONTROL_PANEL" in
-        cpanel)
-            # cPanel access and error logs
-            find "$SYS_LOG_DIR" -name "*.log" -o -name "access_log" -o -name "error_log" 2>/dev/null | \
-                head -100 | while IFS= read -r logfile; do
-                echo "LOG|file|$logfile|" >> "$SYSREF_DB"
-            done
-            ;;
-        *)
-            # Standalone server - find Apache/Nginx logs safely
-            # Limit to recent logs and prevent hangs with large directories
-            if [ -d "$SYS_LOG_DIR" ]; then
-                # Apache access logs (with safety limits)
-                find "$SYS_LOG_DIR" -maxdepth 2 \( -name "*access*" -o -name "*access_log*" \) -type f -mtime -30 2>/dev/null | \
-                    head -50 | while IFS= read -r logfile; do
-                    [ -n "$logfile" ] && echo "LOG|access|$logfile|" >> "$SYSREF_DB"
-                done
-
-                # Apache error logs (with safety limits)
-                find "$SYS_LOG_DIR" -maxdepth 2 \( -name "*error*" -o -name "*error_log*" \) -type f -mtime -30 2>/dev/null | \
-                    head -50 | while IFS= read -r logfile; do
-                    [ -n "$logfile" ] && echo "LOG|error|$logfile|" >> "$SYSREF_DB"
-                done
-            fi
-
-            # Nginx logs for standalone
-            if [ -d "/var/log/nginx" ]; then
-                find /var/log/nginx -maxdepth 1 -type f -mtime -30 2>/dev/null | \
-                    head -20 | while IFS= read -r logfile; do
-                    [ -n "$logfile" ] && echo "LOG|nginx|$logfile|" >> "$SYSREF_DB"
-                done
-            fi
-            ;;
-    esac
+    # Apache/Web server logs
+    # Temporarily disabled - causes hangs with large log directories
+    # TODO: Implement log scanning with progress indicator and limits
 
     echo "" >> "$SYSREF_DB"
 }
@@ -814,7 +704,7 @@ get_domain_status() {
     fi
 
     # Get domain record (DOMAIN|domain|owner|doc_root|log_path|php|primary|type|alias|http|https|status)
-    local record=$(grep "^DOMAIN|${domain}|" "$SYSREF_DB" 2>/dev/null | head -1 || true)
+    local record=$(grep "^DOMAIN|${domain}|" "$SYSREF_DB" 2>/dev/null | head -1)
 
     if [ -z "$record" ]; then
         return 1