diff --git a/languages/everest-forms.pot b/languages/everest-forms.pot
index 16a4279cc..8ee87396e 100644
--- a/languages/everest-forms.pot
+++ b/languages/everest-forms.pot
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Everest Forms 1.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/wpeverest/everest-forms/issues\n"
-"POT-Creation-Date: 2018-07-12 06:46:44+00:00\n"
+"POT-Creation-Date: 2018-07-12 09:07:59+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,7 +62,7 @@ msgid "Check this option to mark the field required."
 msgstr ""
 
 #: includes/abstracts/class-evf-form-fields.php:365
-#: includes/admin/settings/class-evf-settings-validation.php:46
+#: includes/admin/settings/class-evf-settings-validation.php:45
 #: includes/evf-core-functions.php:1766
 #: includes/shortcodes/class-evf-shortcode-form.php:127
 msgid "Required"
@@ -153,18 +153,18 @@ msgid "No field type found"
 msgstr ""
 
 #: includes/abstracts/class-evf-form-fields.php:674
-#: includes/admin/builder/class-evf-builder-fields.php:211
+#: includes/admin/builder/class-evf-builder-fields.php:210
 msgid "Duplicate Field"
 msgstr ""
 
 #: includes/abstracts/class-evf-form-fields.php:675
-#: includes/admin/builder/class-evf-builder-fields.php:212
+#: includes/admin/builder/class-evf-builder-fields.php:211
 msgid "Delete Field"
 msgstr ""
 
 #: includes/abstracts/class-evf-form-fields.php:676
-#: includes/admin/builder/class-evf-builder-fields.php:213
-#: includes/admin/builder/class-evf-builder-settings.php:26
+#: includes/admin/builder/class-evf-builder-fields.php:212
+#: includes/admin/builder/class-evf-builder-settings.php:25
 #: includes/admin/class-evf-admin-menus.php:154
 #: includes/class-evf-install.php:567
 msgid "Settings"
@@ -182,159 +182,159 @@ msgstr ""
 msgid "Please enter a valid number"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-fields.php:26
+#: includes/admin/builder/class-evf-builder-fields.php:25
 msgid "Fields"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-fields.php:49
+#: includes/admin/builder/class-evf-builder-fields.php:48
 msgid "Add Fields"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-fields.php:50
+#: includes/admin/builder/class-evf-builder-fields.php:49
 msgid "Field Options"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-fields.php:125
+#: includes/admin/builder/class-evf-builder-fields.php:124
 msgid "You don't have any fields yet."
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-fields.php:151
+#: includes/admin/builder/class-evf-builder-fields.php:150
 msgid "Row Settings"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-fields.php:152
+#: includes/admin/builder/class-evf-builder-fields.php:151
 msgid "Select the type of row"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:37
-#: includes/admin/builder/class-evf-builder-settings.php:61
-#: includes/admin/settings/class-evf-settings-general.php:26
+#: includes/admin/builder/class-evf-builder-settings.php:36
+#: includes/admin/builder/class-evf-builder-settings.php:60
+#: includes/admin/settings/class-evf-settings-general.php:25
 msgid "General"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:38
-#: includes/admin/builder/class-evf-builder-settings.php:183
-#: includes/admin/settings/class-evf-settings-email.php:26
-#: includes/admin/settings/class-evf-settings-validation.php:64
+#: includes/admin/builder/class-evf-builder-settings.php:37
+#: includes/admin/builder/class-evf-builder-settings.php:182
+#: includes/admin/settings/class-evf-settings-email.php:25
+#: includes/admin/settings/class-evf-settings-validation.php:63
 #: includes/fields/class-evf-field-email.php:20
 msgid "Email"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:68
+#: includes/admin/builder/class-evf-builder-settings.php:67
 #: includes/admin/views/html-admin-page-builder-setup.php:25
 msgid "Form Name"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:78
+#: includes/admin/builder/class-evf-builder-settings.php:77
 msgid "Successful form submission message"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:80
+#: includes/admin/builder/class-evf-builder-settings.php:79
 msgid "Thanks for contacting us! We will be in touch with you shortly"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:88
+#: includes/admin/builder/class-evf-builder-settings.php:87
 msgid "Redirect To"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:92
+#: includes/admin/builder/class-evf-builder-settings.php:91
 msgid "Same Page"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:93
-#: includes/admin/builder/class-evf-builder-settings.php:103
+#: includes/admin/builder/class-evf-builder-settings.php:92
+#: includes/admin/builder/class-evf-builder-settings.php:102
 msgid "Custom Page"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:94
-#: includes/admin/builder/class-evf-builder-settings.php:114
+#: includes/admin/builder/class-evf-builder-settings.php:93
+#: includes/admin/builder/class-evf-builder-settings.php:113
 msgid "External URL"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:124
+#: includes/admin/builder/class-evf-builder-settings.php:123
 msgid "Layout Design"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:128
+#: includes/admin/builder/class-evf-builder-settings.php:127
 msgid "Default"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:129
+#: includes/admin/builder/class-evf-builder-settings.php:128
 msgid "Classic Layout"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:138
+#: includes/admin/builder/class-evf-builder-settings.php:137
 msgid "Form Class"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:148
+#: includes/admin/builder/class-evf-builder-settings.php:147
 msgid "Submit button text"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:150
+#: includes/admin/builder/class-evf-builder-settings.php:149
 #: includes/shortcodes/class-evf-shortcode-form.php:39
 #: includes/templates/contact.php:66
 msgid "Submit"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:158
+#: includes/admin/builder/class-evf-builder-settings.php:157
 msgid "Enable %1$s %2$s reCaptcha %3$s support"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:168
