diff --git a/admin/form-builder/assets/js/components/field-radio/template.php b/admin/form-builder/assets/js/components/field-radio/template.php
index 01980f9f3..0d8822183 100644
--- a/admin/form-builder/assets/js/components/field-radio/template.php
+++ b/admin/form-builder/assets/js/components/field-radio/template.php
@@ -15,7 +15,6 @@ class="wpuf-items-center">
                 class="wpuf-block text-sm/6 wpuf-font-medium wpuf-text-gray-900 !wpuf-mb-0">
                 <input
                     type="radio"
-                    :name="'radio_' + editing_form_field.id + '_' + option_field.name"
                     :value="key"
                     v-model="value"
                     :class="builder_class_names('radio')">
@@ -31,7 +30,6 @@ class="wpuf-flex wpuf-items-center"
         <label class="!wpuf-mb-0">
             <input
                 type="radio"
-                :name="'radio_' + editing_form_field.id + '_' + option_field.name"
                 :value="key"
                 v-model="value"
                 :class="builder_class_names('radio')">
diff --git a/assets/css/admin/form-builder.css b/assets/css/admin/form-builder.css
index e8ce52e1f..67eb29200 100644
--- a/assets/css/admin/form-builder.css
+++ b/assets/css/admin/form-builder.css
@@ -2073,6 +2073,44 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   background-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));
 }
 
+.wpuf-table {
+  position: relative;
+  width: 100%;
+  border-radius: var(--rounded-box, 1rem);
+  text-align: left;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+}
+
+.wpuf-table :where(.wpuf-table-pin-rows thead tr) {
+  position: sticky;
+  top: 0px;
+  z-index: 1;
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+}
+
+.wpuf-table :where(.wpuf-table-pin-rows tfoot tr) {
+  position: sticky;
+  bottom: 0px;
+  z-index: 1;
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+}
+
+.wpuf-table :where(.wpuf-table-pin-cols tr th) {
+  position: sticky;
+  left: 0px;
+  right: 0px;
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b1,oklch(var(--b1)/var(--tw-bg-opacity)));
+}
+
+.wpuf-table-zebra tbody tr:nth-child(even) :where(.wpuf-table-pin-cols tr th) {
+  --tw-bg-opacity: 1;
+  background-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-bg-opacity)));
+}
+
 .wpuf-toast {
   position: fixed;
   display: flex;
@@ -2964,6 +3002,26 @@ input.wpuf-tab:checked + .wpuf-tab-content,
   animation: toast-pop 0.25s ease-out;
 }
 
