diff --git a/README.md b/README.md
index d55007778..9735cf1d9 100644
--- a/README.md
+++ b/README.md
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th January, 2019
++ *Last Build*: 30th January, 2019
 + *Version*: 2.9.10
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195039**
++ *Line count*: **194699**
 + *Field count*: **1089**
 + *File count*: **1277**
 + *Folder count*: **201**
diff --git a/admin/README.txt b/admin/README.txt
index d55007778..9735cf1d9 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th January, 2019
++ *Last Build*: 30th January, 2019
 + *Version*: 2.9.10
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **195039**
++ *Line count*: **194699**
 + *Field count*: **1089**
 + *File count*: **1277**
 + *Folder count*: **201**
diff --git a/admin/compiler/joomla_3/submitbutton.js b/admin/compiler/joomla_3/submitbutton.js
index 84fe0dc54..f1600dba4 100644
--- a/admin/compiler/joomla_3/submitbutton.js
+++ b/admin/compiler/joomla_3/submitbutton.js
@@ -5,19 +5,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('###view###, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/compiler/joomla_3/submitbutton_site.js b/admin/compiler/joomla_3/submitbutton_site.js
index 1782bc08c..2ca5f74e4 100644
--- a/admin/compiler/joomla_3/submitbutton_site.js
+++ b/admin/compiler/joomla_3/submitbutton_site.js
@@ -5,19 +5,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('###sview###, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/admin_custom_tabs/submitbutton.js b/admin/views/admin_custom_tabs/submitbutton.js
index 713b59df6..de80af29b 100644
--- a/admin/views/admin_custom_tabs/submitbutton.js
+++ b/admin/views/admin_custom_tabs/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('admin_custom_tabs, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/admin_fields/submitbutton.js b/admin/views/admin_fields/submitbutton.js
index b97f1d821..fef96afa4 100644
--- a/admin/views/admin_fields/submitbutton.js
+++ b/admin/views/admin_fields/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('admin_fields, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/admin_fields_conditions/submitbutton.js b/admin/views/admin_fields_conditions/submitbutton.js
index 366236a60..ea8da5aa0 100644
--- a/admin/views/admin_fields_conditions/submitbutton.js
+++ b/admin/views/admin_fields_conditions/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('admin_fields_conditions, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/admin_fields_relations/submitbutton.js b/admin/views/admin_fields_relations/submitbutton.js
index 4a4e0e483..9a94fe6fc 100644
--- a/admin/views/admin_fields_relations/submitbutton.js
+++ b/admin/views/admin_fields_relations/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('admin_fields_relations, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/admin_view/submitbutton.js b/admin/views/admin_view/submitbutton.js
index efe665839..2e0d079dc 100644
--- a/admin/views/admin_view/submitbutton.js
+++ b/admin/views/admin_view/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('admin_view, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_admin_views/submitbutton.js b/admin/views/component_admin_views/submitbutton.js
index a2ffbf29f..abb047dfc 100644
--- a/admin/views/component_admin_views/submitbutton.js
+++ b/admin/views/component_admin_views/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_admin_views, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_config/submitbutton.js b/admin/views/component_config/submitbutton.js
index db0dba2b2..bee9b1d0e 100644
--- a/admin/views/component_config/submitbutton.js
+++ b/admin/views/component_config/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_config, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_custom_admin_menus/submitbutton.js b/admin/views/component_custom_admin_menus/submitbutton.js
index 38681253d..e84c05dfc 100644
--- a/admin/views/component_custom_admin_menus/submitbutton.js
+++ b/admin/views/component_custom_admin_menus/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_custom_admin_menus, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_custom_admin_views/submitbutton.js b/admin/views/component_custom_admin_views/submitbutton.js
index d5db3ec86..41e493264 100644
--- a/admin/views/component_custom_admin_views/submitbutton.js
+++ b/admin/views/component_custom_admin_views/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_custom_admin_views, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_dashboard/submitbutton.js b/admin/views/component_dashboard/submitbutton.js
index c26d68501..7485d6340 100644
--- a/admin/views/component_dashboard/submitbutton.js
+++ b/admin/views/component_dashboard/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_dashboard, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_files_folders/submitbutton.js b/admin/views/component_files_folders/submitbutton.js
index 4e5645c62..c3b5d4469 100644
--- a/admin/views/component_files_folders/submitbutton.js
+++ b/admin/views/component_files_folders/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_files_folders, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_mysql_tweaks/submitbutton.js b/admin/views/component_mysql_tweaks/submitbutton.js
index f1c2d0c8c..7f70b6463 100644
--- a/admin/views/component_mysql_tweaks/submitbutton.js
+++ b/admin/views/component_mysql_tweaks/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_mysql_tweaks, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_site_views/submitbutton.js b/admin/views/component_site_views/submitbutton.js
index 9158e3cbe..0ddcf690b 100644
--- a/admin/views/component_site_views/submitbutton.js
+++ b/admin/views/component_site_views/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_site_views, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/component_updates/submitbutton.js b/admin/views/component_updates/submitbutton.js
index 93620c377..bb3f43472 100644
--- a/admin/views/component_updates/submitbutton.js
+++ b/admin/views/component_updates/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('component_updates, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/custom_admin_view/submitbutton.js b/admin/views/custom_admin_view/submitbutton.js
index 3b6c9d45e..f12ced73e 100644
--- a/admin/views/custom_admin_view/submitbutton.js
+++ b/admin/views/custom_admin_view/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('custom_admin_view, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/custom_code/submitbutton.js b/admin/views/custom_code/submitbutton.js
index f29f031b8..dba8ab60b 100644
--- a/admin/views/custom_code/submitbutton.js
+++ b/admin/views/custom_code/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('custom_code, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/dynamic_get/submitbutton.js b/admin/views/dynamic_get/submitbutton.js
index b0744a58a..df1b8e82a 100644
--- a/admin/views/dynamic_get/submitbutton.js
+++ b/admin/views/dynamic_get/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('dynamic_get, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/field/submitbutton.js b/admin/views/field/submitbutton.js
index 3655af528..d987d3986 100644
--- a/admin/views/field/submitbutton.js
+++ b/admin/views/field/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('field, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/fieldtype/submitbutton.js b/admin/views/fieldtype/submitbutton.js
index 7fb1fcba4..b2cd06c7d 100644
--- a/admin/views/fieldtype/submitbutton.js
+++ b/admin/views/fieldtype/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('fieldtype, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index 4548be9d2..16bc07457 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('help_document, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/joomla_component/submitbutton.js b/admin/views/joomla_component/submitbutton.js
index 617c34fa2..9abdb6e4e 100644
--- a/admin/views/joomla_component/submitbutton.js
+++ b/admin/views/joomla_component/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('joomla_component, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/language/submitbutton.js b/admin/views/language/submitbutton.js
index 757d24604..5833358a8 100644
--- a/admin/views/language/submitbutton.js
+++ b/admin/views/language/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('language, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/language_translation/submitbutton.js b/admin/views/language_translation/submitbutton.js
index eba3e2683..e67340e7f 100644
--- a/admin/views/language_translation/submitbutton.js
+++ b/admin/views/language_translation/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('language_translation, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/layout/submitbutton.js b/admin/views/layout/submitbutton.js
index 4eb5d1e05..97b27edc8 100644
--- a/admin/views/layout/submitbutton.js
+++ b/admin/views/layout/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('layout, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/library/submitbutton.js b/admin/views/library/submitbutton.js
index f2382e1d2..403f592fd 100644
--- a/admin/views/library/submitbutton.js
+++ b/admin/views/library/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('library, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/library_config/submitbutton.js b/admin/views/library_config/submitbutton.js
index 5b31f3745..3a096925c 100644
--- a/admin/views/library_config/submitbutton.js
+++ b/admin/views/library_config/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('library_config, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/library_files_folders_urls/submitbutton.js b/admin/views/library_files_folders_urls/submitbutton.js
index 3093b8395..5822c1684 100644
--- a/admin/views/library_files_folders_urls/submitbutton.js
+++ b/admin/views/library_files_folders_urls/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('library_files_folders_urls, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/server/submitbutton.js b/admin/views/server/submitbutton.js
index f780dfea5..04f60ced7 100644
--- a/admin/views/server/submitbutton.js
+++ b/admin/views/server/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('server, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/site_view/submitbutton.js b/admin/views/site_view/submitbutton.js
index eb9fcc7e2..b760a23f3 100644
--- a/admin/views/site_view/submitbutton.js
+++ b/admin/views/site_view/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('site_view, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/snippet/submitbutton.js b/admin/views/snippet/submitbutton.js
index 7c4f6b23c..5f5cc02e6 100644
--- a/admin/views/snippet/submitbutton.js
+++ b/admin/views/snippet/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('snippet, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/snippet_type/submitbutton.js b/admin/views/snippet_type/submitbutton.js
index b070db7c2..d5722e1cd 100644
--- a/admin/views/snippet_type/submitbutton.js
+++ b/admin/views/snippet_type/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('snippet_type, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/template/submitbutton.js b/admin/views/template/submitbutton.js
index 8769fda4d..d3527ef41 100644
--- a/admin/views/template/submitbutton.js
+++ b/admin/views/template/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('template, some values are not acceptable.','Some values are unacceptable'));
diff --git a/admin/views/validation_rule/submitbutton.js b/admin/views/validation_rule/submitbutton.js
index 6ff873592..6a67c93bb 100644
--- a/admin/views/validation_rule/submitbutton.js
+++ b/admin/views/validation_rule/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('validation_rule, some values are not acceptable.','Some values are unacceptable'));
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 45a5427ca..7597c7c36 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>29th January, 2019</creationDate>
+	<creationDate>30th January, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/site/views/api/submitbutton.js b/site/views/api/submitbutton.js
index 1d7be75e7..1598b2910 100644
--- a/site/views/api/submitbutton.js
+++ b/site/views/api/submitbutton.js
@@ -13,19 +13,9 @@ Joomla.submitbutton = function(task)
 	if (task == ''){
 		return false;
 	} else { 
-		var isValid=true;
 		var action = task.split('.');
-		if (action[1] != 'cancel' && action[1] != 'close'){
-			var forms = $$('form.form-validate');
-			for (var i=0;i<forms.length;i++){
-				if (!document.formvalidator.isValid(forms[i])){
-					isValid = false;
-					break;
-				}
-			}
-		}
-		if (isValid){
-			Joomla.submitform(task);
+		if (action[1] == 'cancel' || action[1] == 'close' || document.formvalidator.isValid(document.getElementById("adminForm"))){
+			Joomla.submitform(task, document.getElementById("adminForm"));
 			return true;
 		} else {
 			alert(Joomla.JText._('api, some values are not acceptable.','Some values are unacceptable'));