diff --git a/go-form-plugin/go-form-plugin.php b/go-form-plugin/go-form-plugin.php
index 098ee5b..8c11c22 100644
--- a/go-form-plugin/go-form-plugin.php
+++ b/go-form-plugin/go-form-plugin.php
@@ -88,18 +88,28 @@ function go_form_render_entries_table($entries, $show_delete = false) {
         return;
     }
 
-    $headers = ['First Name', 'Last Name', 'Country', 'Club', 'Rank', 'Email', 'EGD Number', 'Date Added'];
-    if ($show_delete) $headers[] = 'Action';
+    $headers = ['First Name', 'Last Name', 'Country', 'Club', 'Rank', 'EGD Number'];
+    if ($show_delete) {
+        $headers[] = 'Email';
+        $headers[] = 'Date Added';
+        $headers[] = 'Action';
+    } 
 
     echo '<table class="'.($show_delete ? 'wp-list-table widefat fixed striped' : 'go-entries-table').'">
         <thead><tr><th>'.implode('</th><th>', $headers).'</th></tr></thead><tbody>';
     
     foreach ($entries as $e) {
-        echo '<tr><td>'.esc_html($e->first_name).'</td><td>'.esc_html($e->last_name).'</td>
-            <td>'.esc_html($e->country).'</td><td>'.esc_html($e->club).'</td><td>'.esc_html($ranks[$e->rank]).'</td>
-            <td>'.esc_html($e->email).'</td><td>'.esc_html($e->egd_number).'</td><td>'.esc_html($e->created_at).'</td>';
+        echo '<tr>';
+        echo '<td>'.esc_html($e->first_name).'</td>'; 
+        echo '<td>'.esc_html($e->last_name).'</td>';
+        echo '<td>'.esc_html($e->country).'</td>';
+        echo '<td>'.esc_html($e->club).'</td>';
+        echo '<td>'.esc_html($ranks[$e->rank]).'</td>';
+        echo '<td>'.esc_html($e->egd_number).'</td>';
 
         if ($show_delete) {
+            echo '<td>'.esc_html($e->email).'</td>';
+            echo '<td>'.esc_html($e->created_at).'</td>';
             echo '<td><form method="post" action="'.admin_url('admin-post.php').'">
                 '.wp_nonce_field('go_form_delete_action', 'go_form_delete_nonce', true, false).'
                 <input type="hidden" name="action" value="go_form_delete_entry">