diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-dashboard.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-dashboard.php
index 97774275..18fadc90 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-dashboard.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/includes/class-hvac-dashboard.php
@@ -359,13 +359,13 @@ class HVAC_Dashboard {
             </tbody>
         </table>
         
-        <?php if ($pagination['total_pages'] > 1) : ?>
-            <div class="tablenav bottom">
-                <div class="tablenav-pages">
-                    <span class="displaying-num"><?php echo esc_html($pagination['total_items']); ?> items</span>
+        <div class="tablenav bottom">
+            <div class="tablenav-pages">
+                <span class="displaying-num"><?php echo esc_html($pagination['total_items']); ?> items</span>
+                <?php if ($pagination['total_pages'] > 1) : ?>
                     <span class="pagination-links">
                         <?php if ($pagination['has_prev']) : ?>
-                            <a class="prev-page button" href="#" data-page="1">
+                            <a class="first-page button" href="#" data-page="1">
                                 <span class="screen-reader-text">First page</span>
                                 <span aria-hidden="true">«</span>
                             </a>
@@ -389,7 +389,7 @@ class HVAC_Dashboard {
                                 <span class="screen-reader-text">Next page</span>
                                 <span aria-hidden="true">›</span>
                             </a>
-                            <a class="next-page button" href="#" data-page="<?php echo esc_attr($pagination['total_pages']); ?>">
+                            <a class="last-page button" href="#" data-page="<?php echo esc_attr($pagination['total_pages']); ?>">
                                 <span class="screen-reader-text">Last page</span>
                                 <span aria-hidden="true">»</span>
                             </a>
@@ -398,9 +398,10 @@ class HVAC_Dashboard {
                             <span class="tablenav-pages-navspan button disabled" aria-hidden="true">»</span>
                         <?php endif; ?>
                     </span>
-                </div>
+                <?php endif; ?>
             </div>
-        <?php endif;
+        </div>
+        <?php
         
         $html = ob_get_clean();
         
diff --git a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-hvac-dashboard.php b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-hvac-dashboard.php
index f91186f4..d6215329 100644
--- a/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-hvac-dashboard.php
+++ b/wordpress-dev/wordpress/wp-content/plugins/hvac-community-events/templates/template-hvac-dashboard.php
@@ -344,10 +344,10 @@ get_header(); // Use theme's header
 				</table>
 			</div>
 
-			<?php if ($pagination['total_pages'] > 1) : ?>
 			<div class="tablenav bottom">
 				<div class="tablenav-pages">
 					<span class="displaying-num"><?php echo esc_html($pagination['total_items']); ?> items</span>
+					<?php if ($pagination['total_pages'] > 1) : ?>
 					<span class="pagination-links">
 						<?php if ($pagination['has_prev']) : ?>
 							<a class="first-page button" href="#" data-page="1">