+.wpuf-table :where(thead tr, tbody tr:not(:last-child), tbody tr:first-child:last-child) {
+  border-bottom-width: 1px;
+  --tw-border-opacity: 1;
+  border-bottom-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));
+}
+
+.wpuf-table :where(thead, tfoot) {
+  white-space: nowrap;
+  font-size: 0.75rem;
+  line-height: 1rem;
+  font-weight: 700;
+  color: var(--fallback-bc,oklch(var(--bc)/0.6));
+}
+
+.wpuf-table :where(tfoot) {
+  border-top-width: 1px;
+  --tw-border-opacity: 1;
+  border-top-color: var(--fallback-b2,oklch(var(--b2)/var(--tw-border-opacity)));
+}
+
 @keyframes toast-pop {
   0% {
     transform: scale(0.9);
diff --git a/assets/js-templates/form-components.php b/assets/js-templates/form-components.php
index 7001a5830..5a4af93f6 100644
--- a/assets/js-templates/form-components.php
+++ b/assets/js-templates/form-components.php
@@ -18,14 +18,14 @@
             data-source="stage"
         >
             <div v-if="!is_full_width(field.template)" class="wpuf-label">
-                <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'left_label'" 
+                <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'left_label'"
                       class="wpuf-field-label-icon wpuf-inline-flex wpuf-items-center wpuf-mr-1">
                       <i :class="[field.field_icon, 'wpuf-field-icon']"></i>
                 </span>
                 <label v-if="!is_invisible(field)" :for="'wpuf-' + field.name ? field.name : 'cls'">
                     {{ field.label }} <span v-if="field.required && 'yes' === field.required" class="required">*</span>
                 </label>
-                <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'right_label'" 
+                <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'right_label'"
                       class="wpuf-field-label-icon wpuf-inline-flex wpuf-items-center wpuf-ml-2">
                       <i :class="[field.field_icon, 'wpuf-field-icon']"></i>
                 </span>
@@ -117,7 +117,7 @@ class="wpuf-group wpuf-rounded-lg hover:!wpuf-bg-green-50 wpuf-transition wpuf-d
                 :class="parseInt(editing_form_id) === parseInt(field.id) ? 'wpuf-bg-green-50 wpuf-border-green-400' : 'wpuf-border-transparent'"
                 class="wpuf-flex wpuf-justify-between wpuf-p-6 wpuf-rounded-t-md wpuf-border-t wpuf-border-r wpuf-border-l wpuf-border-dashed group-hover:wpuf-border-green-400 group-hover:wpuf-cursor-pointer !wpuf-pb-3">
                 <div v-if="!(is_full_width(field.template) || is_pro_preview(field.template))" class="wpuf-w-1/4 wpuf-flex wpuf-items-center">
-                    <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'left_label'" 
+                    <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'left_label'"
                           class="wpuf-field-label-icon wpuf-inline-flex wpuf-items-center wpuf-mr-1">
                           <i :class="[field.field_icon, 'wpuf-field-icon']"></i>
                     </span>
@@ -128,7 +128,7 @@ class="wpuf-block wpuf-text-sm wpuf-font-medium wpuf-leading-6 wpuf-text-gray-90
                         {{ field.label }} <span v-if="field.required && 'yes' === field.required"
                                                 class="required">*</span>
                     </label>
-                    <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'right_label'" 
+                    <span v-if="field.show_icon === 'yes' && field.field_icon && field.icon_position === 'right_label'"
                           class="wpuf-field-label-icon wpuf-inline-flex wpuf-items-center wpuf-ml-2">
                           <i :class="[field.field_icon, 'wpuf-field-icon']"></i>
                     </span>
@@ -322,9 +322,9 @@ class="wpuf-absolute wpuf-bg-white wpuf-border wpuf-border-gray-300 wpuf-rounded
         >
             <!-- Search -->
             <div class="wpuf-p-3 wpuf-border-b wpuf-border-gray-200">
-                <input 
+                <input
                     v-model="searchTerm"
-                    type="text" 
+                    type="text"
                     placeholder="Search icons... (e.g., user, email, home)"
                     class="wpuf-w-full !wpuf-px-4 !wpuf-py-1.5 wpuf-border wpuf-border-gray-300 wpuf-rounded wpuf-text-sm wpuf-text-gray-900 placeholder:wpuf-text-gray-400 wpuf-shadow focus:!wpuf-shadow-none"
                 >
@@ -583,7 +583,6 @@ class="wpuf-items-center">
                 class="wpuf-block text-sm/6 wpuf-font-medium wpuf-text-gray-900 !wpuf-mb-0">
                 <input
                     type="radio"
-                    :name="'radio_' + editing_form_field.id + '_' + option_field.name"
                     :value="key"
                     v-model="value"
                     :class="builder_class_names('radio')">
@@ -599,7 +598,6 @@ class="wpuf-flex wpuf-items-center"
         <label class="!wpuf-mb-0">
             <input
                 type="radio"
-                :name="'radio_' + editing_form_field.id + '_' + option_field.name"
                 :value="key"
                 v-model="value"
                 :class="builder_class_names('radio')">
diff --git a/includes/Admin/Posting.php b/includes/Admin/Posting.php
index 582888e62..37b033a12 100644
--- a/includes/Admin/Posting.php
+++ b/includes/Admin/Posting.php
@@ -145,23 +145,23 @@ public function enqueue_script() {
         ] );
 
         // Enqueue field initialization script for admin metabox
-        
+
         // Enqueue Selectize for country fields
         wp_enqueue_style( 'wpuf-selectize' );
         wp_enqueue_script( 'wpuf-selectize' );
-        
+
         // Enqueue international telephone input for phone fields
         wp_enqueue_style( 'wpuf-intlTelInput' );
         wp_enqueue_script( 'wpuf-intlTelInput' );
-        
+
         // Try to load the field initialization script using the registered handle
         wp_enqueue_script( 'wpuf-field-initialization' );
-        
+
         // Localize script with asset URI
         wp_localize_script( 'wpuf-field-initialization', 'wpuf_field_initializer', [
             'asset_uri' => defined( 'WPUF_PRO_ASSET_URI' ) ? WPUF_PRO_ASSET_URI : '',
         ] );
-        
+
 
     }
 
