diff --git a/assets/js/src/form_editor/form_editor.js b/assets/js/src/form_editor/form_editor.js
index e60f59d8e0..074145d794 100644
--- a/assets/js/src/form_editor/form_editor.js
+++ b/assets/js/src/form_editor/form_editor.js
@@ -617,6 +617,17 @@ var WysijaForm = {
       // this is a url, so do not encode the protocol
       return encodeURI(str).replace(/[!'()*]/g, escape);
     }
+  },
+  updateBlock: function(data) {
+    var hasUpdated = false;
+    WysijaForm.getBlocks().each(function(b) {
+      if(b.block.getData().id == data.id) {
+        hasUpdated = true;
+        b.block.redraw(data);
+      }
+    });
+
+    return hasUpdated;
   }
 };
 
diff --git a/assets/js/src/public.js b/assets/js/src/public.js
index 8cdbea3d91..52a41bcbd2 100644
--- a/assets/js/src/public.js
+++ b/assets/js/src/public.js
@@ -20,10 +20,7 @@ function(
       $('form.mailpoet_form').each(function() {
         var form = $(this);
 
-        form.parsley({
-          errorsWrapper: '<p></p>',
-          errorTemplate: '<span></span>'
-        }).on('form:submit', function(parsley) {
+        form.parsley().on('form:submit', function(parsley) {
 
           var data = form.serializeObject() || {};
 
diff --git a/lib/Form/Block/Base.php b/lib/Form/Block/Base.php
index 27f912b28b..1cc96d2168 100644
--- a/lib/Form/Block/Base.php
+++ b/lib/Form/Block/Base.php
@@ -13,7 +13,9 @@ abstract class Base {
     if($block['id'] === 'segments') {
       $rules['required'] = true;
       $rules['mincheck'] = 1;
-      $rules['error-message'] = __('You need to select a list');
+      $rules['group'] = $block['id'];
+      $rules['errors-container'] = '.mailpoet_error_'.$block['id'];
+      $rules['required-message'] = __('You need to select a list');
     }
 
     if(!empty($block['params']['required'])) {
@@ -29,7 +31,7 @@ abstract class Base {
       }
     }
 
-    if($block['type'] === 'radio') {
+    if(in_array($block['type'], array('radio', 'checkbox'))) {
       $rules['group'] = 'custom_field_'.$block['id'];
       $rules['errors-container'] = '.mailpoet_error_'.$block['id'];
       $rules['required-message'] = __('You need to select at least one option.');
diff --git a/lib/Form/Block/Checkbox.php b/lib/Form/Block/Checkbox.php
index 5b446b19f9..07a3b527eb 100644
--- a/lib/Form/Block/Checkbox.php
+++ b/lib/Form/Block/Checkbox.php
@@ -9,10 +9,6 @@ class Checkbox extends Base {
     $field_name = static::getFieldName($block);
     $field_validation = static::getInputValidation($block);
 
-    // TODO: check if it still makes sense
-    // create hidden default value
-    // $html .= '<input type="hidden"name="'.$field_name.'" value="0" '.static::getInputValidation($block).'/>';
-
     $html .= '<p class="mailpoet_paragraph">';
 
     $html .= static::renderLabel($block);
@@ -35,6 +31,8 @@ class Checkbox extends Base {
       $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;
diff --git a/lib/Form/Block/Radio.php b/lib/Form/Block/Radio.php
index ba3b7c8d71..c60f886532 100644
--- a/lib/Form/Block/Radio.php
+++ b/lib/Form/Block/Radio.php
@@ -13,8 +13,6 @@ class Radio extends Base {
 
     $html .= static::renderLabel($block);
 
-    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
-
     foreach($block['params']['values'] as $option) {
       $html .= '<label class="mailpoet_radio_label">';
 
@@ -33,6 +31,8 @@ class Radio extends Base {
       $html .= '</label>';
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;
diff --git a/lib/Form/Block/Segment.php b/lib/Form/Block/Segment.php
index e5a1683d3f..91521cc7ae 100644
--- a/lib/Form/Block/Segment.php
+++ b/lib/Form/Block/Segment.php
@@ -30,6 +30,8 @@ class Segment extends Base {
       }
     }
 
+    $html .= '<span class="mailpoet_error_'.$block['id'].'"></span>';
+
     $html .= '</p>';
 
     return $html;
diff --git a/lib/Form/Block/Submit.php b/lib/Form/Block/Submit.php
index 085dd7c577..12b6ea5367 100644
--- a/lib/Form/Block/Submit.php
+++ b/lib/Form/Block/Submit.php
@@ -6,11 +6,11 @@ class Submit extends Base {
   static function render($block) {
     $html = '';
 
-    $html .= '<input class="mailpoet_submit" type="submit" ';
+    $html .= '<p class="mailpoet_submit"><input type="submit" ';
 
     $html .= 'value="'.static::getFieldLabel($block).'" ';
 
-    $html .= '/>';
+    $html .= '/></p>';
 
     return $html;
   }
diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php
index fa54549050..c458aa9da3 100644
--- a/lib/Models/Subscriber.php
+++ b/lib/Models/Subscriber.php
@@ -237,6 +237,16 @@ class Subscriber extends Model {
       }
     }
 
+    // custom fields
+    $custom_fields = array();
+
+    foreach($data as $key => $value) {
+      if(strpos($key, 'cf_') === 0) {
+        $custom_fields[substr($key, 3)] = $value;
+        unset($data[$key]);
+      }
+    }
+
     if($subscriber === false) {
       $subscriber = static::create();
       $subscriber->hydrate($data);
diff --git a/lib/Router/Subscribers.php b/lib/Router/Subscribers.php
index 6df0f928c8..25241da9bf 100644
--- a/lib/Router/Subscribers.php
+++ b/lib/Router/Subscribers.php
@@ -113,13 +113,19 @@ class Subscribers {
     }
 
     if(!empty($errors)) {
-      wp_send_json(array('errors' => $errors));
+      wp_send_json(array(
+        'result' => false,
+        'errors' => $errors
+      ));
     }
 
     $subscriber = Subscriber::subscribe($data, $segment_ids);
 
+    $result = false;
     if($subscriber === false || !$subscriber->id()) {
       $errors = array_merge($errors, $subscriber->getValidationErrors());
+    } else {
+      $result = true;
     }
 
     if(!empty($errors)) {
diff --git a/views/form/editor.html b/views/form/editor.html
index 1cf52a26f2..f0e9ba2005 100644
--- a/views/form/editor.html
+++ b/views/form/editor.html
@@ -66,7 +66,7 @@
                     type="radio"
                     name="on_success"
                     value="message"
-                    <% if(form.data.settings.on_success is empty or form.data.settings.on_success == 'message') %>
+                    <% if(form.settings.on_success is empty or form.settings.on_success == 'message') %>
                       checked="checked"
                     <% endif %>
                   /><%= __('Show message') %>
@@ -77,15 +77,15 @@
                     type="radio"
                     name="on_success"
                     value="page"
-                    <% if(form.data.settings.on_success == 'page') %>
+                    <% if(form.settings.on_success == 'page') %>
                       checked="checked"
                     <% endif %>
                   /><%= __('Go to page') %>
                 </label>
               </p>
               <!-- default success message -->
-              <% if form.data.settings.success_message %>
-                <% set success_message = form.data.settings.success_message %>
+              <% if form.settings.success_message %>
+                <% set success_message = form.settings.success_message %>
               <% else %>
                 <% set success_message = __('Check your inbox now to confirm your subscription.') %>
               <% endif %>
@@ -103,7 +103,7 @@
                 <select name="success_page">
                   <% for page in pages %>
                     <option value="<%= page.id %>"
-                      <%- if form.data.settings.success_page != page.id %>
+                      <%- if form.settings.success_page == page.id %>
                         <%=- ' selected="selected"' %>
                       <%- endif %>><%= page.title %></option>
                   <% endfor %>
@@ -445,28 +445,31 @@
               return false;
             }
 
-            var message = null;
+            if(callback !== false) {
+              var message = null;
 
-            if(response.is_widget === true) {
-              message = "<%= __('Saved! The changes are already active in your widget.') %>";
-            } else {
-              message = "<%= __('Saved! Add this form to %1$sa widget%2$s.') | format("<a href='widgets.php' target='_blank'>", '</a>') | raw %>";
-            }
+              if(response.is_widget === true) {
+                message = "<%= __('Saved! The changes are already active in your widget.') %>";
+              } else {
+                message = "<%= __('Saved! Add this form to %1$sa widget%2$s.') | format("<a href='widgets.php' target='_blank'>", '</a>') | raw %>";
+              }
 
-            if(message !== null) {
-              MailPoet.Notice.hide();
-              MailPoet.Notice.success(message, {
-                scroll: true,
-                static: (response.is_widget === false)
-              });
-            }
+              if(message !== null) {
+                MailPoet.Notice.hide();
+                MailPoet.Notice.success(message, {
+                  scroll: true,
+                  static: (response.is_widget === false)
+                });
+              }
 
-            // if there is a callback, call it!
-            if(callback !== undefined) {
-              callback();
+              // if there is a callback, call it!
+              if(callback !== undefined) {
+                callback();
+              }
             }
           });
         }
+        window.mailpoet_form_save = mailpoet_form_save;
 
         // toolbar: on success toggle
         $(document).on('change', 'input[name="on_success"]', toggleOnSuccessOptions);
@@ -506,7 +509,7 @@
           // open popup
           MailPoet.Modal.popup({
             title: "<%= __('Add new field') %>",
-            template: $('#form_template_field_new').html()
+            template: $('#form_template_field_form').html()
           });
 
           return false;
@@ -524,7 +527,7 @@
             if(response.result !== false) {
               MailPoet.Modal.popup({
                 title: "<%= __('Edit field') %>",
-                template: $('#form_template_field_new').html(),
+                template: $('#form_template_field_form').html(),
                 data: response
               });
             }
@@ -685,8 +688,8 @@
   ) %>
 
   <!-- custom field: new -->
-  <%= partial('form_template_field_new',
-    'form/templates/settings/field_new.hbs'
+  <%= partial('form_template_field_form',
+    'form/templates/settings/field_form.hbs'
   ) %>
 
   <!-- form preview -->
diff --git a/views/form/templates/settings/field.hbs b/views/form/templates/settings/field.hbs
index ebeae74af5..6915687bf4 100644
--- a/views/form/templates/settings/field.hbs
+++ b/views/form/templates/settings/field.hbs
@@ -6,7 +6,7 @@
   {{#ifCond type '==' 'input'}}
     {{> _settings_label }}
     {{> _settings_label_within }}
-    {{#ifCond field 'in' 'first_name,last_name' }}
+    {{#ifCond id 'in' 'first_name,last_name' }}
       {{> _settings_required }}
     {{/ifCond}}
   {{/ifCond}}
diff --git a/views/form/templates/settings/field_new.hbs b/views/form/templates/settings/field_form.hbs
similarity index 94%
rename from views/form/templates/settings/field_new.hbs
rename to views/form/templates/settings/field_form.hbs
index dc9c1cf5d0..a546f6a1bc 100644
--- a/views/form/templates/settings/field_new.hbs
+++ b/views/form/templates/settings/field_form.hbs
@@ -78,7 +78,16 @@
           data: data
         }).done(function(response) {
           if(response.result === true) {
+            // close popup
+            MailPoet.Modal.close();
+
+            if(WysijaForm.updateBlock(response.field) === true) {
+              // trigger save, if a block has been updated
+              mailpoet_form_save(false);
+            }
+
             mailpoet_form_fields();
+
             if(data.id) {
               MailPoet.Notice.success(
                 "<%= __('Updated custom field “"+data.name+"“') %>"
@@ -88,9 +97,6 @@
                 "<%= __('Added custom field “"+data.name+"“') %>"
               );
             }
-
-            // close popup
-            MailPoet.Modal.success();
           } else {
             if(response.errors.length > 0) {
               $(response.errors).each(function(i, error) {
diff --git a/views/form/templates/settings/segment_selection.hbs b/views/form/templates/settings/segment_selection.hbs
index 40b326974b..8e33053e57 100644
--- a/views/form/templates/settings/segment_selection.hbs
+++ b/views/form/templates/settings/segment_selection.hbs
@@ -20,7 +20,6 @@
       mailpoet_segment_selection_render();
 
       setInputNames();
-      setupSortableSegments();
 
       // add segment
       $('.mailpoet_segment_add').on('click', function() {
@@ -125,6 +124,7 @@
         $(item).find('.mailpoet_segment_id').attr('name', 'params[values]['+index+'][id]');
         $(item).find('.mailpoet_segment_name').attr('name', 'params[values]['+index+'][name]');
       });
+      setupSortableSegments();
     }
   });
 <{{!}}/script>
\ No newline at end of file
diff --git a/views/form/widget.html b/views/form/widget.html
index 0d6e2888fc..1f08ccb1eb 100644
--- a/views/form/widget.html
+++ b/views/form/widget.html
@@ -16,8 +16,6 @@
       class="mailpoet_form mailpoet_form_<%= form_type %>"
       novalidate
     >
-      <div class="mailpoet_message"></div>
-
       <input type="hidden" name="form_id" value="<%= form.id %>" />
 
       <% if not(form.settings.segments_selected_by == 'user') %>
@@ -26,6 +24,8 @@
         <% endfor %>
       <% endif %>
       <%= html | raw %>
+
+      <div class="mailpoet_message"></div>
     </form>
   </div>
   <%= after_widget | raw %>