+#: includes/admin/builder/class-evf-builder-settings.php:167
 msgid "Disable storing entry information"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:190
+#: includes/admin/builder/class-evf-builder-settings.php:189
 msgid "To Address"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:200
+#: includes/admin/builder/class-evf-builder-settings.php:199
 msgid "From Name"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:210
+#: includes/admin/builder/class-evf-builder-settings.php:209
 msgid "From Address"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:220
+#: includes/admin/builder/class-evf-builder-settings.php:219
 msgid "Email Subject"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:222
+#: includes/admin/builder/class-evf-builder-settings.php:221
 #: includes/templates/contact.php:71
 msgid "New Form Entry"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:230
+#: includes/admin/builder/class-evf-builder-settings.php:229
 msgid "Email Message"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:232
+#: includes/admin/builder/class-evf-builder-settings.php:231
 msgid "{all_fields}"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:242
+#: includes/admin/builder/class-evf-builder-settings.php:241
 msgid "Send Confirmation Email To User"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:252
+#: includes/admin/builder/class-evf-builder-settings.php:251
 msgid "Send Confirmation Email To"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:263
+#: includes/admin/builder/class-evf-builder-settings.php:262
 msgid "Confirmation Email Subject"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:265
+#: includes/admin/builder/class-evf-builder-settings.php:264
 msgid "Thank You!"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:273
+#: includes/admin/builder/class-evf-builder-settings.php:272
 msgid "Confirmation Email Message"
 msgstr ""
 
-#: includes/admin/builder/class-evf-builder-settings.php:275
+#: includes/admin/builder/class-evf-builder-settings.php:274
 #: includes/class-evf-form-task.php:198 includes/class-evf-form-task.php:346
 #: includes/shortcodes/class-evf-shortcode-form.php:142
 #: includes/templates/contact.php:60
@@ -783,121 +783,121 @@ msgstr ""
 msgid "Field #"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-email.php:40
+#: includes/admin/settings/class-evf-settings-email.php:39
 msgid "Template Settings"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-email.php:46
+#: includes/admin/settings/class-evf-settings-email.php:45
 msgid "Template"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-email.php:51
+#: includes/admin/settings/class-evf-settings-email.php:50
 msgid "HTML"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-email.php:52
+#: includes/admin/settings/class-evf-settings-email.php:51
 msgid "Plain"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-general.php:40
+#: includes/admin/settings/class-evf-settings-general.php:39
 msgid "General Options"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-general.php:46
+#: includes/admin/settings/class-evf-settings-general.php:45
 msgid "Disable User Details"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-general.php:47
+#: includes/admin/settings/class-evf-settings-general.php:46
 msgid "Disable storing the IP address and User Agent on all forms."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:26
-#: includes/admin/settings/class-evf-settings-validation.php:82
+#: includes/admin/settings/class-evf-settings-recaptcha.php:25
+#: includes/admin/settings/class-evf-settings-validation.php:81
 msgid "reCAPTCHA"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:40
+#: includes/admin/settings/class-evf-settings-recaptcha.php:39
 msgid "Google reCaptcha Integation"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:43
+#: includes/admin/settings/class-evf-settings-recaptcha.php:42
 #. translators: %s - Google reCaptch URL.
 msgid ""
 "Get site key and secret key from google <a href=\"%s\" "
 "target=\"_blank\">reCaptcha</a>."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:47
+#: includes/admin/settings/class-evf-settings-recaptcha.php:46
 msgid "Site Key"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:48
+#: includes/admin/settings/class-evf-settings-recaptcha.php:47
 msgid "Get site key from google."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:58
+#: includes/admin/settings/class-evf-settings-recaptcha.php:57
 msgid "Secret Key"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-recaptcha.php:59
+#: includes/admin/settings/class-evf-settings-recaptcha.php:58
 msgid "Get secret key from google."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:26
+#: includes/admin/settings/class-evf-settings-validation.php:25
 msgid "Validations"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:40
+#: includes/admin/settings/class-evf-settings-validation.php:39
 msgid "Validation Messages"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:47
+#: includes/admin/settings/class-evf-settings-validation.php:46
 msgid "Enter the message for the required form field"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:52
+#: includes/admin/settings/class-evf-settings-validation.php:51
 #: includes/evf-core-functions.php:1334
 msgid "This field is required."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:55
+#: includes/admin/settings/class-evf-settings-validation.php:54
 msgid "Website URL"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:56
+#: includes/admin/settings/class-evf-settings-validation.php:55
 msgid "Enter the message for the valid website url"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:61
+#: includes/admin/settings/class-evf-settings-validation.php:60
 msgid "Please enter a valid URL."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:65
+#: includes/admin/settings/class-evf-settings-validation.php:64
 msgid "Enter the message for the valid email"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:70
+#: includes/admin/settings/class-evf-settings-validation.php:69
 msgid "Please enter a valid email address."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:73
+#: includes/admin/settings/class-evf-settings-validation.php:72
 #: includes/fields/class-evf-field-number.php:20
 msgid "Number"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:74
+#: includes/admin/settings/class-evf-settings-validation.php:73
 msgid "Enter the message for the valid number"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:79
+#: includes/admin/settings/class-evf-settings-validation.php:78
 msgid "Please enter a valid number."
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:83
+#: includes/admin/settings/class-evf-settings-validation.php:82
 msgid "Enter the message for the valid recaptcha"
 msgstr ""
 
-#: includes/admin/settings/class-evf-settings-validation.php:88
+#: includes/admin/settings/class-evf-settings-validation.php:87
 msgid "Invalid reCaptcha Code."
 msgstr ""