diff --git a/includes/class-hvac-trainer-navigation.php b/includes/class-hvac-trainer-navigation.php
index 4407cd70..3c1c5031 100644
--- a/includes/class-hvac-trainer-navigation.php
+++ b/includes/class-hvac-trainer-navigation.php
@@ -57,6 +57,7 @@ class HVAC_Trainer_Navigation {
     private function get_menu_items() {
         $user = wp_get_current_user();
         $is_master = in_array('hvac_master_trainer', $user->roles);
+        $is_admin = current_user_can('manage_options');
         
         $menu_items = array(
             'dashboard' => array(
@@ -149,8 +150,18 @@ class HVAC_Trainer_Navigation {
             )
         );
         
-        // Add master trainer items if applicable
-        if ($is_master) {
+        // Add Master Dashboard as main menu item for master trainers and admins
+        if ($is_master || $is_admin) {
+            $menu_items['master-dashboard'] = array(
+                'label' => 'Master Dashboard',
+                'url' => '/master-trainer/master-dashboard/',
+                'icon' => 'dashicons-star-filled',
+                'capability' => 'hvac_master_trainer'
+            );
+        }
+        
+        // Add master trainer items if applicable (for master trainers or WordPress admins)
+        if ($is_master || $is_admin) {
             $menu_items['master'] = array(
                 'label' => 'Master Trainer',
                 'url' => '#',
@@ -179,6 +190,19 @@ class HVAC_Trainer_Navigation {
         return apply_filters('hvac_trainer_menu_items', $menu_items);
     }
     
+    /**
+     * Check if user can access item (admins can access everything)
+     */
+    private function user_can_access_item($capability) {
+        // WordPress admins can access everything
+        if (current_user_can('manage_options')) {
+            return true;
+        }
+        
+        // Otherwise check the specific capability
+        return current_user_can($capability);
+    }
+    
     /**
      * Get current page identifier
      */
@@ -233,7 +257,12 @@ class HVAC_Trainer_Navigation {
      * Render navigation shortcode
      */
     public function render_navigation($atts = array()) {
-        if (!is_user_logged_in() || !current_user_can('hvac_trainer')) {
+        if (!is_user_logged_in()) {
+            return '';
+        }
+        
+        // Show navigation for trainers, master trainers, or WordPress admins
+        if (!current_user_can('hvac_trainer') && !current_user_can('hvac_master_trainer') && !current_user_can('manage_options')) {
             return '';
         }
         
@@ -263,8 +292,8 @@ class HVAC_Trainer_Navigation {
         echo '<ul class="hvac-nav-menu">';
         
         foreach ($menu_items as $item_id => $item) {
-            // Check capability
-            if (isset($item['capability']) && !current_user_can($item['capability'])) {
+            // Check capability (allow admins to access everything)
+            if (isset($item['capability']) && !$this->user_can_access_item($item['capability'])) {
                 continue;
             }