diff --git a/go-form-plugin/export/csv.php b/go-form-plugin/export/csv.php
index a7a3d15..5163b1c 100644
--- a/go-form-plugin/export/csv.php
+++ b/go-form-plugin/export/csv.php
@@ -10,16 +10,23 @@ $form_id = intval($_POST['value_one']);
 $form = go_form_get_form_by_id($form_id);
 $form_name = $form ? $form->name : 'Unknown Form';
 $entries = go_form_get_entries($form_id);
+$custom_fields = go_form_get_custom_fields($form_id);
 
 header('Content-Type: text/csv; charset=utf-8');
 header('Content-Disposition: attachment; filename="go-form-' . sanitize_title($form_name) . '-export.csv"');
 
 $output = fopen('php://output', 'w');
-fputcsv($output, ['ID', 'First Name', 'Last Name', 'Country', 'Club', 'Rank', 'Rating', 'EGD Number', 'Date Added']);
+
+// Build header row
+$header = ['ID', 'First Name', 'Last Name', 'Country', 'Club', 'Rank', 'Rating', 'EGD Number', 'Date Added'];
+foreach ($custom_fields as $field) {
+  $header[] = $field->field_name;
+}
+fputcsv($output, $header);
 
 foreach ($entries as $e) {
   global $ranks;
-  fputcsv($output, [
+  $row = [
     $e->id,
     $e->first_name,
     $e->last_name,
@@ -29,7 +36,15 @@ foreach ($entries as $e) {
     $e->rating,
     $e->egd_number,
     $e->created_at
-  ]);
+  ];
+  
+  // Add custom field values
+  foreach ($custom_fields as $field) {
+    $value = go_form_get_custom_value($e->id, $field->id);
+    $row[] = $value;
+  }
+  
+  fputcsv($output, $row);
 }
 
 fclose($output);
\ No newline at end of file
diff --git a/go-form-plugin/go-form-plugin.php b/go-form-plugin/go-form-plugin.php
index 3e64160..6f76d4d 100644
--- a/go-form-plugin/go-form-plugin.php
+++ b/go-form-plugin/go-form-plugin.php
@@ -11,17 +11,19 @@ function go_form_activate()
   $charset = $wpdb->get_charset_collate();
   $forms = $wpdb->prefix . 'go_form_forms';
   $entries = $wpdb->prefix . 'go_form_entries';
+  $custom_fields = $wpdb->prefix . 'go_form_custom_fields';
+  $custom_values = $wpdb->prefix . 'go_form_entry_custom_values';
 
   dbDelta("CREATE TABLE $forms (
-        id mediumint(9) NOT NULL AUTO_INCREMENT,
+        id int NOT NULL AUTO_INCREMENT,
         name varchar(255) NOT NULL,
         created_at datetime DEFAULT CURRENT_TIMESTAMP NOT NULL,
         PRIMARY KEY (id)
     ) $charset;");
 
   dbDelta("CREATE TABLE $entries (
-        id mediumint(9) NOT NULL AUTO_INCREMENT,
-        form_id mediumint(9) DEFAULT 1,
+        id int NOT NULL AUTO_INCREMENT,
+        form_id int DEFAULT 1,
         first_name varchar(100) NOT NULL,
         last_name varchar(100) NOT NULL,
         country varchar(100) DEFAULT NULL,
@@ -31,13 +33,41 @@ function go_form_activate()
         egd_number varchar(20) DEFAULT NULL,
         created_at date DEFAULT CURRENT_TIMESTAMP NOT NULL,
         PRIMARY KEY (id),
-        FOREIGN KEY (form_id) REFERENCES $forms(id) ON DELETE CASCADE
+        FOREIGN KEY (form_id) REFERENCES $forms(id) ON DELETE CASCADE,
+        INDEX (form_id)
+    ) $charset;");
+
+  dbDelta("CREATE TABLE $custom_fields (
+        id int NOT NULL AUTO_INCREMENT,
+        form_id int NOT NULL,
+        field_name varchar(100) NOT NULL,
+        field_type enum('select','text','checkbox', 'email') NOT NULL DEFAULT 'text',
+        field_options text,
+        is_public tinyint(1) NOT NULL DEFAULT 0,
+        is_required tinyint(1) NOT NULL DEFAULT 0,
+        PRIMARY KEY (id),
+        FOREIGN KEY (form_id) REFERENCES $forms(id) ON DELETE CASCADE,
+        INDEX (form_id)
+    ) $charset;");
+
+  dbDelta("CREATE TABLE $custom_values (
+        id int NOT NULL AUTO_INCREMENT,
+        entry_id int NOT NULL,
+        field_id int NOT NULL,
+        value text,
+        PRIMARY KEY (id),
+        FOREIGN KEY (entry_id) REFERENCES $entries(id) ON DELETE CASCADE,
+        FOREIGN KEY (field_id) REFERENCES $custom_fields(id) ON DELETE CASCADE,
+        INDEX (entry_id),
+        INDEX (field_id)
     ) $charset;");
 }
 
 function go_form_uninstall()
 {
   global $wpdb;
+  $wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}go_form_entry_custom_values");
+  $wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}go_form_custom_fields");
   $wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}go_form_entries");
   $wpdb->query("DROP TABLE IF EXISTS {$wpdb->prefix}go_form_forms");
 }
