diff --git a/admin/form-builder/assets/js/components/field-options/index.js b/admin/form-builder/assets/js/components/field-options/index.js
index 85f65fcaf..84bf6acf3 100644
--- a/admin/form-builder/assets/js/components/field-options/index.js
+++ b/admin/form-builder/assets/js/components/field-options/index.js
@@ -33,8 +33,8 @@ Vue.component('field-options', {
                     return self.$store.state.form_fields[i];
                 }
 
-                // check if the editing field belong to column field
-                if (self.$store.state.form_fields[i].template === 'column_field') {
+                // check if the editing field belong to column field or repeat field
+                if (self.$store.state.form_fields[i].template.match(/^(column|repeat)_field$/)) {
                     var innerColumnFields = self.$store.state.form_fields[i].inner_fields;
 
                     for (const columnFields in innerColumnFields) {
diff --git a/admin/form-builder/assets/js/components/form-column_field/index.js b/admin/form-builder/assets/js/components/form-column_field/index.js
index c1adddbb8..6c17f423e 100644
--- a/admin/form-builder/assets/js/components/form-column_field/index.js
+++ b/admin/form-builder/assets/js/components/form-column_field/index.js
@@ -162,7 +162,8 @@ Vue.component('form-column_field', {
             return ( field.recaptcha_type && 'invisible_recaptcha' === field.recaptcha_type ) ? true : false;
         },
 
-        isAllowedInClolumnField: function(field_template) {
+
+        isAllowedInColumnField: function(field_template) {
             var restrictedFields = ['column_field', 'custom_hidden_field', 'step_start'];
 
             if ( $.inArray(field_template, restrictedFields) >= 0 ) {
@@ -180,7 +181,7 @@ Vue.component('form-column_field', {
                 toWhichColumn: data.to_column
             };
 
-            if (this.isAllowedInClolumnField(data.field_template)) {
+            if (this.isAllowedInColumnField(data.field_template)) {
                 Swal.fire({
                     title: "Oops...",
                     text: "You cannot add this field as inner column field"
diff --git a/admin/form-builder/assets/js/form-builder.js b/admin/form-builder/assets/js/form-builder.js
index 8349eb77a..4d89d5437 100644
--- a/admin/form-builder/assets/js/form-builder.js
+++ b/admin/form-builder/assets/js/form-builder.js
@@ -129,8 +129,8 @@
 
                     }
 
-                    // check if the editing field belong to a column field
-                    if (state.form_fields[i].template === 'column_field') {
+                    // check if the editing field belong to a column field or repeat field
+                    if (state.form_fields[i].template.match(/^(column|repeat)_field$/)) {
                         var innerColumnFields = state.form_fields[i].inner_fields;
 
                         for (const columnFields in innerColumnFields) {
@@ -138,6 +138,12 @@
                                 var columnFieldIndex = 0;
 
                                 while (columnFieldIndex < innerColumnFields[columnFields].length) {
+                                    // don't modify existing meta key
+                                    if (payload.field_name === 'name'  && ! innerColumnFields[columnFields][columnFieldIndex].hasOwnProperty('is_new') ) {
+                                        columnFieldIndex++;
+                                        continue;
+                                    }
+
                                     if (innerColumnFields[columnFields][columnFieldIndex].id === parseInt(payload.editing_field_id)) {
                                        innerColumnFields[columnFields][columnFieldIndex][payload.field_name] = payload.value;
                                     }
diff --git a/admin/form-builder/assets/js/mixins/global.js b/admin/form-builder/assets/js/mixins/global.js
index 60ecffd03..9efcfc1b7 100644
--- a/admin/form-builder/assets/js/mixins/global.js
+++ b/admin/form-builder/assets/js/mixins/global.js
@@ -58,8 +58,8 @@ Vue.mixin({
                     return true;
                 }
 
-                // check if the single instance field exist in column fields
-                if (self.$store.state.form_fields[i].template === 'column_field') {
+                // check if the single instance field exist in column fields or repeat field
+                if (self.$store.state.form_fields[i].template.match(/^(column|repeat)_field$/)) {
                     var innerColumnFields = self.$store.state.form_fields[i].inner_fields;
 
                     for (const columnFields in innerColumnFields) {
diff --git a/assets/css/admin.css b/assets/css/admin.css
index 5007b5d0d..0112f7f1a 100644
--- a/assets/css/admin.css
+++ b/assets/css/admin.css
@@ -645,7 +645,8 @@ ul.wpuf-form .wpuf-field-columns .wpuf-column-field-inner-columns .wpuf-column .
   margin: 0;
   padding: 15px 0;
 }
-#form-preview-stage .field-items .wpuf-field-columns + div.control-buttons {
+#form-preview-stage .field-items .wpuf-field-columns + div.control-buttons,
+#form-preview-stage .field-items .wpuf-repeat-field + div.control-buttons {
   top: 10px;
   z-index: 10;
   height: auto;
diff --git a/assets/css/frontend-forms.css b/assets/css/frontend-forms.css
index 6d14755f2..81cfc2e03 100644
--- a/assets/css/frontend-forms.css
+++ b/assets/css/frontend-forms.css
@@ -504,24 +504,29 @@ body ul.wpuf-form li .wpuf-fields .wpuf-fields-list.wpuf-list-inline li {
   padding-left: 5px;
   padding-right: 5px;
 }
-body ul.wpuf-form li .wpuf-fields table.wpuf-repeatable-field {
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field {
   border-collapse: collapse;
 }
-body ul.wpuf-form li .wpuf-fields table.wpuf-repeatable-field * {
-  box-sizing: border-box;
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field.wpuf-field-columns {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
-body ul.wpuf-form li .wpuf-fields table.wpuf-repeatable-field input {
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field .wpuf-column-field-inner-columns {
   width: 100%;
 }
-body ul.wpuf-form li .wpuf-fields table.wpuf-repeatable-field .wpuf-repeater-buttons {
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field * {
+  box-sizing: border-box;
+}
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field .wpuf-repeater-buttons {
   width: 75px;
   padding-left: 12px;
 }
-body ul.wpuf-form li .wpuf-fields table.wpuf-repeatable-field .wpuf-repeater-buttons img {
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field .wpuf-repeater-buttons img {
   width: 100%;
   height: auto;
 }
-body ul.wpuf-form li .wpuf-fields table.wpuf-repeatable-field .wpuf-repeater-buttons i {
+body ul.wpuf-form li .wpuf-fields .wpuf-repeatable-field .wpuf-repeater-buttons i {
   display: inline-block;
   width: 15px;
   height: 15px;
@@ -1755,7 +1760,6 @@ body ul.wpuf-form .wpuf-field-columns .wpuf-column-field-inner-columns .wpuf-col
   border: 0;
   float: none;
   width: 100%;
-  overflow: hidden;
 }
 body ul.wpuf-form .wpuf-field-columns .wpuf-column-field-inner-columns .wpuf-column .wpuf-column-inner-fields {
   padding: 0 5px 0 0;
diff --git a/assets/js/frontend-form.js b/assets/js/frontend-form.js
index 32c6948e1..6a8b3aa25 100644
--- a/assets/js/frontend-form.js
+++ b/assets/js/frontend-form.js
@@ -18,12 +18,15 @@
             //enable multistep
             this.enableMultistep(this);
 
+            var form = $('.wpuf-form');
             // clone and remove repeated field
-            $('.wpuf-form').on('click', 'img.wpuf-clone-field', this.cloneField);
-            $('.wpuf-form').on('click', 'img.wpuf-remove-field', this.removeField);
-            $('.wpuf-form').on('click', 'a.wpuf-delete-avatar', this.deleteAvatar);
-            $('.wpuf-form').on('click', 'a#wpuf-post-draft', this.draftPost);
-            $('.wpuf-form').on('click', 'button#wpuf-account-update-profile', this.account_update_profile);
+            form.on('click', 'img.wpuf-clone-field', this.cloneField);
+            form.on('click', 'img.wpuf-clone-repeat-field', this.cloneRepeatField);
+            form.on('click', 'img.wpuf-remove-field', this.removeField);
+            form.on('click', 'img.wpuf-remove-repeat-field', this.removeRepeatField);
+            form.on('click', 'a.wpuf-delete-avatar', this.deleteAvatar);
+            form.on('click', 'a#wpuf-post-draft', this.draftPost);
+            form.on('click', 'button#wpuf-account-update-profile', this.account_update_profile);
 
             $('.wpuf-form-add').on('submit', this.formSubmit);
             $('form#post').on('submit', this.adminPostSubmit);
@@ -342,6 +345,71 @@
             }
         },
 
+        cloneRepeatField: function( e ) {
+            e.preventDefault();
+
+            var div = $( this ).closest( '.wpuf-column-field-inner-columns.column-repeat' );
+            var clone = div.clone();
+
+            // clear the inputs
+            clone.find( 'input:not(:checkbox):not(:radio)' ).val( '' );
+            clone.find( 'textarea' ).val( '' );
+            clone.find( ':checked' ).prop( 'checked', false );
+            div.after( clone );
+
+            WP_User_Frontend.calculateFieldsName( $( this ).parents( '.wpuf-field-columns' ) );
+            WP_User_Frontend.setRowNumber( $( this ).closest( '.wpuf-field-columns' ) );
+        },
+
+        removeRepeatField: function () {
+            //check if it's the only item
+            var parent = $( this ).closest( '.wpuf-column-field-inner-columns.column-repeat' );
+            var allItems = parent.siblings().addBack();
+            var itemsLength = allItems.length;
+
+            var fieldIndex = $( allItems ).index( $( this ).closest( '.wpuf-column-field-inner-columns.column-repeat' ) );
+
+            if ( itemsLength > 1 ) {
+                WP_User_Frontend.setRowNumber( $( parent ).closest( '.wpuf-field-columns' ), itemsLength - 1 );
+                parent.remove();
+            }
+
+            // calculate only if the removed item is not the last item
+            if ( fieldIndex + 1 !== itemsLength ) {
+                WP_User_Frontend.calculateFieldsName( parent );
+            }
+        },
+
+        setRowNumber: function ( parent, length ) {
+            if ( ! length ) {
+                length = $( parent ).children().length;
+            }
+
+            $( parent ).parent( '.wpuf-fields' ).find( 'input.repeat_row_numbers' ).val( length );
+        },
+
+        calculateFieldsName: function( parentItem ) {
+            var field_rows = parentItem.children();
+            var field_names = [];
+            var field_ids = [];
+            var field_classes = [];
+            var fields_selector = '.wpuf-column input, .wpuf-column textarea, .wpuf-column select, .wpuf-column .wpuf-rich-validation';
+
+            $( field_rows[0] ).find( fields_selector ).each( function ( i, item ) {
+                field_names.push( $( item ).attr( 'name' ).split( '_0_' ) );
+                field_ids.push( $( item ).attr( 'id' ).split( '_0_' ) );
+                field_classes.push( $( item ).attr( 'class' ).split( '_0_' ) );
+            });
+
+            field_rows.each( function( i, row ) {
+                $( row ).find( fields_selector ).each( function( y, field ) {
+                    $( field ).attr( 'name', field_names[y][0] + '_' + i + '_' + field_names[y][1] );
+                    $( field ).attr( 'id', field_ids[y][0] + '_' + i + '_' + field_ids[y][1] );
+                    $( field ).attr( 'class', field_classes[y][0] + '_' + i + '_' + field_classes[y][1] );
+                });
+            });
+        },
+
         adminPostSubmit: function(e) {
             e.preventDefault();
 
diff --git a/assets/js/wpuf-form-builder-components.js b/assets/js/wpuf-form-builder-components.js
index 6d0eb5d92..ec01451b1 100644
--- a/assets/js/wpuf-form-builder-components.js
+++ b/assets/js/wpuf-form-builder-components.js
@@ -451,8 +451,8 @@ Vue.component('field-options', {
                     return self.$store.state.form_fields[i];
                 }
 
-                // check if the editing field belong to column field
-                if (self.$store.state.form_fields[i].template === 'column_field') {
+                // check if the editing field belong to column field or repeat field
+                if (self.$store.state.form_fields[i].template.match(/^(column|repeat)_field$/)) {
                     var innerColumnFields = self.$store.state.form_fields[i].inner_fields;
 
                     for (const columnFields in innerColumnFields) {
@@ -929,7 +929,8 @@ Vue.component('form-column_field', {
             return ( field.recaptcha_type && 'invisible_recaptcha' === field.recaptcha_type ) ? true : false;
         },
 
-        isAllowedInClolumnField: function(field_template) {
+
+        isAllowedInColumnField: function(field_template) {
             var restrictedFields = ['column_field', 'custom_hidden_field', 'step_start'];
 
             if ( $.inArray(field_template, restrictedFields) >= 0 ) {
@@ -947,7 +948,7 @@ Vue.component('form-column_field', {
                 toWhichColumn: data.to_column
             };
 
-            if (this.isAllowedInClolumnField(data.field_template)) {
+            if (this.isAllowedInColumnField(data.field_template)) {
                 Swal.fire({
                     title: "Oops...",
                     text: "You cannot add this field as inner column field"
diff --git a/assets/js/wpuf-form-builder-mixins.js b/assets/js/wpuf-form-builder-mixins.js
index ef8d9bbee..1e39b4efd 100644
--- a/assets/js/wpuf-form-builder-mixins.js
+++ b/assets/js/wpuf-form-builder-mixins.js
@@ -165,8 +165,8 @@ Vue.mixin({
                     return true;
                 }
 
-                // check if the single instance field exist in column fields
-                if (self.$store.state.form_fields[i].template === 'column_field') {
+                // check if the single instance field exist in column fields or repeat field
+                if (self.$store.state.form_fields[i].template.match(/^(column|repeat)_field$/)) {
                     var innerColumnFields = self.$store.state.form_fields[i].inner_fields;
 
                     for (const columnFields in innerColumnFields) {
diff --git a/assets/js/wpuf-form-builder-wpuf-forms.js b/assets/js/wpuf-form-builder-wpuf-forms.js
index 1bcfa3312..d6aa476be 100644
--- a/assets/js/wpuf-form-builder-wpuf-forms.js
+++ b/assets/js/wpuf-form-builder-wpuf-forms.js
@@ -28,7 +28,7 @@
                     }
 
                     // check in column field
-                    if (form_field.template === 'column_field' ) {
+                    if (form_field.template.match(/^(column|repeat)_field$/)) {
                         var innerColumnFields = form_field.inner_fields;
 
                         for (const columnFields in innerColumnFields) {
diff --git a/assets/js/wpuf-form-builder.js b/assets/js/wpuf-form-builder.js
index 8349eb77a..4d89d5437 100644
--- a/assets/js/wpuf-form-builder.js
+++ b/assets/js/wpuf-form-builder.js
@@ -129,8 +129,8 @@
 
                     }
 
-                    // check if the editing field belong to a column field
-                    if (state.form_fields[i].template === 'column_field') {
+                    // check if the editing field belong to a column field or repeat field
+                    if (state.form_fields[i].template.match(/^(column|repeat)_field$/)) {
                         var innerColumnFields = state.form_fields[i].inner_fields;
 
                         for (const columnFields in innerColumnFields) {
@@ -138,6 +138,12 @@
                                 var columnFieldIndex = 0;
 
                                 while (columnFieldIndex < innerColumnFields[columnFields].length) {
+                                    // don't modify existing meta key
+                                    if (payload.field_name === 'name'  && ! innerColumnFields[columnFields][columnFieldIndex].hasOwnProperty('is_new') ) {
+                                        columnFieldIndex++;
+                                        continue;
+                                    }
+
                                     if (innerColumnFields[columnFields][columnFieldIndex].id === parseInt(payload.editing_field_id)) {
                                        innerColumnFields[columnFields][columnFieldIndex][payload.field_name] = payload.value;
                                     }
diff --git a/assets/less/admin.less b/assets/less/admin.less
index 99485b3a5..92cd29023 100644
--- a/assets/less/admin.less
+++ b/assets/less/admin.less
@@ -839,7 +839,8 @@ ul.wpuf-form{
     }
 }
 
-#form-preview-stage .field-items .wpuf-field-columns + div.control-buttons{
+#form-preview-stage .field-items .wpuf-field-columns + div.control-buttons,
+#form-preview-stage .field-items .wpuf-repeat-field + div.control-buttons{
     top: 10px;
     z-index: 10;
     height: auto;
diff --git a/assets/less/frontend-forms.less b/assets/less/frontend-forms.less
index 06f637d1e..3bd5544a1 100644
--- a/assets/less/frontend-forms.less
+++ b/assets/less/frontend-forms.less
@@ -562,17 +562,23 @@ ul.wpuf-form {
                 }
             }
 
-            table.wpuf-repeatable-field {
+            .wpuf-repeatable-field {
                 border-collapse: collapse;
 
-                & * {
-                    box-sizing: border-box;
+                &.wpuf-field-columns {
+                    display: flex;
+                    justify-content: space-between;
+                    align-items: center;
                 }
 
-                input {
+                .wpuf-column-field-inner-columns {
                     width: 100%;
                 }
 
+                & * {
+                    box-sizing: border-box;
+                }
+
                 .wpuf-repeater-buttons {
                     width: 75px;
                     padding-left: 12px;
@@ -2033,7 +2039,6 @@ ul.wpuf-form{
                 border: 0;
                 float: none;
                 width: 100%;
-                overflow: hidden;
 
                 .wpuf-column-inner-fields{
                     padding: 0 5px 0 0;
diff --git a/includes/Ajax/Admin_Form_Builder_Ajax.php b/includes/Ajax/Admin_Form_Builder_Ajax.php
index 7b56c180c..78b983c2f 100644
--- a/includes/Ajax/Admin_Form_Builder_Ajax.php
+++ b/includes/Ajax/Admin_Form_Builder_Ajax.php
@@ -50,7 +50,6 @@ public function save_form() {
             $integrations = (array) json_decode( $post_data['integrations'] );
         }
 
-
         $form_fields   = json_decode( $form_fields, true );
         $notifications = json_decode( $notifications, true );
 
diff --git a/includes/Ajax/Frontend_Form_Ajax.php b/includes/Ajax/Frontend_Form_Ajax.php
index 630617651..d70d309e4 100644
--- a/includes/Ajax/Frontend_Form_Ajax.php
+++ b/includes/Ajax/Frontend_Form_Ajax.php
@@ -294,44 +294,516 @@ public function submit_post() {
             $this->wpuf_user_subscription_pack( $this->form_settings, $post_id );
             // set the post form_id for later usage
             update_post_meta( $post_id, self::$config_id, $form_id );
-
             // save post formats if have any
             if ( isset( $this->form_settings['post_format'] ) && $this->form_settings['post_format'] !== '0' ) {
                 if ( post_type_supports( $this->form_settings['post_type'], 'post-formats' ) ) {
                     set_post_format( $post_id, $this->form_settings['post_format'] );
                 }
             }
-
             // find our if any images in post content and associate them
             if ( ! empty( $postarr['post_content'] ) ) {
                 $dom = new DOMDocument();
                 @$dom->loadHTML( $postarr['post_content'] );
                 $images = $dom->getElementsByTagName( 'img' );
-
                 if ( $images->length ) {
                     foreach ( $images as $img ) {
-                        $url           = $img->getAttribute( 'src' );
-                        $url           = str_replace( [ '"', "'", '\\' ], '', $url );
+                        $url = $img->getAttribute( 'src' );
+                        $url = str_replace( [ '"', "'", '\\' ], '', $url );
                         $attachment_id = wpuf_get_attachment_id_from_url( $url );
-
                         if ( $attachment_id ) {
                             wpuf_associate_attachment( $attachment_id, $post_id );
                         }
                     }
                 }
             }
-
             if ( ! empty( $taxonomy_vars ) ) {
                 $this->set_custom_taxonomy( $post_id, $taxonomy_vars );
             } else {
                 $this->set_default_taxonomy( $post_id );
             }
-
-            $response = $this->send_mail_for_guest( $charging_enabled, $post_id, $form_id, $is_update, $post_author, $meta_vars );
+            $response = $this->send_mail_for_guest(
+                $charging_enabled, $post_id, $form_id, $is_update, $post_author, $meta_vars
+            );
             wpuf_clear_buffer();
             wp_send_json( $response );
         }
-        wpuf()->ajax->send_error( __( 'Something went wrong', 'wp-user-frontend' ) );
+        $this->send_error( __( 'Something went wrong', 'wp-user-frontend' ) );
+    }
+
+    public function wpuf_get_post_user() {
+        $nonce = isset( $_REQUEST['_wpnonce'] ) ? sanitize_key( wp_unslash( $_REQUEST['_wpnonce'] ) ) : '';
+
+        if ( isset( $nonce ) && ! wp_verify_nonce( $nonce, 'wpuf_form_add' ) ) {
+            return;
+        }
+
+        $default_post_author = wpuf_get_option( 'default_post_owner', 'wpuf_frontend_posting', 1 );
+
+        if ( ! is_user_logged_in() ) {
+            if ( isset( $this->form_settings['guest_post'] ) && $this->form_settings['guest_post'] === 'true' && $this->form_settings['guest_details'] === 'true' ) {
+                $guest_name = isset( $_POST['guest_name'] ) ? sanitize_text_field( wp_unslash( $_POST['guest_name'] ) ) : '';
+
+                $guest_email = isset( $_POST['guest_email'] ) ? sanitize_email( wp_unslash( $_POST['guest_email'] ) ) : '';
+                $page_id = isset( $_POST['page_id'] ) ? sanitize_text_field( wp_unslash( $_POST['page_id'] ) ) : '';
+
+                // is valid email?
+                if ( ! is_email( $guest_email ) ) {
+                    $this->send_error( __( 'Invalid email address.', 'wp-user-frontend' ) );
+                }
+
+                // check if the user email already exists
+                $user = get_user_by( 'email', $guest_email );
+
+                if ( $user ) {
+                    // $post_author = $user->ID;
+                    wp_send_json(
+                        [
+                            'success'     => false,
+                            'error'       => __( "You already have an account in our site. Please login to continue.\n\nClicking 'OK' will redirect you to the login page and you will lose the form data.\nClick 'Cancel' to stay at this page.", 'wp-user-frontend' ),
+                            'type'        => 'login',
+                            'redirect_to' => wp_login_url( get_permalink( $page_id ) ),
+                        ]
+                    );
+                } else {
+
+                    // user not found, lets register him
+                    // username from email address
+                    $username = $this->guess_username( $guest_email );
+
+                    $user_pass = wp_generate_password( 12, false );
+
+                    $errors = new WP_Error();
+
+                    do_action( 'register_post', $username, $guest_email, $errors );
+
+                    $user_id = wp_create_user( $username, $user_pass, $guest_email );
+
+                    // if its a success and no errors found
+
+                    if ( $user_id && ! is_wp_error( $user_id ) ) {
+                        update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
+
+                        if ( class_exists( 'Theme_My_Login_Custom_Email' ) ) {
+                            do_action( 'tml_new_user_registered', $user_id, $user_pass );
+                        } else {
+                            wp_send_new_user_notifications( $user_id );
+                        }
+
+                        // update display name to full name
+                        wp_update_user(
+                            [
+                                'ID' => $user_id,
+                                'display_name' => $guest_name,
+                            ]
+                        );
+
+                        $post_author = $user_id;
+                    } else {
+                        //something went wrong creating the user, set post author to the default author
+                        $post_author = $default_post_author;
+                    }
+                }
+
+                // guest post is enabled and details are off
+            } elseif ( isset( $this->form_settings['guest_post'] ) && $this->form_settings['guest_post'] === 'true' && $this->form_settings['guest_details'] === 'false' ) {
+                $post_author = $default_post_author;
+            } elseif ( isset( $this->form_settings['guest_post'] ) && $this->form_settings['guest_post'] !== 'true' ) {
+                $this->send_error( $this->form_settings['message_restrict'] );
+            }
+
+            // the user must be logged in already
+        } elseif ( isset( $this->form_settings['role_base'] ) && $this->form_settings['role_base'] === 'true' && ! wpuf_user_has_roles( $this->form_settings['roles'] ) ) {
+                $this->send_error( __( 'You do not have sufficient permissions to access this form.', 'wp-user-frontend' ) );
+        } else {
+            $post_author = get_current_user_id();
+        }
+
+        return $post_author;
+    }
+
+    /**
+     * Add post shortcode handler
+     *
+     * @param array $atts
+     * @return string
+    */
+
+    public function add_post_shortcode( $atts ) {
+        add_filter( 'wpuf-form-fields', [ $this, 'add_field_settings' ] );
+
+        // @codingStandardsIgnoreStart
+        extract( shortcode_atts( [ 'id' => 0 ], $atts ) );
+
+        // @codingStandardsIgnoreEnd
+        ob_start();
+        $form                         = new WPUF_Form( $id );
+        $this->form_fields            = $form->get_fields();
+        $this->form_settings          = $form->get_settings();
+        $this->generate_auth_link(); // Translate tag %login% %registration% to login registartion url
+	    [ $user_can_post, $info ] = $form->is_submission_open( $form, $this->form_settings );
+        $info                         = apply_filters( 'wpuf_addpost_notice', $info, $id, $this->form_settings );
+        $user_can_post                = apply_filters( 'wpuf_can_post', $user_can_post, $id, $this->form_settings );
+
+        if ( $user_can_post === 'yes' ) {
+            $this->render_form( $id, null, $atts, $form );
+        } else {
+            echo wp_kses_post( '<div class="wpuf-info">' . $info . '</div>' );
+        }
+        $content = ob_get_contents();
+        ob_end_clean();
+
+        return $content;
+    }
+
+    public static function update_post_meta( $meta_vars, $post_id ) {
+        // check_ajax_referer( 'wpuf_form_add' );
+        // prepare the meta vars
+	    [ $meta_key_value, $multi_repeated, $files ] = self::prepare_meta_fields( $meta_vars );
+        // set featured image if there's any
+
+        // @codingStandardsIgnoreStart
+        $wpuf_files = isset( $_POST['wpuf_files'] ) ? $_POST['wpuf_files'] : [];
+
+        if ( isset( $wpuf_files['featured_image'] ) ) {
+            $attachment_id = $wpuf_files['featured_image'][0];
+
+            wpuf_associate_attachment( $attachment_id, $post_id );
+            set_post_thumbnail( $post_id, $attachment_id );
+
+            $file_data = isset( $_POST['wpuf_files_data'][ $attachment_id ] ) ? $_POST['wpuf_files_data'][ $attachment_id ] : false;
+
+        // @codingStandardsIgnoreEnd
+            if ( $file_data ) {
+                $args = [
+                    'ID'           => $attachment_id,
+                    'post_title'   => $file_data['title'],
+                    'post_content' => $file_data['desc'],
+                    'post_excerpt' => $file_data['caption'],
+                ];
+                wpuf_update_post( $args );
+
+                update_post_meta( $attachment_id, '_wp_attachment_image_alt', $file_data['title'] );
+            }
+        }
+
+
+        if ( ! empty( $multi_repeated ) ) {
+            $fields_meta = ! empty( $multi_repeated['sub_fields'] ) ? $multi_repeated['sub_fields'] : [];
+            $parent      = ! empty( $multi_repeated['parent'] ) ? $multi_repeated['parent'] : '';
+
+            if ( ! empty( $parent ) && ! empty( $fields_meta ) ) {
+                // get how many rows previously saved
+                $row_num = get_post_meta( $post_id, $parent, true );
+
+                // delete previous repeat values
+                foreach ( $fields_meta as $sub_field ) {
+                    for ( $i = 0; $i < $row_num; $i++ ) {
+                        $tmp_meta = $parent . '_' . $i . '_' . $sub_field;
+                        delete_post_meta( $post_id, $tmp_meta );
+                        delete_post_meta( $post_id, '_' . $tmp_meta );
+                    }
+                }
+
+                $row_number = ! empty( $multi_repeated['row_number'] ) ? $multi_repeated['row_number'] : 0;
+                $sub_fields = ! empty( $multi_repeated['fields'] ) ? $multi_repeated['fields'] : [];
+
+                // save new data
+                for ( $i = 0; $i < $row_number; $i++ ) {
+                    foreach ( $sub_fields as $key => $value ) {
+                        update_post_meta( $post_id, $key, $value );
+                        update_post_meta( $post_id, '_' . $key, uniqid( 'field_' ) );
+                    }
+                }
+
+                update_post_meta( $post_id, $parent, $row_number );
+            }
+        }
+
+        // save all custom fields
+        foreach ( $meta_key_value as $meta_key => $meta_value ) {
+            update_post_meta( $post_id, $meta_key, $meta_value );
+        }
+
+        // save any files attached
+        foreach ( $files as $file_input ) {
+            // delete any previous value
+            delete_post_meta( $post_id, $file_input['name'] );
+
+            $image_ids = '';
+
+            if ( count( $file_input['value'] ) > 1 ) {
+                $image_ids = $file_input['value'];
+            }
+
+            if ( count( $file_input['value'] ) === 1 ) {
+                $image_ids = $file_input['value'][0];
+            }
+
+            if ( ! empty( $image_ids ) ) {
+                add_post_meta( $post_id, $file_input['name'], $image_ids );
+            }
+
+            //to track how many files are being uploaded
+            $file_numbers = 0;
+
+            foreach ( $file_input['value'] as $attachment_id ) {
+
+                //if file numbers are greated than allowed number, prevent it from being uploaded
+                if ( $file_numbers >= $file_input['count'] ) {
+                    wp_delete_attachment( $attachment_id );
+                    continue;
+                }
+
+                wpuf_associate_attachment( $attachment_id, $post_id );
+                //add_post_meta( $post_id, $file_input['name'], $attachment_id );
+
+                // file title, caption, desc update
+
+                // @codingStandardsIgnoreStart
+                $file_data = isset( $_POST['wpuf_files_data'][ $attachment_id ] ) ? wp_unslash( $_POST['wpuf_files_data'][ $attachment_id ] ) : false;
+
+                // @codingStandardsIgnoreEnd
+                if ( $file_data ) {
+                    $args = [
+                        'ID'           => $attachment_id,
+                        'post_title'   => $file_data['title'],
+                        'post_content' => $file_data['desc'],
+                        'post_excerpt' => $file_data['caption'],
+                    ];
+                    wpuf_update_post( $args );
+
+                    update_post_meta( $attachment_id, '_wp_attachment_image_alt', $file_data['title'] );
+                }
+                $file_numbers++;
+            }
+        }
+    }
+
+    public function prepare_mail_body( $content, $user_id, $post_id ) {
+        $user = get_user_by( 'id', $user_id );
+        $post = get_post( $post_id );
+
+        $post_field_search = [
+            '%post_title%',
+            '%post_content%',
+            '%post_excerpt%',
+            '%tags%',
+            '%category%',
+            '%author%',
+            '%author_email%',
+            '%author_bio%',
+            '%sitename%',
+            '%siteurl%',
+            '%permalink%',
+            '%editlink%',
+        ];
+
+        $home_url = sprintf( '<a href="%s">%s</a>', home_url(), home_url() );
+        $post_url = sprintf( '<a href="%s">%s</a>', get_permalink( $post_id ), get_permalink( $post_id ) );
+        $post_edit_link = sprintf( '<a href="%s">%s</a>', admin_url( 'post.php?action=edit&post=' . $post_id ), admin_url( 'post.php?action=edit&post=' . $post_id ) );
+
+        $post_field_replace = [
+            $post->post_title,
+            $post->post_content,
+            $post->post_excerpt,
+            get_the_term_list( $post_id, 'post_tag', '', ', ' ),
+            get_the_term_list( $post_id, 'category', '', ', ' ),
+            $user->display_name,
+            $user->user_email,
+            ( $user->description ) ? $user->description : 'not available',
+            get_bloginfo( 'name' ),
+            $home_url,
+            $post_url,
+            $post_edit_link,
+        ];
+
+        if ( class_exists( 'WooCommerce' ) ) {
+            $post_field_search[] = '%product_cat%';
+            $post_field_replace[] = get_the_term_list( $post_id, 'product_cat', '', ', ' );
+        }
+
+        $content = str_replace( $post_field_search, $post_field_replace, $content );
+
+        // custom fields
+        preg_match_all( '/%custom_([\w-]*)\b%/', $content, $matches );
+	    [ $search, $replace ] = $matches;
+
+        if ( $replace ) {
+            foreach ( $replace as $index => $meta_key ) {
+                $value = get_post_meta( $post_id, $meta_key, false );
+
+                if ( isset( $value[0] ) && is_array( $value[0] ) ) {
+                    $new_value = implode( '; ', $value[0] );
+                } else {
+                    $new_value = implode( '; ', $value );
+                }
+
+                $original_value = '';
+                $meta_val       = '';
+
+                if ( count( $value ) > 1 ) {
+                    $is_first = true;
+
+                    foreach ( $value as $val ) {
+                        if ( $is_first ) {
+                            if ( get_post_mime_type( (int) $val ) ) {
+                                $meta_val = wp_get_attachment_url( $val );
+                            } else {
+                                $meta_val = $val;
+                            }
+                            $is_first = false;
+                        } else {
+                            if ( get_post_mime_type( (int) $val ) ) {
+                                $meta_val = $meta_val . ', ' . wp_get_attachment_url( $val );
+                            } else {
+                                $meta_val = $meta_val . ', ' . $val;
+                            }
+                        }
+
+                        if ( get_post_mime_type( (int) $val ) ) {
+                            $meta_val = $meta_val . ',' . wp_get_attachment_url( $val );
+                        } else {
+                            $meta_val = $meta_val . ',' . $val;
+                        }
+                    }
+                    $original_value = $original_value . $meta_val;
+                } else {
+                    if ( 'address_field' === $meta_key ) {
+                        $value     = get_post_meta( $post_id, $meta_key, true );
+                        $new_value = implode( ', ', $value );
+                    }
+
+                    if ( get_post_mime_type( (int) $new_value ) ) {
+                        $original_value = wp_get_attachment_url( $new_value );
+                    } else {
+                        $original_value = $new_value;
+                    }
+                }
+
+                $content = str_replace( $search[ $index ], $original_value, $content );
+            }
+        }
+
+        return $content;
+    }
+
+    public function woo_attribute( $taxonomy ) {
+        check_ajax_referer( 'wpuf_form_add' );
+        $taxonomy_name = isset( $_POST[ $taxonomy['name'] ] ) ? sanitize_text_field( wp_unslash( $_POST[ $taxonomy['name'] ] ) ) : '';
+
+        return [
+            'name'         => $taxonomy['name'],
+            'value'        => $taxonomy_name,
+            'is_visible'   => $taxonomy['woo_attr_vis'] === 'yes' ? 1 : 0,
+            'is_variation' => 0,
+            'is_taxonomy'  => 1,
+        ];
+    }
+
+    /**
+     * Hook to publish verified guest post with payment
+     *
+     * @since 2.5.8
+     */
+    public function publish_guest_post() {
+        $post_msg = isset( $_GET['post_msg'] ) ? sanitize_text_field( wp_unslash( $_GET['post_msg'] ) ) : '';
+        $pid      = isset( $_GET['p_id'] ) ? sanitize_text_field( wp_unslash( $_GET['p_id'] ) ) : '';
+        $fid      = isset( $_GET['f_id'] ) ? sanitize_text_field( wp_unslash( $_GET['f_id'] ) ) : '';
+
+        if ( $post_msg === 'verified' ) {
+            $response       = [];
+            $post_id        = wpuf_decryption( $pid );
+            $form_id        = wpuf_decryption( $fid );
+            $form_settings  = wpuf_get_form_settings( $form_id );
+            $post_author_id = get_post_field( 'post_author', $post_id );
+            $payment_status = new WPUF_Subscription();
+            $form           = new WPUF_Form( $form_id );
+            $pay_per_post   = $form->is_enabled_pay_per_post();
+            $force_pack     = $form->is_enabled_force_pack();
+
+            if ( $form->is_charging_enabled() && $pay_per_post ) {
+                if ( ( $payment_status->get_payment_status( $post_id ) ) === 'pending' ) {
+                    $response['show_message'] = true;
+                    $response['redirect_to']  = add_query_arg(
+                        [
+                            'action'  => 'wpuf_pay',
+                            'type'    => 'post',
+                            'post_id' => $post_id,
+                        ],
+                        get_permalink( wpuf_get_option( 'payment_page', 'wpuf_payment' ) )
+                    );
+
+                    wp_redirect( $response['redirect_to'] );
+                    wpuf_clear_buffer();
+                    wp_send_json( $response );
+                }
+            } else {
+                $p_status = get_post_status( $post_id );
+
+                if ( $p_status ) {
+                    wp_update_post(
+                        [
+                            'ID'          => $post_id,
+                            'post_status' => isset( $form_settings['post_status'] ) ? $form_settings['post_status'] : 'publish',
+                        ]
+                    );
+
+                    echo wp_kses_post( "<div class='wpuf-success' style='text-align:center'>" . __( 'Email successfully verified. Please Login.', 'wp-user-frontend' ) . '</div>' );
+                }
+            }
+        }
+    }
+
+    public function wpuf_user_subscription_pack( $form_settings, $post_id = null ) {
+
+        // if user has a subscription pack
+        $user_wpuf_subscription_pack = get_user_meta( get_current_user_id(), '_wpuf_subscription_pack', true );
+        $wpuf_user               = wpuf_get_user();
+        $user_subscription       = new WPUF_User_Subscription( $wpuf_user );
+        if ( ! empty( $user_wpuf_subscription_pack ) && isset( $user_wpuf_subscription_pack['_enable_post_expiration'] )
+            && isset( $user_wpuf_subscription_pack['expire'] ) && strtotime( $user_wpuf_subscription_pack['expire'] ) >= time() ) {
+            $expire_date = gmdate( 'Y-m-d', strtotime( '+' . $user_wpuf_subscription_pack['_post_expiration_time'] ) );
+            update_post_meta( $post_id, $this->post_expiration_date, $expire_date );
+            // save post status after expiration
+            $expired_post_status = $user_wpuf_subscription_pack['_expired_post_status'];
+            update_post_meta( $post_id, $this->expired_post_status, $expired_post_status );
+            // if mail active
+            if ( isset( $user_wpuf_subscription_pack['_enable_mail_after_expired'] ) && $user_wpuf_subscription_pack['_enable_mail_after_expired'] === 'on' ) {
+                $post_expiration_message = $user_subscription->get_subscription_exp_msg( $user_wpuf_subscription_pack['pack_id'] );
+                update_post_meta( $post_id, $this->post_expiration_message, $post_expiration_message );
+            }
+        } elseif ( ! empty( $user_wpuf_subscription_pack ) && isset( $user_wpuf_subscription_pack['expire'] ) && strtotime( $user_wpuf_subscription_pack['expire'] ) <= time() ) {
+            if ( isset( $form_settings['expiration_settings']['enable_post_expiration'] ) ) {
+                $expire_date = gmdate( 'Y-m-d', strtotime( '+' . $form_settings['expiration_settings']['expiration_time_value'] . ' ' . $form_settings['expiration_settings']['expiration_time_type'] . '' ) );
+
+                update_post_meta( $post_id, $this->post_expiration_date, $expire_date );
+                // save post status after expiration
+                $expired_post_status = $form_settings['expiration_settings']['expired_post_status'];
+                update_post_meta( $post_id, $this->expired_post_status, $expired_post_status );
+                // if mail active
+                if ( isset( $form_settings['expiration_settings']['enable_mail_after_expired'] ) && $form_settings['expiration_settings']['enable_mail_after_expired'] === 'on' ) {
+                    $post_expiration_message = $form_settings['expiration_settings']['post_expiration_message'];
+                    update_post_meta( $post_id, $this->post_expiration_message, $post_expiration_message );
+                }
+            }
+        } elseif ( empty( $user_wpuf_subscription_pack ) || $user_wpuf_subscription_pack === 'Cancel' || $user_wpuf_subscription_pack === 'cancel' ) {
+            if ( isset( $form_settings['expiration_settings']['enable_post_expiration'] ) ) {
+                $expire_date = gmdate( 'Y-m-d', strtotime( '+' . $form_settings['expiration_settings']['expiration_time_value'] . ' ' . $form_settings['expiration_settings']['expiration_time_type'] . '' ) );
+                update_post_meta( $post_id, $this->post_expiration_date, $expire_date );
+                // save post status after expiration
+                $expired_post_status = $form_settings['expiration_settings']['expired_post_status'];
+                update_post_meta( $post_id, $this->expired_post_status, $expired_post_status );
+                // if mail active
+                if ( isset( $form_settings['expiration_settings']['enable_mail_after_expired'] ) && $form_settings['expiration_settings']['enable_mail_after_expired'] === 'on' ) {
+                    $post_expiration_message = $form_settings['expiration_settings']['post_expiration_message'];
+                    update_post_meta( $post_id, $this->post_expiration_message, $post_expiration_message );
+                }
+            }
+        }
+
+        //Handle featured item when edit
+        $sub_meta = $user_subscription->handle_featured_item( $post_id, $user_wpuf_subscription_pack );
+        $user_subscription->update_meta( $sub_meta );
     }
 
     public function send_mail_for_guest( $charging_enabled, $post_id, $form_id, $is_update, $post_author, $meta_vars ) {
diff --git a/includes/Fields/Form_Field_Checkbox.php b/includes/Fields/Form_Field_Checkbox.php
index 948d469a1..9813b9143 100755
--- a/includes/Fields/Form_Field_Checkbox.php
+++ b/includes/Fields/Form_Field_Checkbox.php
@@ -46,6 +46,7 @@ public function render( $field_settings, $form_id, $type = 'post', $post_id = nu
                         <input
                             type="checkbox"
                             class="<?php echo esc_attr( sprintf( 'wpuf_%s_%d', $field_settings['name'], $form_id ) ); ?>"
+                            id="<?php echo esc_attr( $field_settings['name'] ); ?>"
                             name="<?php echo esc_attr( $field_settings['name'] ); ?>[]"
                             value="<?php echo esc_attr( $value ); ?>"<?php echo in_array( $value, $selected ) ? ' checked="checked"' : ''; ?>
                             data-required="<?php echo esc_attr( $field_settings['required'] ); ?>"
@@ -189,8 +190,10 @@ public function render_field_data( $data, $field ) {
             return;
         }
 
+        $data = is_array( $data ) ? array_pop( $data ) : $data;
+        // check again if there is any nested data
         $data     = is_array( $data ) ? array_pop( $data ) : $data;
-        $data     = explode( '|' , $data );
+        $data     = explode( '|', $data );
         $selected = [];
 
         foreach ( $data as $item ) {
diff --git a/includes/Fields/Form_Field_Radio.php b/includes/Fields/Form_Field_Radio.php
index 2a4537510..7e4b9882c 100755
--- a/includes/Fields/Form_Field_Radio.php
+++ b/includes/Fields/Form_Field_Radio.php
@@ -50,6 +50,7 @@ public function render( $field_settings, $form_id, $type = 'post', $post_id = nu
                         <label <?php echo $field_settings['inline'] == 'yes' ? 'class="wpuf-radio-inline"' : 'class="wpuf-radio-block"'; ?>>
                             <input
                                 name="<?php echo esc_attr( $field_settings['name'] ); ?>"
+                                id="<?php echo esc_attr( $field_settings['name'] ); ?>"
                                 class="<?php echo esc_attr( 'wpuf_' . $field_settings['name'] . '_' . $form_id ); ?>"
                                 type="radio"
                                 data-type="radio"
diff --git a/includes/Fields/Form_Field_Textarea.php b/includes/Fields/Form_Field_Textarea.php
index cf7375027..f6925a5b9 100755
--- a/includes/Fields/Form_Field_Textarea.php
+++ b/includes/Fields/Form_Field_Textarea.php
@@ -164,6 +164,10 @@ public function prepare_entry( $field ) {
       * @return string
       */
     public function render_field_data( $data, $field ) {
+        if ( ! is_string( $data ) ) {
+            return '';
+        }
+
         $data      = implode( ',', $data );
         $hide_label = isset( $field['hide_field_label'] )
            ? wpuf_validate_boolean( $field['hide_field_label'] )
diff --git a/includes/Integrations/WPUF_ACF_Compatibility.php b/includes/Integrations/WPUF_ACF_Compatibility.php
index 5e99d9eae..d3db0c019 100644
--- a/includes/Integrations/WPUF_ACF_Compatibility.php
+++ b/includes/Integrations/WPUF_ACF_Compatibility.php
@@ -316,6 +316,7 @@ public function update_acf_field_meta( $post_id, $form_id, $form_settings, $meta
         foreach ( acf_get_fields( $groups ) as $group ) {
             $meta_key = '_' . $group['name'];
             $name     = $group['name'];
+
             if ( 'repeater' === $group['type'] ) {
                 $meta_key = 'repeater';
             }
diff --git a/includes/class-frontend-render-form.php b/includes/class-frontend-render-form.php
index c35d955a6..6da0feeb1 100644
--- a/includes/class-frontend-render-form.php
+++ b/includes/class-frontend-render-form.php
@@ -505,14 +505,23 @@ public function get_input_fields( $form_vars ) {
         $post_vars    = $meta_vars = $taxonomy_vars = [];
 
         foreach ( $form_vars as $key => $value ) {
+            // ignore section break and HTML input type
+            if ( in_array( $value['input_type'], $ignore_lists ) ) {
+                continue;
+            }
+
             // get column field input fields
-            if ( $value['input_type'] == 'column_field' ) {
+            if ( ( 'column_field' === $value['input_type'] ) || ( 'repeat' === $value['input_type'] ) ) {
                 $inner_fields = $value['inner_fields'];
 
                 foreach ( $inner_fields as $column_key => $column_fields ) {
                     if ( ! empty( $column_fields ) ) {
                         // ignore section break and HTML input type
                         foreach ( $column_fields as $column_field_key => $column_field ) {
+                            if ( 'repeat' === $value['input_type'] ) {
+                                $column_field['is_repeat_child'] = 'yes';
+                            }
+
                             if ( in_array( $column_field['input_type'], $ignore_lists ) ) {
                                 continue;
                             }
@@ -538,17 +547,12 @@ public function get_input_fields( $form_vars ) {
                     }
                 }
                 continue;
-            }
-
-            // ignore section break and HTML input type
-            if ( in_array( $value['input_type'], $ignore_lists ) ) {
-                continue;
-            }
-
-            //separate the post and custom fields
-            if ( isset( $value['is_meta'] ) && $value['is_meta'] == 'yes' ) {
-                $meta_vars[] = $value;
-                continue;
+            } else {
+                // separate the post and custom fields
+                if ( isset( $value['is_meta'] ) && 'yes' === $value['is_meta'] ) {
+                    $meta_vars[] = $value;
+                    continue;
+                }
             }
 
             if ( $value['input_type'] == 'taxonomy' ) {
@@ -707,7 +711,28 @@ public static function prepare_meta_fields( $meta_vars ) {
         $post_data = wp_unslash( $_POST ); // phpcs:ignore WordPress.XSS.EscapeOutput.OutputNotEscaped
         $files          = [];
         $meta_key_value = [];
-        $multi_repeated = []; //multi repeated fields will in sotre duplicated meta key
+        $repeat_fields  = []; // repeat field and sub-fields data
+        $form_id        = isset( $_POST['form_id'] ) ? intval( wp_unslash( $_POST['form_id'] ) ) : 0; // phpcs:ignore WordPress.Security.NonceVerification
+        $form           = new WPUF_Form( $form_id );
+        $form_fields    = $form->get_fields();
+        $repeat_field_childs = [];
+
+        // processing repeat fields
+        foreach ( $form_fields as $field ) {
+            if ( ! empty( $field['input_type'] ) && 'repeat' === $field['input_type'] ) {
+                // loop for each column. we have 3 columns for repeated fields
+                for ( $i = 1; $i <= 3; $i++ ) {
+                    if ( ! empty( $field['inner_fields'] ) && ! empty( $field['inner_fields'][ 'column-' . $i ] ) ) {
+                        foreach ( $field['inner_fields'][ 'column-' . $i ] as $column_value ) {
+                            $repeat_field_childs[ $column_value['name'] ] = $field['name'];
+                            $repeat_fields['sub_fields'][] = $column_value['name'];
+                        }
+                    }
+                }
+
+                $repeat_fields['parent'] = $field['name'];
+            }
+        }
 
         foreach ( $meta_vars as $key => $value ) {
             $wpuf_field = wpuf()->fields->get_field( $value['template'] );
@@ -728,12 +753,29 @@ public static function prepare_meta_fields( $meta_vars ) {
                 $wpuf_files = [];
             }
 
-            if ( '_downloadable' === $value['name'] && 'on' === $value_name ) {
-                $value_name = 'yes';
+            if ( ! empty( $value['is_repeat_child'] ) && ( 'yes' === $value['is_repeat_child'] ) ) {
+                $parent_name   = ! empty( $repeat_field_childs[ $value['name'] ] ) ? $repeat_field_childs[ $value['name'] ] : '';
+                $row_count_key = $parent_name . '_row_num';
+                $row_number    = ! empty( $_POST[ $row_count_key ] ) ? absint( wp_unslash( $_POST[ $row_count_key ] ) ) : 1; // phpcs:ignore WordPress.Security.NonceVerification
+                $repeat_fields['row_number'] = $row_number;
+
+                if ( '_downloadable' === $value['name'] && 'on' === $value_name ) {
+                    $value_name = 'yes';
+                }
+
+                // loop for each column. we have 3 columns for repeated fields
+                for ( $i = 0; $i < $row_number; $i++ ) {
+                    $meta_key      = ! empty( $value['name'] ) ? $value['name'] : '';
+                    $formatted_key = $parent_name . '_' . $i . '_' . $meta_key;
+
+                    if ( '' !== $meta_key && ! empty( $_POST[ $formatted_key ] ) ) {
+                        $repeat_fields['fields'][ $formatted_key ] = wp_unslash( $_POST[ $formatted_key ] );
+                        $meta_key_value[ $formatted_key ] = wp_unslash( $_POST[ $formatted_key ] );  // phpcs:ignore WordPress.Security
+                    }
+                }
             }
 
             switch ( $value['input_type'] ) {
-
                 // put files in a separate array, we'll process it later
                 case 'file_upload':
                 case 'image_upload':
@@ -745,43 +787,6 @@ public static function prepare_meta_fields( $meta_vars ) {
                     ];
                     break;
 
-                case 'repeat':
-                    $repeater_value = wp_unslash( $_POST[ $value['name'] ] ); // WPCS: sanitization ok.
-
-                    // if it is a multi column repeat field
-                    if ( isset( $value['multiple'] ) && $value['multiple'] == 'true' ) {
-
-                        // if there's any items in the array, process it
-                        if ( $repeater_value ) {
-                            $ref_arr = array();
-                            $cols    = count( $value['columns'] );
-                            $first   = array_shift( array_values( $repeater_value ) ); //first element
-                            $rows    = count( $first );
-
-                            // loop through columns
-                            for ( $i = 0; $i < $rows; $i++ ) {
-
-                                // loop through the rows and store in a temp array
-                                $temp = array();
-                                for ( $j = 0; $j < $cols; $j++ ) {
-                                    $temp[] = $repeater_value[ $j ][ $i ];
-                                }
-
-                                // store all fields in a row with self::$separator separated
-                                $ref_arr[] = implode( self::$separator, $temp );
-                            }
-
-                            // now, if we found anything in $ref_arr, store to $multi_repeated
-                            if ( $ref_arr ) {
-                                $multi_repeated[ $value['name'] ] = array_slice( $ref_arr, 0, $rows );
-                            }
-                        }
-                    } else {
-                        $meta_key_value[ $value['name'] ] = implode( self::$separator, $repeater_value );
-                    }
-
-                    break;
-
                 case 'address':
                     if ( is_array( $value_name ) ) {
                         foreach ( $value_name as $address_field => $field_value ) {
@@ -823,7 +828,7 @@ public static function prepare_meta_fields( $meta_vars ) {
                     if ( is_array( $value_name ) && ! empty( $value_name ) ) {
                         $meta_key_value[ $value['name'] ] = implode( self::$separator, $value_name );
                     } else {
-                        $meta_key_value[ $value['name'] ] = $value_name[0];
+                        $meta_key_value[ $value['name'] ] = ! empty( $value_name[0] ) ? $value_name[0] : '';
                     }
                     break;
 
@@ -848,7 +853,7 @@ public static function prepare_meta_fields( $meta_vars ) {
                     break;
             }
         } //end foreach
-        return [ $meta_key_value, $multi_repeated, $files ];
+        return [ $meta_key_value, $repeat_fields, $files ];
     }
 
     /**
diff --git a/wpuf-functions.php b/wpuf-functions.php
index ab5489e47..b79282c55 100644
--- a/wpuf-functions.php
+++ b/wpuf-functions.php
@@ -902,7 +902,6 @@ function wpuf_show_custom_fields( $content ) {
             // get column field input fields
             if ( 'column_field' === $attr['input_type'] ) {
                 $inner_fields = $attr['inner_fields'];
-
                 foreach ( $inner_fields as $column_key => $column_fields ) {
                     if ( ! empty( $column_fields ) ) {
                         // ignore section break and HTML input type
@@ -919,6 +918,41 @@ function wpuf_show_custom_fields( $content ) {
             if ( isset( $attr['show_in_post'] ) && 'yes' === $attr['show_in_post'] ) {
                 $meta[] = $attr;
             }
+
+            // get repeat field inner fields
+            if ( 'repeat' === $attr['input_type'] ) {
+                $inner_fields = $attr['inner_fields'];
+                foreach ( $inner_fields as $column_key => $column_fields ) {
+                    if ( ! empty( $column_fields ) ) {
+                        // ignore section break and HTML input type
+                        foreach ( $column_fields as $column_field_key => $column_field ) {
+                            if ( isset( $column_field['show_in_post'] ) && 'yes' === $column_field['show_in_post'] ) {
+                                $repeat_field_name = ! empty( $attr['name'] ) ? $attr['name'] : '';
+                                $repeat_rows       = get_post_meta( $post->ID, $repeat_field_name, true );
+
+                                if ( ! empty( $repeat_rows ) ) {
+                                    for ( $index = 0; $index < $repeat_rows; $index++ ) {
+                                        $field_value = get_post_meta( $post->ID, $repeat_field_name . '_' . $index . '_' . $column_field['name'], true );
+                                        $hide_label  = ! empty( $column_field['hide_field_label'] ) ? $column_field['hide_field_label'] : 'no';
+
+                                        if ( is_array( $field_value ) ) {
+                                            $field_value = implode( ', ', $field_value );
+                                        }
+
+                                        $html .= '<li>';
+
+                                        if ( 'no' === $hide_label ) {
+                                            $html .= '<label>' . $column_field['label'] . ': </label>';
+                                        }
+
+                                        $html .= make_clickable( $field_value ) . '</li>';
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         }
 
         if ( ! $meta ) {
@@ -1115,26 +1149,6 @@ function wpuf_show_custom_fields( $content ) {
                     break;
 
                 case 'repeat':
-                    $value    = get_post_meta( $post->ID, $attr['name'] );
-                    $newvalue = [];
-
-                    foreach ( $value as $i => $str ) {
-                        if ( preg_match( '/[^\|\s]/', $str ) ) {
-                            $newvalue[] = $str;
-                        }
-                    }
-
-                    $new = implode( ', ', $newvalue );
-
-                    if ( $new ) {
-                        $html .= '<li>';
-
-                        if ( 'no' === $hide_label ) {
-                            $html .= '<label>' . $attr['label'] . ': </label>';
-                        }
-
-                        $html .= make_clickable( $new ) . '</li>';
-                    }
                     break;
 
                 case 'url':
@@ -1758,8 +1772,43 @@ function wpuf_get_form_fields( $form_id ) {
         }
 
         // Add 'multiple' key for input_type:repeat
-        if ( 'repeat' === $field['input_type'] && ! isset( $field['multiple'] ) ) {
-            $field['multiple'] = '';
+        if ( 'repeat' === $field['input_type'] ) {
+            if ( ! isset( $field['multiple'] ) ) {
+                $field['multiple'] = '';
+            }
+
+            // if old repeat field format
+            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%';
+            }
         }
 
         if ( 'recaptcha' === $field['input_type'] ) {
@@ -1773,6 +1822,20 @@ function wpuf_get_form_fields( $form_id ) {
     return $form_fields;
 }
 
+add_action( 'wp_ajax_wpuf_get_child_cat', 'wpuf_get_child_cats' );
+add_action( 'wp_ajax_nopriv_wpuf_get_child_cat', 'wpuf_get_child_cats' );
+
+/*
+ * Generates a random integer for WPUF form field id like wpuf-form-builder-mixins.js
+ *
+ * @since WPUF
+ *
+ * @return int
+ */
+function wpuf_form_field_id_generator( $min = 999999, $max = 9999000001 ) {
+    return rand( $min, $max );
+}
+
 /**
  * Returns child category dropdown on ajax request
  */