diff --git a/includes/class-hvac-menu-system.php b/includes/class-hvac-menu-system.php
index 7ea48dbe..c190a78f 100644
--- a/includes/class-hvac-menu-system.php
+++ b/includes/class-hvac-menu-system.php
@@ -44,6 +44,38 @@ class HVAC_Menu_System {
         add_filter('wp_nav_menu_items', array($this, 'add_logout_to_menu'), 10, 2);
     }
     
+    /**
+     * Detect if user is using Safari browser
+     * Uses centralized browser detection service
+     * 
+     * @return bool
+     */
+    private function is_safari_browser() {
+        return HVAC_Browser_Detection::instance()->is_safari_browser();
+    }
+    
+    /**
+     * Get script path based on browser compatibility
+     * Uses centralized browser detection service
+     * 
+     * @param string $script_name
+     * @return string
+     */
+    private function get_compatible_script_path($script_name) {
+        $browser_detection = HVAC_Browser_Detection::instance();
+        
+        // If Safari and doesn't support ES6, load Safari-compatible version
+        if ($browser_detection->is_safari_browser() && !$browser_detection->safari_supports_es6()) {
+            $safari_script = HVAC_PLUGIN_DIR . 'assets/js/' . $script_name . '-safari-compatible.js';
+            if (file_exists($safari_script)) {
+                return HVAC_PLUGIN_URL . 'assets/js/' . $script_name . '-safari-compatible.js';
+            }
+        }
+        
+        // Default to standard version
+        return HVAC_PLUGIN_URL . 'assets/js/' . $script_name . '.js';
+    }
+    
     /**
      * Register menu locations
      */