@@ -76,13 +106,62 @@ function go_form_get_entries($form_id)
   ));
 }
 
-function go_form_render_entries_table($entries, $show_admin = false)
+function go_form_render_entries_table($entries, $show_admin = false, $custom_fields = [], $form_id = 0)
 {
   global $ranks;
 
   include "templates/table.php";
 }
 
+// ========== Custom Fields Helpers ==========
+function go_form_get_custom_fields($form_id)
+{
+  global $wpdb;
+  return $wpdb->get_results($wpdb->prepare(
+    "SELECT * FROM {$wpdb->prefix}go_form_custom_fields WHERE form_id = %d ORDER BY id ASC",
+    $form_id
+  ));
+}
+
+function go_form_get_custom_field_by_id($field_id)
+{
+  global $wpdb;
+  return $wpdb->get_row($wpdb->prepare(
+    "SELECT * FROM {$wpdb->prefix}go_form_custom_fields WHERE id = %d",
+    $field_id
+  ));
+}
+
+function go_form_get_custom_values($entry_id)
+{
+  global $wpdb;
+  return $wpdb->get_results($wpdb->prepare(
+    "SELECT cf.*, cv.value FROM {$wpdb->prefix}go_form_custom_fields cf
+     JOIN {$wpdb->prefix}go_form_entry_custom_values cv ON cf.id = cv.field_id
+     WHERE cv.entry_id = %d",
+    $entry_id
+  ));
+}
+
+function go_form_get_custom_value($entry_id, $field_id)
+{
+  global $wpdb;
+  return $wpdb->get_var($wpdb->prepare(
+    "SELECT value FROM {$wpdb->prefix}go_form_entry_custom_values
+     WHERE entry_id = %d AND field_id = %d",
+    $entry_id, $field_id
+  ));
+}
+
+function go_form_get_entry_by_id($entry_id)
+{
+  global $wpdb;
+  return $wpdb->get_row($wpdb->prepare(
+    "SELECT * FROM {$wpdb->prefix}go_form_entries WHERE id = %d",
+    $entry_id
+  ));
+}
+
 // ========== Form Handling ==========
 function go_form_handle_submission()
 {
@@ -120,6 +199,34 @@ function go_form_handle_submission()
   }
 
   $wpdb->insert("{$wpdb->prefix}go_form_entries", $data);
+  $entry_id = $wpdb->insert_id;
+
+  // Save custom field values
+  $custom_fields = go_form_get_custom_fields($form_id);
+  foreach ($custom_fields as $field) {
+    $field_name = 'custom_field_' . $field->id;
+    if (isset($_POST[$field_name])) {
+      $value = $_POST[$field_name];
+      if ($field->field_type === 'checkbox') {
+        $value = isset($_POST[$field_name]) ? '1' : '0';
+      } elseif (is_array($value)) {
+        $value = implode(',', array_map('sanitize_text_field', $value));
+      } else {
+        $value = sanitize_text_field($value);
+      }
+      $wpdb->insert("{$wpdb->prefix}go_form_entry_custom_values", [
+        'entry_id' => $entry_id,
+        'field_id' => $field->id,
+        'value' => $value
+      ]);
+    } elseif ($field->is_required) {
+      // If required field is missing, delete the entry and redirect back
+      $wpdb->delete("{$wpdb->prefix}go_form_entries", ['id' => $entry_id]);
+      wp_redirect($_SERVER['HTTP_REFERER']);
+      exit;
+    }
+  }
+
   wp_redirect($_SERVER['HTTP_REFERER']);
   exit;
 }
