diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php
index 258780a7..d0f9be23 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-community-events.php
@@ -639,6 +639,12 @@ class HVAC_Community_Events {
 			return '<div class="hvac-error">You do not have permission to access this feature.</div>';
 		}
 
+		// Check if TEC Community Events is active and working
+		if (function_exists('tribe_community_events_form')) {
+			// Let TEC handle it natively - don't override
+			return '';
+		}
+
 		// Handle different views
 		switch ($atts['view']) {
 			case 'submission_form':
@@ -657,8 +663,17 @@ class HVAC_Community_Events {
 		ob_start();
 		?>
 		<div class="hvac-event-form-container">
+			<!-- Navigation Header -->
+			<div class="hvac-dashboard-header">
+				<h1 class="entry-title">Create New Training Event</h1>
+				<div class="hvac-dashboard-nav">
+					<a href="<?php echo esc_url( home_url( '/hvac-dashboard/' ) ); ?>" class="ast-button ast-button-secondary">Dashboard</a>
+					<a href="<?php echo esc_url( home_url( '/my-events/' ) ); ?>" class="ast-button ast-button-secondary">My Events</a>
+					<a href="<?php echo esc_url( home_url( '/certificate-reports/' ) ); ?>" class="ast-button ast-button-primary">Certificate Reports</a>
+				</div>
+			</div>
+			
 			<div class="hvac-event-form-header">
-				<h2>Create New Training Event</h2>
 				<p>Fill out the form below to create a new training event. All events are reviewed before being published.</p>
 			</div>
 			
@@ -673,10 +688,6 @@ class HVAC_Community_Events {
 				</ul>
 			</div>
 
-			<div class="hvac-event-form-notice">
-				<p><strong>Note:</strong> This page is currently using a simplified form. For full event creation functionality, please use the WordPress admin area or ensure The Events Calendar Community Events plugin is properly configured.</p>
-				<p><a href="<?php echo admin_url('post-new.php?post_type=tribe_events'); ?>" class="button button-primary">Create Event in Admin Area</a></p>
-			</div>
 
 			<!-- Fallback form for basic event creation -->
 			<form id="hvac-basic-event-form" method="post" action="">
@@ -790,7 +801,10 @@ class HVAC_Community_Events {
 						<div class="hvac-event-item">
 							<h3><a href="<?php echo get_permalink($event->ID); ?>"><?php echo esc_html($event->post_title); ?></a></h3>
 							<p class="hvac-event-date"><?php echo esc_html($formatted_date); ?></p>
-							<p class="hvac-event-status">Status: <?php echo ucfirst($event->post_status); ?></p>
+							<p class="hvac-event-status">Status: <?php 
+								$status_display = $event->post_status === 'publish' ? 'Published' : ucfirst($event->post_status);
+								echo esc_html($status_display); 
+							?></p>
 							<div class="hvac-event-actions">
 								<a href="<?php echo get_edit_post_link($event->ID); ?>" class="button button-small">Edit</a>
 								<a href="<?php echo get_permalink($event->ID); ?>" class="button button-small">View</a>
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php
index 2ed8b151..9ab3f06b 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/certificates/template-certificate-reports.php
@@ -118,8 +118,17 @@ try {
 
 <div class="hvac-container">
     <div class="hvac-content-wrapper">
+        <!-- Navigation Header -->
+        <div class="hvac-dashboard-header">
+            <h1 class="entry-title">Certificate Reports</h1>
+            <div class="hvac-dashboard-nav">
+                <a href="<?php echo esc_url( home_url( '/hvac-dashboard/' ) ); ?>" class="ast-button ast-button-secondary">Dashboard</a>
+                <a href="<?php echo esc_url( home_url( '/generate-certificates/' ) ); ?>" class="ast-button ast-button-secondary">Generate Certificates</a>
+                <a href="<?php echo esc_url( home_url( '/manage-event/' ) ); ?>" class="ast-button ast-button-primary">Create Event</a>
+            </div>
+        </div>
+        
         <div class="hvac-page-header">
-            <h1>Certificate Reports</h1>
             <p class="hvac-page-description">View and manage all certificates you've generated for event attendees.</p>
         </div>
         
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-trainer-profile.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-trainer-profile.php
index d9f5f783..77f2ffdc 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-trainer-profile.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-trainer-profile.php
@@ -97,7 +97,7 @@ get_header(); // Use theme's header
                 <div class="hvac-profile-header">
                     <h2>Personal Information</h2>
                     <div class="hvac-profile-actions">
-                        <a href="<?php echo esc_url(get_edit_profile_url($user_id)); ?>" class="ast-button ast-button-secondary">Edit Profile</a>
+                        <a href="<?php echo esc_url(admin_url('profile.php')); ?>" class="ast-button ast-button-secondary" target="_blank">Edit Profile</a>
                     </div>
                 </div>