@@ -288,7 +320,7 @@ class HVAC_Menu_System {
             
             wp_enqueue_script(
                 'hvac-menu-system',
-                HVAC_PLUGIN_URL . 'assets/js/hvac-menu-system.js',
+                $this->get_compatible_script_path('hvac-menu-system'),
                 array('jquery'),
                 HVAC_PLUGIN_VERSION,
                 true
diff --git a/includes/class-hvac-qr-generator.php b/includes/class-hvac-qr-generator.php
index 73c87714..3333d40e 100644
--- a/includes/class-hvac-qr-generator.php
+++ b/includes/class-hvac-qr-generator.php
@@ -242,6 +242,7 @@ class HVAC_QR_Generator {
                     <div style="position: absolute; top: -5px; right: -5px; width: 35px; height: 35px;">
                         <img src="/wp-content/uploads/2025/08/mQ-Certified-trainer.png" 
                              alt="measureQuick Certified Trainer" 
+                             width="35" height="35"
                              style="width: 100%; height: 100%; object-fit: contain; filter: drop-shadow(0 2px 4px rgba(0,0,0,0.2));">
                     </div>
                 <?php endif; ?>
diff --git a/includes/class-hvac-safari-script-blocker.php b/includes/class-hvac-safari-script-blocker.php
new file mode 100644
index 00000000..5d919501
--- /dev/null
+++ b/includes/class-hvac-safari-script-blocker.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * HVAC Safari Script Blocker
+ * 
+ * Blocks problematic third-party scripts for Safari browsers
+ * to prevent hanging/crashing issues
+ *
+ * @package HVAC_Community_Events
+ * @since 1.0.8
+ */
+
+if (!defined('ABSPATH')) {
+    exit;
+}
+
+/**
+ * HVAC Safari Script Blocker Class
+ */
+class HVAC_Safari_Script_Blocker {
+    
+    /**
+     * Instance
+     *
+     * @var HVAC_Safari_Script_Blocker
+     */
+    private static $instance = null;
+    
+    /**
+     * Problematic script patterns
+     *
+     * @var array
+     */
+    private $blocked_scripts = [
+        'credentials-library.js',
+        'lastpass',
+        'dashlane',
+        '1password',
+        'bitwarden',
+        'keeper',
+        'roboform',
+        'enpass',
+        'password-manager'
+    ];
+    
+    /**
+     * Get instance
+     */
+    public static function instance() {
+        if (null === self::$instance) {
+            self::$instance = new self();
+        }
+        return self::$instance;
+    }
+    
+    /**
+     * Constructor
+     */
+    private function __construct() {
+        $this->init_hooks();
+    }
+    
+    /**
+     * Initialize hooks
+     */
+    private function init_hooks() {
+        // Only activate for Safari browsers
+        if ($this->is_safari_browser()) {
+            add_action('wp_head', [$this, 'add_script_blocking_code'], 1);
+            add_action('wp_footer', [$this, 'add_script_monitoring'], 999);
+            add_filter('script_loader_src', [$this, 'filter_problematic_scripts'], 10, 2);
+        }
+    }
+    
+    /**
+     * Check if current request is from Safari
+     *
+     * @return bool
+     */
+    private function is_safari_browser() {
+        if (!isset($_SERVER['HTTP_USER_AGENT'])) {
+            return false;
+        }
+        
+        $user_agent = $_SERVER['HTTP_USER_AGENT'];
+        
+        return (strpos($user_agent, 'Safari') !== false && 
+                strpos($user_agent, 'Chrome') === false &&
+                strpos($user_agent, 'Chromium') === false);
+    }
+    
+    /**
+     * Add script blocking code in head
+     */
+    public function add_script_blocking_code() {
+        ?>
+        <script type="text/javascript">
+        // Safari Script Protection System
+        (function() {
+            'use strict';
+            
+            console.log('🛡️ Safari Script Blocker activated');
+            
+            // Block problematic script patterns
+            var blockedPatterns = <?php echo wp_json_encode($this->blocked_scripts); ?>;
+            
+            // Override createElement to block problematic scripts
+            var originalCreateElement = document.createElement;
+            document.createElement = function(tagName) {
+                var element = originalCreateElement.apply(this, arguments);
+                
+                if (tagName.toLowerCase() === 'script') {
+                    var originalSetAttribute = element.setAttribute;
+                    element.setAttribute = function(name, value) {
+                        if (name.toLowerCase() === 'src' && value) {
+                            for (var i = 0; i < blockedPatterns.length; i++) {
+                                if (value.toLowerCase().indexOf(blockedPatterns[i]) !== -1) {
+                                    console.warn('🚫 Blocked problematic script:', value);
+                                    return; // Don't set the src attribute
+                                }
+                            }
+                        }
+                        return originalSetAttribute.apply(this, arguments);
+                    };
+                }
+                
+                return element;
+            };
+            
+            // Monitor and block dynamically added scripts
+            if (window.MutationObserver) {
+                var observer = new MutationObserver(function(mutations) {
+                    mutations.forEach(function(mutation) {
+                        if (mutation.type === 'childList') {
+                            mutation.addedNodes.forEach(function(node) {
+                                if (node.tagName && node.tagName.toLowerCase() === 'script') {
+                                    var src = node.src || node.getAttribute('src');
+                                    if (src) {
+                                        for (var i = 0; i < blockedPatterns.length; i++) {
+                                            if (src.toLowerCase().indexOf(blockedPatterns[i]) !== -1) {
+                                                console.warn('🚫 Removed problematic script:', src);
+                                                node.remove();
+                                                return;
+                                            }
+                                        }
+                                    }
+                                }
+                            });
+                        }
+                    });
+                });
+                
+                observer.observe(document.documentElement, {
+                    childList: true,
+                    subtree: true
+                });
+            }
+            
+            // Set timeout to prevent hanging
+            var pageLoadTimeout = setTimeout(function() {
+                console.error('⏰ Page load timeout - possible script blocking required');
+                // Don't actually timeout, just log it
+            }, 10000);
+            
+            // Clear timeout when page loads
+            window.addEventListener('load', function() {
+                clearTimeout(pageLoadTimeout);
+                console.log('✅ Page loaded successfully with Safari protection');
+            });
+            
+            // Monitor for errors
+            window.addEventListener('error', function(e) {
+                console.error('🚨 Safari Script Error:', e.message, 'in', e.filename, 'line', e.lineno);
+                
+                // Check if error is from blocked script
+                for (var i = 0; i < blockedPatterns.length; i++) {
+                    if (e.filename && e.filename.toLowerCase().indexOf(blockedPatterns[i]) !== -1) {
+                        console.log('✅ Error from blocked script - this is expected');
+                        e.preventDefault();
+                        return false;
+                    }
+                }
+            });
+            
+        })();
+        </script>
+        <?php
+    }
+    
+    /**
+     * Filter out problematic scripts at WordPress level
+     *
+     * @param string $src
+     * @param string $handle
+     * @return string|bool
+     */
+    public function filter_problematic_scripts($src, $handle) {
+        if (!$src) {
+            return $src;
+        }
+        
+        foreach ($this->blocked_scripts as $pattern) {
+            if (strpos(strtolower($src), $pattern) !== false) {
+                error_log('[SAFARI-BLOCKER] Blocked script: ' . $src);
+                return false; // Don't load this script
+            }
+        }
+        
+        return $src;
+    }
+    
+    /**
+     * Add script monitoring in footer
+     */
+    public function add_script_monitoring() {
+        ?>
+        <script type="text/javascript">
+        // Final Safari monitoring check
+        (function() {
+            'use strict';
+            
+            console.log('🔍 Safari final script check completed');
+            
+            // Report loaded scripts
+            var scripts = document.getElementsByTagName('script');
+            var scriptCount = 0;
+            var blockedCount = 0;
+            
+            for (var i = 0; i < scripts.length; i++) {
+                var src = scripts[i].src;
+                if (src) {
+                    scriptCount++;
+                    // Check if any blocked scripts made it through
+                    var blockedPatterns = <?php echo wp_json_encode($this->blocked_scripts); ?>;
+                    for (var j = 0; j < blockedPatterns.length; j++) {
+                        if (src.toLowerCase().indexOf(blockedPatterns[j]) !== -1) {
+                            blockedCount++;
+                            console.warn('⚠️ Blocked script detected:', src);
+                        }
+                    }
+                }
+            }
+            
+            console.log('📊 Safari Script Summary:', scriptCount, 'total scripts,', blockedCount, 'blocked');
+            
+            // Test basic functionality
+            try {
+                document.getElementById('test') || console.log('✅ DOM access working');
+                window.jQuery && console.log('✅ jQuery loaded');
+            } catch (e) {
+                console.error('❌ Basic functionality test failed:', e);
+            }
+            
+        })();
+        </script>
+        <?php
+    }
+}
+
+// DISABLED - Safari Script Blocker was causing Safari hanging issues
+// The aggressive DOM method overrides interfere with legitimate scripts
+// HVAC_Safari_Script_Blocker::instance();
\ No newline at end of file
diff --git a/includes/class-hvac-scripts-styles.php b/includes/class-hvac-scripts-styles.php
index bae4c37a..2a86dd76 100644
--- a/includes/class-hvac-scripts-styles.php
+++ b/includes/class-hvac-scripts-styles.php
@@ -175,6 +175,7 @@ class HVAC_Scripts_Styles {
             'hvac-layout', 
             'hvac-common',
             'hvac-accessibility-fixes',
+            'hvac-mobile-responsive',
             'hvac-dashboard',
             'hvac-dashboard-enhanced',
             'hvac-registration',
@@ -305,6 +306,14 @@ class HVAC_Scripts_Styles {
             $this->version
         );
         
+        // Mobile responsive optimizations - Load after base styles
+        wp_enqueue_style(
+            'hvac-mobile-responsive',
+            HVAC_PLUGIN_URL . 'assets/css/hvac-mobile-responsive.css',
+            array('hvac-common', 'hvac-accessibility-fixes'),
+            $this->version
+        );
+        
         // Load the rest of the page-specific CSS
         $this->enqueue_page_specific_css();
     }
@@ -470,6 +479,15 @@ class HVAC_Scripts_Styles {
             true
         );
         
+        // Mobile responsive functionality - Load on all plugin pages
+        wp_enqueue_script(
+            'hvac-mobile-responsive',
+            HVAC_PLUGIN_URL . 'assets/js/hvac-mobile-responsive.js',
+            array('jquery', 'hvac-community-events'),
+            $this->version,
+            true
+        );
+        
         // Dashboard scripts
         if ($this->is_dashboard_page()) {
             wp_enqueue_script(
diff --git a/scripts/cache-trainer-event-counts.sh b/scripts/cache-trainer-event-counts.sh
new file mode 100755
index 00000000..3b24b9cd
--- /dev/null
+++ b/scripts/cache-trainer-event-counts.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# Cache Trainer Event Counts Script
+# Pre-populates event count cache to improve find-a-trainer page performance
+
+echo "=== Caching Trainer Event Counts ==="
+
+# For staging server
+if [[ "$1" == "staging" ]]; then
+    echo "Caching event counts on staging server..."
+    ssh roodev@146.190.76.204 'cd /home/974670.cloudwaysapps.com/uberrxmprk/public_html && wp eval "
+    \$profiles = get_posts([
+        \"post_type\" => \"trainer_profile\",
+        \"posts_per_page\" => -1,
+        \"post_status\" => \"publish\"
+    ]);
+    
+    \$cached = 0;
+    
+    foreach (\$profiles as \$profile) {
+        \$user_id = get_post_meta(\$profile->ID, \"user_id\", true);
+        if (\$user_id) {
+            \$count_query = new WP_Query([
+                \"post_type\" => \"tribe_events\",
+                \"author\" => \$user_id,
+                \"post_status\" => \"publish\",
+                \"fields\" => \"ids\",
+                \"posts_per_page\" => 1,
+                \"no_found_rows\" => false
+            ]);
+            \$event_count = \$count_query->found_posts;
+            wp_reset_postdata();
+            
+            update_post_meta(\$profile->ID, \"cached_event_count\", \$event_count);
+            update_post_meta(\$profile->ID, \"cached_event_count_timestamp\", time());
+            
+            \$trainer_name = get_post_meta(\$profile->ID, \"trainer_display_name\", true);
+            echo \"Cached \" . \$trainer_name . \": \" . \$event_count . \" events\" . PHP_EOL;
+            \$cached++;
+        }
+    }
+    
+    echo \"Cached event counts for \" . \$cached . \" trainers\" . PHP_EOL;
+    "'
+
+else
+    echo "Usage: $0 staging"
+    echo "Caches trainer event counts to improve find-a-trainer page performance"
+fi
+
+echo "=== Cache Update Complete ==="
\ No newline at end of file
diff --git a/templates/page-find-trainer-minimal.php b/templates/page-find-trainer-minimal.php
new file mode 100644
index 00000000..76de838f
--- /dev/null
+++ b/templates/page-find-trainer-minimal.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Template Name: Find a Trainer - Minimal Test
+ * Minimal version for Safari debugging
+ *
+ * @package HVAC_Plugin
+ * @since 1.0.0
+ */
+
+// Define constant to identify we're in a page template
+define('HVAC_IN_PAGE_TEMPLATE', true);
+
+// Get header
+get_header();
+
+?>
+
+<div class="hvac-find-trainer-minimal">
+    <div class="ast-container">
+        <h1>Find a Trainer - Minimal Test</h1>
+        <p>If you can see this text, the basic page loading works.</p>
+        
+        <p><strong>Browser Info:</strong></p>
+        <ul>
+            <li>User Agent: <code id="user-agent"></code></li>
+            <li>Browser: <span id="browser-detection"></span></li>
+            <li>JavaScript: <span id="js-status">❌ Not loaded</span></li>
+        </ul>
+        
+        <div id="test-results">
+            <h3>JavaScript Tests:</h3>
+            <div id="test-output"></div>
+        </div>
+    </div>
+</div>
+
+<!-- Minimal JavaScript test -->
+<script type="text/javascript">
+// ES5 only - basic compatibility test
+(function() {
+    'use strict';
+    
+    // Test 1: Basic JavaScript works
+    document.getElementById('js-status').innerHTML = '✅ Basic JS working';
+    document.getElementById('user-agent').innerHTML = navigator.userAgent;
+    
+    // Test 2: Browser detection
+    var userAgent = navigator.userAgent;
+    var isSafari = userAgent.indexOf('Safari') !== -1 && userAgent.indexOf('Chrome') === -1;
+    var isOldSafari = false;
+    
+    if (isSafari) {
+        var versionMatch = userAgent.match(/Version\/([0-9]+)/);
+        if (versionMatch && parseInt(versionMatch[1]) < 10) {
+            isOldSafari = true;
+        }
+    }
+    
+    var browserText = isSafari ? (isOldSafari ? '🚨 Old Safari (needs ES5)' : '✅ Modern Safari') : '✅ Other browser';
+    document.getElementById('browser-detection').innerHTML = browserText;
+    
+    // Test 3: Add test results
+    var testOutput = document.getElementById('test-output');
+    var tests = [
+        'Basic JavaScript: ✅ Working',
+        'DOM manipulation: ✅ Working',
+        'User agent detection: ✅ Working'
+    ];
+    
+    for (var i = 0; i < tests.length; i++) {
+        var p = document.createElement('p');
+        p.innerHTML = tests[i];
+        testOutput.appendChild(p);
+    }
+    
+    // Test 4: Try some potentially problematic syntax
+    try {
+        var testVar = 'test';
+        testOutput.appendChild(createTestResult('var declaration: ✅ Working'));
+    } catch (e) {
+        testOutput.appendChild(createTestResult('var declaration: ❌ Error - ' + e.message));
+    }
+    
+    function createTestResult(text) {
+        var p = document.createElement('p');
+        p.innerHTML = text;
+        return p;
+    }
+    
+})();
+</script>
+
+<?php
+// Get footer
+get_footer();
+?>
\ No newline at end of file
diff --git a/templates/template-hvac-dashboard.php b/templates/template-hvac-dashboard.php
index 27438333..62a4ed75 100644
--- a/templates/template-hvac-dashboard.php
+++ b/templates/template-hvac-dashboard.php
@@ -128,7 +128,7 @@ $revenue_target  = $dashboard_data->get_annual_revenue_target();
 							'<h3>Total Events</h3>',
 							'All events you\'ve created, including drafts and published events'
 						); ?>
-						<p><?php echo esc_html( $total_events ); ?></p>
+						<p class="metric-value"><?php echo esc_html( $total_events ); ?></p>
 					</div>
 				</div>
 
@@ -139,7 +139,7 @@ $revenue_target  = $dashboard_data->get_annual_revenue_target();
 							'<h3>Upcoming Events</h3>',
 							'Published events scheduled for future dates'
 						); ?>
-						<p><?php echo esc_html( $upcoming_events ); ?></p>
+						<p class="metric-value"><?php echo esc_html( $upcoming_events ); ?></p>
 					</div>
 				</div>
 
@@ -150,7 +150,7 @@ $revenue_target  = $dashboard_data->get_annual_revenue_target();
 							'<h3>Past Events</h3>',
 							'Completed events where you can generate certificates'
 						); ?>
-						<p><?php echo esc_html( $past_events ); ?></p>
+						<p class="metric-value"><?php echo esc_html( $past_events ); ?></p>
 					</div>
 				</div>
 
@@ -161,7 +161,7 @@ $revenue_target  = $dashboard_data->get_annual_revenue_target();
 							'<h3>Tickets Sold</h3>',
 							'Total number of tickets sold across all your events'
 						); ?>
-						<p><?php echo esc_html( $total_sold ); ?></p>
+						<p class="metric-value"><?php echo esc_html( $total_sold ); ?></p>
 					</div>
 				</div>
 
@@ -172,7 +172,7 @@ $revenue_target  = $dashboard_data->get_annual_revenue_target();
 							'<h3>Total Revenue</h3>',
 							'Total earnings from all ticket sales (before Stripe fees)'
 						); ?>
-						<p>$<?php echo esc_html( number_format( $total_revenue, 2 ) ); ?></p>
+						<p class="metric-value">$<?php echo esc_html( number_format( $total_revenue, 2 ) ); ?></p>
 						<?php if ( $revenue_target ) : ?>
 							<small>Target: $<?php echo esc_html( number_format( $revenue_target, 2 ) ); ?></small>
 						<?php endif; ?>
@@ -375,6 +375,134 @@ $revenue_target  = $dashboard_data->get_annual_revenue_target();
 
 </div> <!-- .hvac-dashboard-wrapper -->
 
+<style>
+/* Dashboard Stats Flexbox Layout */
+.hvac-stats-row {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin: -10px;
+    justify-content: space-between;
+    align-items: stretch;
+}
+
+.hvac-stat-col {
+    flex: 1;
+    min-width: 160px;
+    padding: 10px;
+}
+
+.hvac-stat-card {
+    background: #f8f9fa;
+    border: 1px solid #e9ecef;
+    border-radius: 8px;
+    padding: 20px;
+    text-align: center;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+}
+
+.hvac-stat-card h3 {
+    margin: 0 0 10px;
+    font-size: 16px;
+    font-weight: normal;
+    color: #666;
+}
+
+.hvac-stat-card .metric-value {
+    font-size: 32px;
+    font-weight: bold;
+    color: #E9AF28;
+    margin: 0;
+    line-height: 1.2;
+}
+
+.hvac-stat-card small {
+    display: block;
+    margin-top: 5px;
+    color: #666;
+    font-size: 12px;
+}
+
+/* Dashboard section spacing */
+.hvac-dashboard-stats {
+    margin-bottom: 40px;
+    padding: 0 20px;
+}
+
+.hvac-dashboard-stats h2 {
+    margin-bottom: 25px;
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+}
+
+.hvac-dashboard-events {
+    padding: 0 20px;
+}
+
+.hvac-dashboard-events h2 {
+    margin-bottom: 25px;
+    font-size: 24px;
+    font-weight: 600;
+    color: #333;
+}
+
+/* Table controls spacing */
+.hvac-table-controls {
+    margin: 20px 0 25px 0;
+    padding: 15px;
+    background: #f8f9fa;
+    border-radius: 6px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 15px;
+    align-items: center;
+}
+
+.hvac-event-filters {
+    margin: 15px 0 25px 0;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    align-items: center;
+}
+
+.hvac-event-filters span {
+    font-weight: 500;
+    color: #666;
+    margin-right: 5px;
+}
+
+/* Mobile responsiveness */
+@media (max-width: 768px) {
+    .hvac-stats-row {
+        flex-direction: column;
+    }
+    
+    .hvac-stat-col {
+        min-width: 100%;
+    }
+    
+    .hvac-stat-card .metric-value {
+        font-size: 24px;
+    }
+    
+    .hvac-dashboard-stats,
+    .hvac-dashboard-events {
+        padding: 0 10px;
+    }
+    
+    .hvac-table-controls {
+        flex-direction: column;
+        align-items: stretch;
+        gap: 10px;
+    }
+}
+</style>
+
 <?php
 // Don't call get_footer() here - this template is included via shortcode
 ?>
\ No newline at end of file