@@ -233,6 +340,157 @@ function go_form_export_mcmahon()
 }
 add_action('admin_post_go_form_export_mcmahon', 'go_form_export_mcmahon');
 
+// ========== Custom Field Admin Actions ==========
+function go_form_create_custom_field()
+{
+  go_form_admin_action('create_custom_field');
+  if (isset($_POST['form_id']) && isset($_POST['field_name']) && isset($_POST['field_type'])) {
+    global $wpdb;
+    $form_id = intval($_POST['form_id']);
+    $field_name = sanitize_text_field($_POST['field_name']);
+    $field_type = sanitize_text_field($_POST['field_type']);
+    $field_options = isset($_POST['field_options']) ? sanitize_textarea_field($_POST['field_options']) : '';
+    $is_public = isset($_POST['is_public']) ? 1 : 0;
+    $is_required = isset($_POST['is_required']) ? 1 : 0;
+
+    $wpdb->insert("{$wpdb->prefix}go_form_custom_fields", [
+      'form_id' => $form_id,
+      'field_name' => $field_name,
+      'field_type' => $field_type,
+      'field_options' => $field_options,
+      'is_public' => $is_public,
+      'is_required' => $is_required
+    ]);
+  }
+  $redirect_url = add_query_arg(array('page' => 'go-form-settings', 'form_id' => $_POST['form_id'], 'created_field' => 1), admin_url('admin.php'));
+  wp_redirect($redirect_url);
+  exit;
+}
+add_action('admin_post_go_form_create_custom_field', 'go_form_create_custom_field');
+
+function go_form_update_custom_field()
+{
+  go_form_admin_action('update_custom_field');
+  if (isset($_POST['field_id']) && isset($_POST['field_name']) && isset($_POST['field_type'])) {
+    global $wpdb;
+    $field_id = intval($_POST['field_id']);
+    $field_name = sanitize_text_field($_POST['field_name']);
+    $field_type = sanitize_text_field($_POST['field_type']);
+    $field_options = isset($_POST['field_options']) ? sanitize_textarea_field($_POST['field_options']) : '';
+    $is_public = isset($_POST['is_public']) ? 1 : 0;
+    $is_required = isset($_POST['is_required']) ? 1 : 0;
+
+    $wpdb->update("{$wpdb->prefix}go_form_custom_fields", [
+      'field_name' => $field_name,
+      'field_type' => $field_type,
+      'field_options' => $field_options,
+      'is_public' => $is_public,
+      'is_required' => $is_required
+    ], ['id' => $field_id]);
+  }
+  $redirect_url = add_query_arg(array('page' => 'go-form-settings', 'form_id' => $_POST['form_id'], 'updated_field' => 1), admin_url('admin.php'));
+  wp_redirect($redirect_url);
+  exit;
+}
+add_action('admin_post_go_form_update_custom_field', 'go_form_update_custom_field');
+
+function go_form_delete_custom_field()
+{
+  go_form_admin_action('delete_custom_field');
+  if (isset($_POST['field_id'])) {
+    global $wpdb;
+    $field_id = intval($_POST['field_id']);
+    $field = go_form_get_custom_field_by_id($field_id);
+    $form_id = $field ? $field->form_id : 0;
+    $wpdb->delete("{$wpdb->prefix}go_form_custom_fields", ['id' => $field_id]);
+    $redirect_url = add_query_arg(array('page' => 'go-form-settings', 'form_id' => $form_id, 'deleted_field' => 1), admin_url('admin.php'));
+    wp_redirect($redirect_url);
+    exit;
+  }
+  $redirect_url = add_query_arg(array('page' => 'go-form-settings'), admin_url('admin.php'));
+  wp_redirect($redirect_url);
+  exit;
+}
+add_action('admin_post_go_form_delete_custom_field', 'go_form_delete_custom_field');
+
+// ========== Entry Edit Admin Action ==========
+function go_form_update_entry()
+{
+  go_form_admin_action('update_entry');
+  if (!isset($_POST['entry_id']) || !isset($_POST['form_id'])) {
+    wp_redirect(admin_url('admin.php?page=go-form-settings'));
+    exit;
+  }
+
+  global $wpdb;
+  $entry_id = intval($_POST['entry_id']);
+  $form_id = intval($_POST['form_id']);
+  
+  $rating = intval($_POST['rating']);
+  $rank = intval($_POST['rank']);
+  if ($rating < -900) {
+    $rating = ($rank * 100) - 900;
+  }
+
+  $data = [
+    'first_name' => sanitize_text_field($_POST['first_name']),
+    'last_name' => sanitize_text_field($_POST['last_name']),
+    'country' => sanitize_text_field($_POST['country'] ?? ''),
+    'club' => sanitize_text_field($_POST['club'] ?? ''),
+    'rank' => $rank,
+    'rating' => $rating,
+    'egd_number' => sanitize_text_field($_POST['egd_number'] ?? ''),
+  ];
+
+  if (empty($data['first_name']) || empty($data['last_name'])) {
+    $redirect_url = add_query_arg(array('page' => 'go-form-settings', 'form_id' => $form_id, 'edit_entry' => $entry_id, 'error' => 'missing_required'), admin_url('admin.php'));
+    wp_redirect($redirect_url);
+    exit;
+  }
+
+  $wpdb->update("{$wpdb->prefix}go_form_entries", $data, ['id' => $entry_id]);
+
+  // Update custom field values
+  $custom_fields = go_form_get_custom_fields($form_id);
+  foreach ($custom_fields as $field) {
+    $field_name = 'custom_field_' . $field->id;
+    if (isset($_POST[$field_name])) {
+      $value = $_POST[$field_name];
+      if ($field->field_type === 'checkbox') {
+        $value = isset($_POST[$field_name]) ? '1' : '0';
+      } elseif (is_array($value)) {
+        $value = implode(',', array_map('sanitize_text_field', $value));
+      } else {
+        $value = sanitize_text_field($value);
+      }
+      
+      // Check if custom value exists
+      $existing = go_form_get_custom_value($entry_id, $field->id);
+      if ($existing !== null) {
+        $wpdb->update("{$wpdb->prefix}go_form_entry_custom_values", 
+          ['value' => $value], 
+          ['entry_id' => $entry_id, 'field_id' => $field->id]);
+      } else {
+        $wpdb->insert("{$wpdb->prefix}go_form_entry_custom_values", [
+          'entry_id' => $entry_id,
+          'field_id' => $field->id,
+          'value' => $value
+        ]);
+      }
+    } elseif ($field->is_required) {
+      // If required field is missing, redirect back with error
+      $redirect_url = add_query_arg(array('page' => 'go-form-settings', 'form_id' => $form_id, 'edit_entry' => $entry_id, 'error' => 'missing_required_field'), admin_url('admin.php'));
+      wp_redirect($redirect_url);
+      exit;
+    }
+  }
+
+  $redirect_url = add_query_arg(array('page' => 'go-form-settings', 'form_id' => $form_id, 'updated_entry' => 1), admin_url('admin.php'));
+  wp_redirect($redirect_url);
+  exit;
+}
+add_action('admin_post_go_form_update_entry', 'go_form_update_entry');
+
 // ========== Admin Page ====================
 function go_form_admin_menu()
 {
diff --git a/go-form-plugin/templates/form-shortcode.php b/go-form-plugin/templates/form-shortcode.php
index 3853165..8637f31 100644
--- a/go-form-plugin/templates/form-shortcode.php
+++ b/go-form-plugin/templates/form-shortcode.php
@@ -99,6 +99,40 @@
         <label for="egd_number">EGD Number:</label><input type="text" name="egd_number" id="egd_number">
       </div>
 
+      <?php
+      // Display custom fields
+      $custom_fields = go_form_get_custom_fields($form_id);
+      foreach ($custom_fields as $field):
+        if (!$field->is_public) continue;
+        $field_id = 'custom_field_' . $field->id;
+        echo '<div' . ($field->field_type === 'checkbox' ? ' style="grid-column: span 2;"' : '') . '>';
+        echo '<label for="' . esc_attr($field_id) . '">' . esc_html($field->field_name) . ($field->is_required ? '*' : '') . ':</label>';
+        
+        switch ($field->field_type) {
+          case 'text':
+            echo '<input type="text" name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '"' . ($field->is_required ? ' required' : '') . '>';
+            break;
+          case 'email':
+            echo '<input type="email" name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '"' . ($field->is_required ? ' required' : '') . '>';
+            break;
+          case 'select':
+            $options = $field->field_options ? explode(',', $field->field_options) : [];
+            echo '<select name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '"' . ($field->is_required ? ' required' : '') . '>';
+            echo '<option value="">-- Select --</option>';
+            foreach ($options as $option) {
+              $option = trim($option);
+              echo '<option value="' . esc_attr($option) . '">' . esc_html($option) . '</option>';
+            }
+            echo '</select>';
+            break;
+          case 'checkbox':
+            echo '<input type="checkbox" name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '" value="1"' . ($field->is_required ? ' required' : '') . '>';
+            break;
+        }
+        echo '</div>';
+      endforeach;
+      ?>
+
     </div>
 
     <p>* Required fields</p>
@@ -115,9 +149,10 @@
   <?php
   $entries = go_form_get_entries($form_id);
   $entries_count = count($entries);
+  $custom_fields = go_form_get_custom_fields($form_id);
   ?>
   <h2>Sign-up players: <?= esc_html($entries_count); ?></h2>
-  <?php go_form_render_entries_table($entries); ?>
+  <?php go_form_render_entries_table($entries, false, $custom_fields, $form_id); ?>
 </div>
 
 <script>
diff --git a/go-form-plugin/templates/settings-page.php b/go-form-plugin/templates/settings-page.php
index 1c16b77..2918a61 100644
--- a/go-form-plugin/templates/settings-page.php
+++ b/go-form-plugin/templates/settings-page.php
@@ -7,6 +7,18 @@ if (isset($_GET['deleted']))
   echo '<div class="notice notice-success"><p>Deleted!</p></div>';
 if (isset($_GET['created']))
   echo '<div class="notice notice-success"><p>Form created!</p></div>';
+if (isset($_GET['created_field']))
+  echo '<div class="notice notice-success"><p>Custom field created!</p></div>';
+if (isset($_GET['updated_field']))
+  echo '<div class="notice notice-success"><p>Custom field updated!</p></div>';
+if (isset($_GET['deleted_field']))
+  echo '<div class="notice notice-success"><p>Custom field deleted!</p></div>';
+if (isset($_GET['updated_entry']))
+  echo '<div class="notice notice-success"><p>Entry updated!</p></div>';
+if (isset($_GET['error']) && $_GET['error'] == 'missing_required')
+  echo '<div class="notice notice-error"><p>First Name and Last Name are required!</p></div>';
+if (isset($_GET['error']) && $_GET['error'] == 'missing_required_field')
+  echo '<div class="notice notice-error"><p>A required custom field is missing!</p></div>';
 ?>
 
 <div class="wrap">
@@ -47,11 +59,165 @@ if (isset($_GET['created']))
     action_button('go_form_export_opengotha', 'Export to Opengoth', 'Confrm Export', $selected_form_id);
     action_button('go_form_export_mcmahon', 'Export to McMahon', 'Confrm Export', $selected_form_id);
 
-
-
     echo '</div>';
+
+    // ========== Custom Fields Management ==========
+    $custom_fields = go_form_get_custom_fields($selected_form_id);
+    
+    echo '<div style="margin-bottom:20px; padding:15px; background:#f9f9f9; border:1px solid #ddd; border-radius:4px;">';
+    echo '<h3>Custom Fields</h3>';
+    
+    // Add new custom field form
+    echo '<details style="margin-bottom:15px;"><summary style="cursor:pointer; font-weight:bold;">+ Add New Custom Field</summary>';
+    echo '<form method="post" action="' . admin_url('admin-post.php') . '" style="margin-top:10px; padding-left:15px;">';
+    echo wp_nonce_field('go_form_create_custom_field_action', 'go_form_create_custom_field_nonce', true, false);
+    echo '<input type="hidden" name="action" value="go_form_create_custom_field">';
+    echo '<input type="hidden" name="form_id" value="' . esc_attr($selected_form_id) . '">';
+    echo '<table class="form-table">';
+    echo '<tr><th><label for="field_name">Field Name:</label></th><td><input type="text" name="field_name" id="field_name" required></td></tr>';
+    echo '<tr><th><label for="field_type">Field Type:</label></th><td>';
+    echo '<select name="field_type" id="field_type">';
+    echo '<option value="text">Text</option>';
+    echo '<option value="select">Dropdown (Select)</option>';
+    echo '<option value="checkbox">Checkbox</option>';
+    echo '<option value="email">Email</option>';
+    echo '</select>';
+    echo '</td></tr>';
+    echo '<tr><th><label for="field_options">Options (for select, comma-separated):</label></th><td><textarea name="field_options" id="field_options" rows="2" style="width:100%;"></textarea><small>e.g., Option 1,Option 2,Option 3</small></td></tr>';
+    echo '<tr><th><label for="is_public">Public:</label></th><td><input type="checkbox" name="is_public" id="is_public" value="1" checked> <small>Show on public form</small></td></tr>';
+    echo '<tr><th><label for="is_required">Required:</label></th><td><input type="checkbox" name="is_required" id="is_required" value="1"> <small>Required field</small></td></tr>';
+    echo '</table>';
+    echo '<p class="submit"><input type="submit" class="button button-primary" value="Add Custom Field"></p>';
+    echo '</form>';
+    echo '</details>';
+    
+    // List existing custom fields
+    if (!empty($custom_fields)) {
+      echo '<table class="wp-list-table widefat striped" style="margin-top:15px;">';
+      echo '<thead><tr><th>Field Name</th><th>Type</th><th>Public</th><th>Required</th><th>Actions</th></tr></thead><tbody>';
+      foreach ($custom_fields as $field) {
+        echo '<tr>';
+        echo '<td>' . esc_html($field->field_name) . '</td>';
+        echo '<td>' . esc_html($field->field_type) . '</td>';
+        echo '<td>' . ($field->is_public ? 'Yes' : 'No') . '</td>';
+        echo '<td>' . ($field->is_required ? 'Yes' : 'No') . '</td>';
+        echo '<td>';
+        // Edit button (toggle to show edit form)
+        echo '<a href="' . add_query_arg(array('page' => 'go-form-settings', 'form_id' => $selected_form_id, 'edit_field' => $field->id), admin_url('admin.php')) . '" class="button button-small">Edit</a> ';
+        action_button('go_form_delete_custom_field', 'Delete', 'Delete this custom field?', $field->id);
+        echo '</td>';
+        echo '</tr>';
+      }
+      echo '</tbody></table>';
+    } else {
+      echo '<p><em>No custom fields yet.</em></p>';
+    }
+    
+    // Edit custom field form
+    if (isset($_GET['edit_field']) && $edit_field_id = intval($_GET['edit_field'])) {
+      $edit_field = go_form_get_custom_field_by_id($edit_field_id);
+      if ($edit_field && $edit_field->form_id == $selected_form_id) {
+        echo '<details open style="margin-top:20px;"><summary style="cursor:pointer; font-weight:bold;">Edit Custom Field</summary>';
+        echo '<form method="post" action="' . admin_url('admin-post.php') . '" style="margin-top:10px; padding-left:15px;">';
+        echo wp_nonce_field('go_form_update_custom_field_action', 'go_form_update_custom_field_nonce', true, false);
+        echo '<input type="hidden" name="action" value="go_form_update_custom_field">';
+        echo '<input type="hidden" name="form_id" value="' . esc_attr($selected_form_id) . '">';
+        echo '<input type="hidden" name="field_id" value="' . esc_attr($edit_field->id) . '">';
+        echo '<table class="form-table">';
+        echo '<tr><th><label for="field_name">Field Name:</label></th><td><input type="text" name="field_name" id="field_name" value="' . esc_attr($edit_field->field_name) . '" required></td></tr>';
+        echo '<tr><th><label for="field_type">Field Type:</label></th><td>';
+        echo '<select name="field_type" id="field_type">';
+        echo '<option value="text"' . selected($edit_field->field_type, 'text', false) . '>Text</option>';
+        echo '<option value="select"' . selected($edit_field->field_type, 'select', false) . '>Dropdown (Select)</option>';
+        echo '<option value="checkbox"' . selected($edit_field->field_type, 'checkbox', false) . '>Checkbox</option>';
+        echo '<option value="email"' . selected($edit_field->field_type, 'email', false) . '>Email</option>';
+        echo '</select>';
+        echo '</td></tr>';
+        echo '<tr><th><label for="field_options">Options (for select, comma-separated):</label></th><td><textarea name="field_options" id="field_options" rows="2" style="width:100%;">' . esc_textarea($edit_field->field_options) . '</textarea><small>e.g., Option 1,Option 2,Option 3</small></td></tr>';
+        echo '<tr><th><label for="is_public">Public:</label></th><td><input type="checkbox" name="is_public" id="is_public" value="1" ' . checked($edit_field->is_public, 1, false) . '> <small>Show on public form</small></td></tr>';
+        echo '<tr><th><label for="is_required">Required:</label></th><td><input type="checkbox" name="is_required" id="is_required" value="1" ' . checked($edit_field->is_required, 1, false) . '> <small>Required field</small></td></tr>';
+        echo '</table>';
+        echo '<p class="submit"><input type="submit" class="button button-primary" value="Update Custom Field"> <a href="' . add_query_arg(array('page' => 'go-form-settings', 'form_id' => $selected_form_id), admin_url('admin.php')) . '" class="button">Cancel</a></p>';
+        echo '</form>';
+        echo '</details>';
+      }
+    }
+    
+    echo '</div>';
+
+    // ========== Edit Entry Form ==========
+    if (isset($_GET['edit_entry']) && $edit_entry_id = intval($_GET['edit_entry'])) {
+      $entry = go_form_get_entry_by_id($edit_entry_id);
+      if ($entry && $entry->form_id == $selected_form_id) {
+        $custom_fields = go_form_get_custom_fields($selected_form_id);
+        echo '<div style="margin-bottom:20px; padding:15px; background:#fff; border:1px solid #ddd; border-radius:4px;">';
+        echo '<h3>Edit Entry</h3>';
+        echo '<form method="post" action="' . admin_url('admin-post.php') . '">';
+        echo wp_nonce_field('go_form_update_entry_action', 'go_form_update_entry_nonce', true, false);
+        echo '<input type="hidden" name="action" value="go_form_update_entry">';
+        echo '<input type="hidden" name="entry_id" value="' . esc_attr($entry->id) . '">';
+        echo '<input type="hidden" name="form_id" value="' . esc_attr($selected_form_id) . '">';
+        echo '<table class="form-table">';
+        echo '<tr><th><label for="first_name">First Name*:</label></th><td><input type="text" name="first_name" id="first_name" value="' . esc_attr($entry->first_name) . '" required></td></tr>';
+        echo '<tr><th><label for="last_name">Last Name*:</label></th><td><input type="text" name="last_name" id="last_name" value="' . esc_attr($entry->last_name) . '" required></td></tr>';
+        echo '<tr><th><label for="country">Country:</label></th><td><input type="text" name="country" id="country" value="' . esc_attr($entry->country) . '"></td></tr>';
+        echo '<tr><th><label for="club">Club:</label></th><td><input type="text" name="club" id="club" value="' . esc_attr($entry->club) . '"></td></tr>';
+        echo '<tr><th><label for="rank">Rank:</label></th><td>';
+        echo '<select name="rank" id="rank">';
+        global $ranks;
+        foreach ($ranks as $value => $label) {
+          echo '<option value="' . esc_attr($value) . '" ' . selected($entry->rank, $value, false) . '>' . esc_html($label) . '</option>';
+        }
+        echo '</select>';
+        echo '</td></tr>';
+        echo '<tr><th><label for="rating">Rating:</label></th><td><input type="number" name="rating" id="rating" value="' . esc_attr($entry->rating) . '"></td></tr>';
+        echo '<tr><th><label for="egd_number">EGD Number:</label></th><td><input type="text" name="egd_number" id="egd_number" value="' . esc_attr($entry->egd_number) . '"></td></tr>';
+        
+        // Custom fields
+        if (!empty($custom_fields)) {
+          foreach ($custom_fields as $field) {
+            $field_id = 'custom_field_' . $field->id;
+            $value = go_form_get_custom_value($entry->id, $field->id);
+            echo '<tr><th><label for="' . esc_attr($field_id) . '">' . esc_html($field->field_name) . ($field->is_required ? '*' : '') . ':</label></th><td>';
+            
+            switch ($field->field_type) {
+              case 'text':
+                echo '<input type="text" name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '" value="' . esc_attr($value) . '"' . ($field->is_required ? ' required' : '') . '>';
+                break;
+              case 'email':
+                echo '<input type="email" name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '" value="' . esc_attr($value) . '"' . ($field->is_required ? ' required' : '') . '>';
+                break;
+              case 'select':
+                $options = $field->field_options ? explode(',', $field->field_options) : [];
+                echo '<select name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '"' . ($field->is_required ? ' required' : '') . '>';
+                echo '<option value="">-- Select --</option>';
+                foreach ($options as $option) {
+                  $option = trim($option);
+                  echo '<option value="' . esc_attr($option) . '" ' . selected($value, $option, false) . '>' . esc_html($option) . '</option>';
+                }
+                echo '</select>';
+                break;
+              case 'checkbox':
+                echo '<input type="checkbox" name="' . esc_attr($field_id) . '" id="' . esc_attr($field_id) . '" value="1" ' . checked($value, '1', false) . '>';
+                break;
+            }
+            echo '</td></tr>';
+          }
+        }
+        
+        echo '</table>';
+        echo '<p class="submit">';
+        echo '<input type="submit" class="button button-primary" value="Update Entry">';
+        echo ' <a href="' . add_query_arg(array('page' => 'go-form-settings', 'form_id' => $selected_form_id), admin_url('admin.php')) . '" class="button">Cancel</a>';
+        echo '</p>';
+        echo '</form>';
+        echo '</div>';
+      }
+    }
+
     $entries = go_form_get_entries($selected_form_id);
-    go_form_render_entries_table($entries, true);
+    $custom_fields = go_form_get_custom_fields($selected_form_id);
+    go_form_render_entries_table($entries, true, $custom_fields, $selected_form_id);
 
   } else {
 
diff --git a/go-form-plugin/templates/table.php b/go-form-plugin/templates/table.php
index 84133b3..36b839a 100644
--- a/go-form-plugin/templates/table.php
+++ b/go-form-plugin/templates/table.php
@@ -8,6 +8,14 @@
       <th>Rank</th>
       <th>EGD Number</th>
       <th>Date Added</th>
+      <?php
+      // Add custom field columns
+      foreach ($custom_fields as $field):
+        if ($field->is_public || $show_admin):
+          echo '<th>' . esc_html($field->field_name) . '</th>';
+        endif;
+      endforeach;
+      ?>
       <?php if ($show_admin): ?>
         <th>Rating</th>
         <th>Action</th>
@@ -26,11 +34,27 @@
         <td> <?= esc_html($ranks[$e->rank]) ?> </td>
         <td> <?= esc_html($e->egd_number) ?> </td>
         <td> <?= esc_html($e->created_at) ?> </td>
+        <?php
+        // Display custom field values
+        foreach ($custom_fields as $field):
+          if ($field->is_public || $show_admin):
+            echo '<td>';
+            $value = go_form_get_custom_value($e->id, $field->id);
+            if ($field->field_type === 'checkbox') {
+              echo $value ? 'Yes' : 'No';
+            } else {
+              echo esc_html($value);
+            }
+            echo '</td>';
+          endif;
+        endforeach;
+        ?>
         
         <?php if ($show_admin): ?>
 
           <td> <?= esc_html($e->rating) ?> </td>
           <td>
+            <a href="<?= add_query_arg(array('page' => 'go-form-settings', 'form_id' => $form_id ?? 0, 'edit_entry' => $e->id), admin_url('admin.php')) ?>" class="button button-small">Edit</a>
             <?php action_button('go_form_delete_entry', 'Delete', 'Delete this entry?', $e->id); ?>
           </td>