@@ -461,6 +461,7 @@ public function render_form( $form_id, $post_id = null ) {
             if ( typeof wpuf_map_items === 'undefined' ) {
                 wpuf_map_items = [];
             }
+
         </script>
 
             <?php
@@ -560,14 +561,19 @@ public function scripts_styles() {
                             var fieldName = $container.data('field-name');
                             var maxRepeats = parseInt($container.data('max-repeats')) || -1;
 
+
                             wpuf.updateRepeatButtons($container);
 
                             $container.on('click', '.wpuf-add-repeat', function() {
+                                var $instance = $(this).closest('.wpuf-repeat-instance');
+                                var instanceIndex = $instance.attr('data-instance');
                                 wpuf.addRepeatInstance($container, fieldName, maxRepeats);
                             });
 
                             $container.on('click', '.wpuf-remove-repeat', function() {
-                                wpuf.removeRepeatInstance($(this).closest('.wpuf-repeat-instance'), $container);
+                                var $instance = $(this).closest('.wpuf-repeat-instance');
+                                var instanceIndex = $instance.attr('data-instance');
+                                wpuf.removeRepeatInstance($instance, $container);
                             });
                         });
                     },
@@ -576,6 +582,7 @@ public function scripts_styles() {
                         var $instances = $container.find('.wpuf-repeat-instance');
                         var currentInstances = $instances.length;
 
+
                         if (maxRepeats !== -1 && currentInstances >= maxRepeats) {
                             return;
                         }
@@ -623,14 +630,27 @@ public function scripts_styles() {
                         wpuf.reindexInstances($container, fieldName);
                         wpuf.updateRepeatButtons($container);
 
+                        // Set up MutationObserver for new buttons
+                        if (window.MutationObserver && typeof observer !== 'undefined') {
+                            $newInstance.find('.wpuf-add-repeat, .wpuf-remove-repeat').each(function() {
+                                observer.observe(this, { attributes: true, attributeFilter: ['style', 'class'] });
+                            });
+                        }
+
                         // Initialize fields in the new instance
                         if (typeof WPUF_Field_Initializer !== 'undefined') {
                             WPUF_Field_Initializer.init();
+
+                            // Re-apply button visibility after field initializer runs on new instance
+                            setTimeout(function() {
+                                wpuf.updateRepeatButtons($container);
+                            }, 100);
                         }
                     },
 
                     removeRepeatInstance: function($instance, $container) {
                         var fieldName = $container.data('field-name');
+                        var instanceIndex = $instance.attr('data-instance');
                         $instance.remove();
                         wpuf.reindexInstances($container, fieldName);
                         wpuf.updateRepeatButtons($container);
@@ -639,6 +659,7 @@ public function scripts_styles() {
                     reindexInstances: function($container, fieldName) {
                         $container.find('.wpuf-repeat-instance').each(function(index) {
                             var $instance = $(this);
+                            var oldIndex = $instance.attr('data-instance');
                             $instance.attr('data-instance', index);
 
                             $instance.find('[name], [id], [for]').each(function() {
@@ -669,29 +690,109 @@ public function scripts_styles() {
                         var $instances = $container.find('.wpuf-repeat-instance');
                         var count = $instances.length;
 
+
+                        // Prevent rapid successive calls
+                        if ($container.data('updating-buttons')) {
+                            return;
+                        }
+                        $container.data('updating-buttons', true);
+
+
                         $instances.each(function(i) {
-                            var $controls = $(this).find('.wpuf-repeat-controls');
+                            var $instance = $(this);
+                            var $controls = $instance.find('.wpuf-repeat-controls');
                             var isLast = i === count - 1;
-                            var isOnlyOne = count === 1;
-                            
-                            // Show add button only on the last instance
-                            $controls.find('.wpuf-add-repeat').toggle(isLast);
-                            
-                            // Show remove button on all instances except when there's only one instance
-                            $controls.find('.wpuf-remove-repeat').toggle(!isOnlyOne);
+                            var isOnlyInstance = count === 1;
+
+                            // Clear existing buttons first
+                            $controls.empty();
+
+                            // Create and add buttons based on logic
+                            var addButtonHtml = '<button type="button" class="wpuf-add-repeat button" data-instance="' + i + '">+</button>';
+                            var removeButtonHtml = '<button type="button" class="wpuf-remove-repeat button" data-instance="' + i + '">-</button>';
+
+                            // Add button: show only on last instance
+                            if (isLast) {
+                                $controls.append(addButtonHtml);
+                            }
+
+                            // Remove button: show on all instances EXCEPT when there's only 1 instance
+                            if (!isOnlyInstance) {
+                                $controls.append(removeButtonHtml);
+                            }
                         });
+
+                        // Clear the flag after a short delay
+                        setTimeout(function() {
+                            $container.removeData('updating-buttons');
+                        }, 100);
+
                     }
                 };
 
                 wpuf.init();
 
+                // Set up MutationObserver to watch for button visibility changes
+                if (window.MutationObserver) {
+                    var observer = new MutationObserver(function(mutations) {
+                        var shouldUpdate = false;
+                        mutations.forEach(function(mutation) {
+                            if (mutation.type === 'attributes' &&
+                                (mutation.attributeName === 'style' || mutation.attributeName === 'class')) {
+                                var $target = $(mutation.target);
+                                if ($target.hasClass('wpuf-add-repeat') || $target.hasClass('wpuf-remove-repeat')) {
+                                    shouldUpdate = true;
+                                }
+                            }
+                        });
+
+                        if (shouldUpdate) {
+                            setTimeout(function() {
+                                $('.wpuf-repeat-container').each(function() {
+                                    var $container = $(this);
+                                    wpuf.updateRepeatButtons($container);
+                                });
+                            }, 50);
+                        }
+                    });
+
+                    // Start observing
+                    $('.wpuf-repeat-container').each(function() {
+                        var $container = $(this);
+                        $container.find('.wpuf-add-repeat, .wpuf-remove-repeat').each(function() {
+                            observer.observe(this, { attributes: true, attributeFilter: ['style', 'class'] });
+                        });
+                    });
+                }
+
                 // Initialize fields after the form is rendered with a delay to ensure DOM is ready
                 setTimeout(function() {
+                    // First, render all repeat field buttons
+                    $('.wpuf-repeat-container').each(function() {
+                        var $container = $(this);
+                        wpuf.updateRepeatButtons($container);
+                    });
+
                     if (typeof WPUF_Field_Initializer !== 'undefined') {
                         WPUF_Field_Initializer.init();
                     } else {
-                        // console.log('WPUF_Field_Initializer is not defined');
+                        // Re-apply button visibility after field initializer runs
+                        setTimeout(function() {
+                            $('.wpuf-repeat-container').each(function() {
+                                var $container = $(this);
+                                wpuf.updateRepeatButtons($container);
+                            });
+                        }, 100);
+
+                        // Also re-apply after a longer delay to catch any async field initialization
+                        setTimeout(function() {
+                            $('.wpuf-repeat-container').each(function() {
+                                var $container = $(this);
+                                wpuf.updateRepeatButtons($container);
+                            });
+                        }, 1000);
                     }
+
                 }, 500);
             });
 
diff --git a/wpuf-functions.php b/wpuf-functions.php
index a4d55bcd0..82f282ffb 100644
--- a/wpuf-functions.php
+++ b/wpuf-functions.php
@@ -1854,37 +1854,12 @@ function wpuf_get_form_fields( $form_id ) {
                 $field['multiple'] = '';
             }
 
-            // if old repeat field format
+            // Ensure inner_fields is a simple array (not column structure)
             if ( empty( $field['inner_fields'] ) ) {
-                $old_id            = $field['id'];
-                $old_meta          = $field['name'];
-                $old_label         = $field['label'];
-                $new_id            = wpuf_form_field_id_generator();
-                $field['template'] = 'text_field';
-
-                // set the new compatible values
-                $field['id']                       = $new_id;
-                $field['name']                     = $old_meta . '_' . $new_id;
-                $field['label']                    = '';
-                $field['inner_fields']['column-1'] = [ $field ];
-                $field['inner_fields']['column-2'] = [];
-                $field['inner_fields']['column-3'] = [];
-                $field['template']                 = 'repeat_field';
-                $field['columns']                  = 1;
-                $field['min_column']               = 1;
-                $field['max_column']               = 3;
-                $field['column_space']             = 5;
-
-                $field['id']    = $old_id;
-                $field['label'] = $old_label;
-                $field['name']  = $old_meta;
-            }
-
-            // if old repeat field format
-            if ( empty( $field['inner_columns_size'] ) ) {
-                $field['inner_columns_size']['column-1'] = '100%';
-                $field['inner_columns_size']['column-2'] = '100%';
-                $field['inner_columns_size']['column-3'] = '100%';
+                $field['inner_fields'] = [];
+            } elseif ( isset( $field['inner_fields']['column-1'] ) ) {
+                // Convert column structure to simple array
+                $field['inner_fields'] = $field['inner_fields']['column-1'];
             }
         }