diff --git a/includes/class-hvac-master-menu-system.php b/includes/class-hvac-master-menu-system.php
index 2b9912b3..12ad5760 100644
--- a/includes/class-hvac-master-menu-system.php
+++ b/includes/class-hvac-master-menu-system.php
@@ -155,6 +155,12 @@ class HVAC_Master_Menu_System {
                 'icon' => 'dashicons-admin-tools',
                 'cap' => 'manage_communication_templates',
                 'children' => array(
+                    array(
+                        'title' => esc_html__('Google Sheets', 'hvac-community-events'),
+                        'url' => home_url('/master-trainer/google-sheets/'),
+                        'icon' => 'dashicons-media-spreadsheet',
+                        'cap' => 'manage_google_sheets_integration'
+                    ),
                     array(
                         'title' => esc_html__('Communication Templates', 'hvac-community-events'),
                         'url' => home_url('/master-trainer/communication-templates/'),
@@ -176,6 +182,29 @@ class HVAC_Master_Menu_System {
                 )
             ),
             
+            // Account - User options
+            array(
+                'title' => esc_html__('Account', 'hvac-community-events'),
+                'url' => '#',
+                'icon' => 'dashicons-admin-users',
+                'cap' => 'read',
+                'children' => array(
+                    array(
+                        'title' => esc_html__('Trainer Dashboard', 'hvac-community-events'),
+                        'url' => home_url('/trainer/dashboard/'),
+                        'icon' => 'dashicons-dashboard',
+                        'cap' => 'read'
+                    ),
+                    array(
+                        'title' => esc_html__('Logout', 'hvac-community-events'),
+                        'url' => wp_logout_url(home_url('/training-login/')),
+                        'icon' => 'dashicons-exit',
+                        'cap' => 'read',
+                        'class' => 'menu-item-logout'
+                    )
+                )
+            ),
+            
             // Help - Documentation
             array(
                 'title' => esc_html__('Help', 'hvac-community-events'),
diff --git a/templates/template-hvac-master-dashboard.php b/templates/template-hvac-master-dashboard.php
index 95039797..e15d6444 100644
--- a/templates/template-hvac-master-dashboard.php
+++ b/templates/template-hvac-master-dashboard.php
@@ -220,19 +220,9 @@ if ( isset( $_GET['error'] ) && $_GET['error'] === 'access_denied' ) {
 		</div>
 		<?php endif; ?>
 
-		<!-- Dashboard Header & Navigation -->
+		<!-- Dashboard Header -->
 		<div class="hvac-dashboard-header">
 			<h1 class="entry-title">Master Dashboard</h1>
-			<div class="hvac-dashboard-nav">
-				<?php if (current_user_can('manage_google_sheets_integration')): ?>
-				<a href="<?php echo home_url('/master-trainer/google-sheets/'); ?>" class="ast-button ast-button-primary">Google Sheets</a>
-				<?php endif; ?>
-				<?php if (current_user_can('manage_communication_templates')): ?>
-				<a href="<?php echo home_url('/trainer/communication-templates/'); ?>" class="ast-button ast-button-primary">Templates</a>
-				<?php endif; ?>
-				<a href="<?php echo home_url('/trainer/dashboard/'); ?>" class="ast-button ast-button-secondary">Trainer Dashboard</a>
-				<a href="<?php echo esc_url( wp_logout_url( home_url( '/training-login/' ) ) ); ?>" class="ast-button ast-button-secondary">Logout</a>
-			</div>
 		</div>
 
 		<!-- System Overview Statistics -->