diff --git a/README.md b/README.md
index dc042fcb8..79e1095c9 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, 2020
++ *Last Build*: 4th February, 2020
 + *Version*: 2.10.11
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **281475**
++ *Line count*: **281315**
 + *Field count*: **1505**
 + *File count*: **1770**
 + *Folder count*: **280**
diff --git a/admin/README.txt b/admin/README.txt
index dc042fcb8..79e1095c9 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, 2020
++ *Last Build*: 4th February, 2020
 + *Version*: 2.10.11
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **281475**
++ *Line count*: **281315**
 + *Field count*: **1505**
 + *File count*: **1770**
 + *Folder count*: **280**
diff --git a/admin/assets/css/assistant.css b/admin/assets/css/assistant.css
index f073948a4..3d7b98b8f 100644
--- a/admin/assets/css/assistant.css
+++ b/admin/assets/css/assistant.css
@@ -10,6 +10,4 @@
 
 /* CSS Document */
 
-.j-sidebar-container {
-margin: -37px 0 0 -1px !important;
-}
+
diff --git a/admin/compiler/joomla_3/default_custom_admin.php b/admin/compiler/joomla_3/default_custom_admin.php
index 3da08846a..d3c514504 100644
--- a/admin/compiler/joomla_3/default_custom_admin.php
+++ b/admin/compiler/joomla_3/default_custom_admin.php
@@ -25,10 +25,7 @@ JHtml::_('behavior.keepalive');
 ?>
 <?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
 <?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
-<form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###sview###'.$urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
-        <input type="hidden" name="task" value="" />
-        <?php echo JHtml::_('form.token'); ?>
-</form>###CUSTOM_ADMIN_BODY###
+###CUSTOM_ADMIN_TOP_FORM######CUSTOM_ADMIN_BODY######CUSTOM_ADMIN_BOTTOM_FORM###
 <?php else: ?>
         <h1><?php echo JText::_('COM_###COMPONENT###_NO_ACCESS_GRANTED'); ?></h1>
 <?php endif; ?>
diff --git a/admin/compiler/joomla_3/default_list_custom_admin.php b/admin/compiler/joomla_3/default_list_custom_admin.php
index 00804976f..038a79cba 100644
--- a/admin/compiler/joomla_3/default_list_custom_admin.php
+++ b/admin/compiler/joomla_3/default_list_custom_admin.php
@@ -24,10 +24,7 @@ JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
 <?php if ($this->canDo->get('###sview###.access')): ?>###CUSTOM_ADMIN_SUBMITBUTTON_SCRIPT###
-<form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###sviews###'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
-        <input type="hidden" name="task" value="" />###HIDDEN_INPUT_VALUES###
-        <?php echo JHtml::_('form.token'); ?>
-</form>###CUSTOM_ADMIN_BODY###
+###CUSTOM_ADMIN_TOP_FORM######CUSTOM_ADMIN_BODY######CUSTOM_ADMIN_BOTTOM_FORM###
 <?php else: ?>
         <h1><?php echo JText::_('COM_###COMPONENT###_NO_ACCESS_GRANTED'); ?></h1>
 <?php endif; ?>
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 3acd27bd8..76778b6ca 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -2115,7 +2115,7 @@ class Get
 								{
 									// load the field details
 									$required = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'required="', '"');
-									$required = ($required == true) ? 'yes' : 'no';
+									$required = ($required === 'true' || $required === '1') ? 'yes' : 'no';
 									$filter = ComponentbuilderHelper::getBetween($fieldValues['settings']->xml, 'filter="', '"');
 									$filter = ComponentbuilderHelper::checkString($filter) ? $filter : 'none';
 									// set the field name
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 8790dfd44..7bc5d4145 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -159,11 +159,11 @@ class Interpretation extends Fields
 	public $customAdminAdded = array();
 
 	/**
-	 * Switch to add form to site views
+	 * Switch to add form to views
 	 *
 	 * @var    array
 	 */
-	public $addSiteForm = array();
+	public $addCustomForm = array();
 
 	/**
 	 * The extensions params
@@ -3365,17 +3365,6 @@ class Interpretation extends Fields
 				{
 					$method .= PHP_EOL . $this->_t(2) . "\$this->pagination = \$this->get('Pagination');";
 				}
-				// add id to list view
-				if (isset($this->customAdminViewListId[$view['settings']->code]))
-				{
-					// HIDDEN_INPUT_VALUES
-					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'HIDDEN_INPUT_VALUES' . $this->hhh] = PHP_EOL . $this->_t(1) . '<input type="hidden" name="id" value="<?php echo $this->app->input->getInt(\'id\', 0); ?>" />';
-				}
-				else
-				{
-					// also set the input value HIDDEN_INPUT_VALUES
-					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'HIDDEN_INPUT_VALUES' . $this->hhh] = '';
-				}
 			}
 			// add the custom get methods
 			if (isset($view['settings']->custom_get) && ComponentbuilderHelper::checkArray($view['settings']->custom_get))
@@ -3766,14 +3755,14 @@ class Interpretation extends Fields
 			// return buttons if they were build
 			if (ComponentbuilderHelper::checkArray($buttons))
 			{
-				// only for site views
-				if ('site' === $this->target)
+				// set the custom get form method  JAVASCRIPT_FOR_BUTTONS
+				$this->fileContentDynamic[$view['settings']->code][$this->hhh . $TARGET . '_JAVASCRIPT_FOR_BUTTONS' . $this->hhh] = $this->setJavaScriptForButtons();
+				// insure the form is added (only if not form exist)
+				if (isset($view['settings']->default) && strpos($view['settings']->default, '<form') === false)
 				{
-					// set the custom get form method  SITE_JAVASCRIPT_FOR_BUTTONS
-					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_JAVASCRIPT_FOR_BUTTONS' . $this->hhh] = $this->setJavaScriptForButtons();
-					// insure the form is added
-					$this->addSiteForm[$view['settings']->code] = true;
+					$this->addCustomForm[$this->target][$view['settings']->code] = true;
 				}
+
 				return PHP_EOL . implode(PHP_EOL, $buttons);
 			}
 		}
@@ -4458,32 +4447,59 @@ class Interpretation extends Fields
 				$body[] = $this->_t(2) . '<?php echo $this->pagination->getPagesLinks(); ?>';
 				$body[] = $this->_t(1) . '</div>';
 				$body[] = '<?php endif; ?>';
-				// insure the form is added
-				$this->addSiteForm[$view['settings']->code] = true;
+				// insure the form is added (only if no form exist)
+				if (strpos($view['settings']->default, '<form') === false)
+				{
+					$this->addCustomForm[$this->target][$view['settings']->code] = true;
+				}
 				// return the body
 				return implode(PHP_EOL, $body);
 			}
 			else
 			{
+				// insure the form is added (only if no form exist)
+				if ('admin' === $this->target && strpos($view['settings']->default, '<form') === false)
+				{
+					$this->addCustomForm[$this->target][$view['settings']->code] = true;
+				}
 				return PHP_EOL . $this->setPlaceholders($view['settings']->default, $this->placeholders);
 			}
 		}
 		return '';
 	}
-	
-	public function setCustomViewForm(&$view, $type)
+
+	public function setCustomViewForm(&$view, &$gettype, $type)
 	{
-		if (isset($this->addSiteForm[$view]) && $this->addSiteForm[$view])
+		if (isset($this->addCustomForm[$this->target]) && isset($this->addCustomForm[$this->target][$view]) && $this->addCustomForm[$this->target][$view])
 		{
 			switch($type)
 			{
 				case 1:
 					// top
-					return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '\'); ?>" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
+					if ('site' === $this->target)
+					{
+						return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '\'); ?>" method="post" name="adminForm" id="adminForm">' . PHP_EOL;
+					}
+					else
+					{
+						if ($gettype == 2)
+						{
+							return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '&view=' . $view . '\'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">' . PHP_EOL;
+						}
+						else
+						{
+							return '<form action="<?php echo JRoute::_(\'index.php?option=com_' . $this->componentCodeName . '&view=' . $view . '\' . $urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">' . PHP_EOL;
+						}
+					}
 					break;
 				case 2:
 					// bottom
-					return PHP_EOL . '<input type="hidden" name="task" value="" />' . PHP_EOL . "<?php echo JHtml::_('form.token'); ?>" . PHP_EOL . '</form>';
+					$input = '';
+					if ('admin' === $this->target && isset($this->customAdminViewListId[$view]))
+					{
+						$input = PHP_EOL . $this->_t(1) . '<input type="hidden" name="id" value="<?php echo $this->app->input->getInt(\'id\', 0); ?>" />';
+					}
+					return $input . PHP_EOL . '<input type="hidden" name="task" value="" />' . PHP_EOL . "<?php echo JHtml::_('form.token'); ?>" . PHP_EOL . '</form>';
 					break;
 			}
 		}
@@ -4495,7 +4511,7 @@ class Interpretation extends Fields
 		if (ComponentbuilderHelper::checkString($view['settings']->default))
 		{
 			// add the script only if there is none set
-			if (strpos($view['settings']->default, 'Joomla.submitbutton = function(task)') === false)
+			if (strpos($view['settings']->default, 'Joomla.submitbutton = function(') === false)
 			{
 				$script = array();
 				$script[] = PHP_EOL . "<script type=\"text/javascript\">";
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 52ffc40b3..0c358ed86 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -698,6 +698,10 @@ class Infusion extends Interpretation
 					// setup the templates
 					$this->setCustomViewTemplateBody($view);
 
+					// set the site form if needed
+					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 1);
+					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'CUSTOM_ADMIN_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 2);
+
 					// Trigger Event: jcb_ce_onAfterBuildCustomAdminViewContent
 					$this->triggerEvent('jcb_ce_onAfterBuildCustomAdminViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
 				}
@@ -940,8 +944,8 @@ class Infusion extends Interpretation
 					$this->setCustomViewTemplateBody($view);
 		
 					// set the site form if needed
-					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 1);
-					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, 2);
+					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_TOP_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 1);
+					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_BOTTOM_FORM' . $this->hhh] = $this->setCustomViewForm($view['settings']->code, $view['settings']->main_get->gettype, 2);
 
 					// Trigger Event: jcb_ce_onAfterBuildSiteViewContent
 					$this->triggerEvent('jcb_ce_onAfterBuildSiteViewContent', array(&$this->componentContext, &$view, &$view['settings']->code, &$this->fileContentStatic, &$this->fileContentDynamic[$view['settings']->code], &$this->placeholders, &$this->hhh));
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index c340a7d36..caab3f80f 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->vymfields;
+$items = $displayData->vyffields;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
index 97ac46d71..3136d8ea6 100644
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@@ -13,7 +13,7 @@
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
-$items = $displayData->vywlinked_components;
+$items = $displayData->vyplinked_components;
 $user = JFactory::getUser();
 $id = $displayData->item->id;
 // set the edit URL
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index c0eb66434..67eb8f682 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -247,7 +247,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVymfields()
+	public function getVyffields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -335,13 +335,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVymfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationVyffields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVymfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationVyffields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVymfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationVyffields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVymfields($item->store, 'store');
+					$item->store = $this->selectionTranslationVyffields($item->store, 'store');
 				}
 			}
 
@@ -355,7 +355,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationVymfields($value,$name)
+	public function selectionTranslationVyffields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index 7b4742536..2e6299c83 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -9,15 +9,15 @@
  */
 
 // Some Global Values
-jform_vvvvvzvvwl_required = false;
-jform_vvvvvzwvwm_required = false;
+jform_vvvvvzvvwj_required = false;
+jform_vvvvvzwvwk_required = false;
+jform_vvvvwaavwl_required = false;
+jform_vvvvwaavwm_required = false;
 jform_vvvvwaavwn_required = false;
 jform_vvvvwaavwo_required = false;
 jform_vvvvwaavwp_required = false;
 jform_vvvvwaavwq_required = false;
 jform_vvvvwaavwr_required = false;
-jform_vvvvwaavws_required = false;
-jform_vvvvwaavwt_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -495,26 +495,26 @@ function vvvvvzv(add_sql_vvvvvzv)
 	{
 		jQuery('#jform_source').closest('.control-group').show();
 		// add required attribute to source field
-		if (jform_vvvvvzvvwl_required)
+		if (jform_vvvvvzvvwj_required)
 		{
 			updateFieldRequired('source',0);
 			jQuery('#jform_source').prop('required','required');
 			jQuery('#jform_source').attr('aria-required',true);
 			jQuery('#jform_source').addClass('required');
-			jform_vvvvvzvvwl_required = false;
+			jform_vvvvvzvvwj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_source').closest('.control-group').hide();
 		// remove required attribute from source field
-		if (!jform_vvvvvzvvwl_required)
+		if (!jform_vvvvvzvvwj_required)
 		{
 			updateFieldRequired('source',1);
 			jQuery('#jform_source').removeAttr('required');
 			jQuery('#jform_source').removeAttr('aria-required');
 			jQuery('#jform_source').removeClass('required');
-			jform_vvvvvzvvwl_required = true;
+			jform_vvvvvzvvwj_required = true;
 		}
 	}
 }
@@ -527,26 +527,26 @@ function vvvvvzw(source_vvvvvzw,add_sql_vvvvvzw)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvzwvwm_required)
+		if (jform_vvvvvzwvwk_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvzwvwm_required = false;
+			jform_vvvvvzwvwk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvzwvwm_required)
+		if (!jform_vvvvvzwvwk_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvzwvwm_required = true;
+			jform_vvvvvzwvwk_required = true;
 		}
 	}
 }
@@ -573,148 +573,148 @@ function vvvvwaa(add_custom_import_vvvvwaa)
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').show();
 		// add required attribute to html_import_view field
-		if (jform_vvvvwaavwn_required)
+		if (jform_vvvvwaavwl_required)
 		{
 			updateFieldRequired('html_import_view',0);
 			jQuery('#jform_html_import_view').prop('required','required');
 			jQuery('#jform_html_import_view').attr('aria-required',true);
 			jQuery('#jform_html_import_view').addClass('required');
-			jform_vvvvwaavwn_required = false;
+			jform_vvvvwaavwl_required = false;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').show();
 		jQuery('#jform_php_import_display').closest('.control-group').show();
 		// add required attribute to php_import_display field
-		if (jform_vvvvwaavwo_required)
+		if (jform_vvvvwaavwm_required)
 		{
 			updateFieldRequired('php_import_display',0);
 			jQuery('#jform_php_import_display').prop('required','required');
 			jQuery('#jform_php_import_display').attr('aria-required',true);
 			jQuery('#jform_php_import_display').addClass('required');
-			jform_vvvvwaavwo_required = false;
+			jform_vvvvwaavwm_required = false;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').show();
 		// add required attribute to php_import_ext field
-		if (jform_vvvvwaavwp_required)
+		if (jform_vvvvwaavwn_required)
 		{
 			updateFieldRequired('php_import_ext',0);
 			jQuery('#jform_php_import_ext').prop('required','required');
 			jQuery('#jform_php_import_ext').attr('aria-required',true);
 			jQuery('#jform_php_import_ext').addClass('required');
-			jform_vvvvwaavwp_required = false;
+			jform_vvvvwaavwn_required = false;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').show();
 		// add required attribute to php_import_headers field
-		if (jform_vvvvwaavwq_required)
+		if (jform_vvvvwaavwo_required)
 		{
 			updateFieldRequired('php_import_headers',0);
 			jQuery('#jform_php_import_headers').prop('required','required');
 			jQuery('#jform_php_import_headers').attr('aria-required',true);
 			jQuery('#jform_php_import_headers').addClass('required');
-			jform_vvvvwaavwq_required = false;
+			jform_vvvvwaavwo_required = false;
 		}
 		jQuery('#jform_php_import').closest('.control-group').show();
 		// add required attribute to php_import field
-		if (jform_vvvvwaavwr_required)
+		if (jform_vvvvwaavwp_required)
 		{
 			updateFieldRequired('php_import',0);
 			jQuery('#jform_php_import').prop('required','required');
 			jQuery('#jform_php_import').attr('aria-required',true);
 			jQuery('#jform_php_import').addClass('required');
-			jform_vvvvwaavwr_required = false;
+			jform_vvvvwaavwp_required = false;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').show();
 		// add required attribute to php_import_save field
-		if (jform_vvvvwaavws_required)
+		if (jform_vvvvwaavwq_required)
 		{
 			updateFieldRequired('php_import_save',0);
 			jQuery('#jform_php_import_save').prop('required','required');
 			jQuery('#jform_php_import_save').attr('aria-required',true);
 			jQuery('#jform_php_import_save').addClass('required');
-			jform_vvvvwaavws_required = false;
+			jform_vvvvwaavwq_required = false;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
 		// add required attribute to php_import_setdata field
-		if (jform_vvvvwaavwt_required)
+		if (jform_vvvvwaavwr_required)
 		{
 			updateFieldRequired('php_import_setdata',0);
 			jQuery('#jform_php_import_setdata').prop('required','required');
 			jQuery('#jform_php_import_setdata').attr('aria-required',true);
 			jQuery('#jform_php_import_setdata').addClass('required');
-			jform_vvvvwaavwt_required = false;
+			jform_vvvvwaavwr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').hide();
 		// remove required attribute from html_import_view field
-		if (!jform_vvvvwaavwn_required)
+		if (!jform_vvvvwaavwl_required)
 		{
 			updateFieldRequired('html_import_view',1);
 			jQuery('#jform_html_import_view').removeAttr('required');
 			jQuery('#jform_html_import_view').removeAttr('aria-required');
 			jQuery('#jform_html_import_view').removeClass('required');
-			jform_vvvvwaavwn_required = true;
+			jform_vvvvwaavwl_required = true;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').hide();
 		jQuery('#jform_php_import_display').closest('.control-group').hide();
 		// remove required attribute from php_import_display field
-		if (!jform_vvvvwaavwo_required)
+		if (!jform_vvvvwaavwm_required)
 		{
 			updateFieldRequired('php_import_display',1);
 			jQuery('#jform_php_import_display').removeAttr('required');
 			jQuery('#jform_php_import_display').removeAttr('aria-required');
 			jQuery('#jform_php_import_display').removeClass('required');
-			jform_vvvvwaavwo_required = true;
+			jform_vvvvwaavwm_required = true;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').hide();
 		// remove required attribute from php_import_ext field
-		if (!jform_vvvvwaavwp_required)
+		if (!jform_vvvvwaavwn_required)
 		{
 			updateFieldRequired('php_import_ext',1);
 			jQuery('#jform_php_import_ext').removeAttr('required');
 			jQuery('#jform_php_import_ext').removeAttr('aria-required');
 			jQuery('#jform_php_import_ext').removeClass('required');
-			jform_vvvvwaavwp_required = true;
+			jform_vvvvwaavwn_required = true;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').hide();
 		// remove required attribute from php_import_headers field
-		if (!jform_vvvvwaavwq_required)
+		if (!jform_vvvvwaavwo_required)
 		{
 			updateFieldRequired('php_import_headers',1);
 			jQuery('#jform_php_import_headers').removeAttr('required');
 			jQuery('#jform_php_import_headers').removeAttr('aria-required');
 			jQuery('#jform_php_import_headers').removeClass('required');
-			jform_vvvvwaavwq_required = true;
+			jform_vvvvwaavwo_required = true;
 		}
 		jQuery('#jform_php_import').closest('.control-group').hide();
 		// remove required attribute from php_import field
-		if (!jform_vvvvwaavwr_required)
+		if (!jform_vvvvwaavwp_required)
 		{
 			updateFieldRequired('php_import',1);
 			jQuery('#jform_php_import').removeAttr('required');
 			jQuery('#jform_php_import').removeAttr('aria-required');
 			jQuery('#jform_php_import').removeClass('required');
-			jform_vvvvwaavwr_required = true;
+			jform_vvvvwaavwp_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
 		// remove required attribute from php_import_save field
-		if (!jform_vvvvwaavws_required)
+		if (!jform_vvvvwaavwq_required)
 		{
 			updateFieldRequired('php_import_save',1);
 			jQuery('#jform_php_import_save').removeAttr('required');
 			jQuery('#jform_php_import_save').removeAttr('aria-required');
 			jQuery('#jform_php_import_save').removeClass('required');
-			jform_vvvvwaavws_required = true;
+			jform_vvvvwaavwq_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
 		// remove required attribute from php_import_setdata field
-		if (!jform_vvvvwaavwt_required)
+		if (!jform_vvvvwaavwr_required)
 		{
 			updateFieldRequired('php_import_setdata',1);
 			jQuery('#jform_php_import_setdata').removeAttr('required');
 			jQuery('#jform_php_import_setdata').removeAttr('aria-required');
 			jQuery('#jform_php_import_setdata').removeClass('required');
-			jform_vvvvwaavwt_required = true;
+			jform_vvvvwaavwr_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/class_method.js b/admin/models/forms/class_method.js
index 5a1c75005..678a8fac1 100644
--- a/admin/models/forms/class_method.js
+++ b/admin/models/forms/class_method.js
@@ -9,7 +9,7 @@
  */
 
 // Some Global Values
-jform_vvvvwcgvxm_required = false;
+jform_vvvvwcgvxk_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvwcg(extension_type_vvvvwcg)
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').show();
 		// add required attribute to joomla_plugin_group field
-		if (jform_vvvvwcgvxm_required)
+		if (jform_vvvvwcgvxk_required)
 		{
 			updateFieldRequired('joomla_plugin_group',0);
 			jQuery('#jform_joomla_plugin_group').prop('required','required');
 			jQuery('#jform_joomla_plugin_group').attr('aria-required',true);
 			jQuery('#jform_joomla_plugin_group').addClass('required');
-			jform_vvvvwcgvxm_required = false;
+			jform_vvvvwcgvxk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').hide();
 		// remove required attribute from joomla_plugin_group field
-		if (!jform_vvvvwcgvxm_required)
+		if (!jform_vvvvwcgvxk_required)
 		{
 			updateFieldRequired('joomla_plugin_group',1);
 			jQuery('#jform_joomla_plugin_group').removeAttr('required');
 			jQuery('#jform_joomla_plugin_group').removeAttr('aria-required');
 			jQuery('#jform_joomla_plugin_group').removeClass('required');
-			jform_vvvvwcgvxm_required = true;
+			jform_vvvvwcgvxk_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/class_property.js b/admin/models/forms/class_property.js
index 90e26773a..3ad4190b9 100644
--- a/admin/models/forms/class_property.js
+++ b/admin/models/forms/class_property.js
@@ -9,7 +9,7 @@
  */
 
 // Some Global Values
-jform_vvvvwcfvxl_required = false;
+jform_vvvvwcfvxj_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -39,26 +39,26 @@ function vvvvwcf(extension_type_vvvvwcf)
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').show();
 		// add required attribute to joomla_plugin_group field
-		if (jform_vvvvwcfvxl_required)
+		if (jform_vvvvwcfvxj_required)
 		{
 			updateFieldRequired('joomla_plugin_group',0);
 			jQuery('#jform_joomla_plugin_group').prop('required','required');
 			jQuery('#jform_joomla_plugin_group').attr('aria-required',true);
 			jQuery('#jform_joomla_plugin_group').addClass('required');
-			jform_vvvvwcfvxl_required = false;
+			jform_vvvvwcfvxj_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_joomla_plugin_group').closest('.control-group').hide();
 		// remove required attribute from joomla_plugin_group field
-		if (!jform_vvvvwcfvxl_required)
+		if (!jform_vvvvwcfvxj_required)
 		{
 			updateFieldRequired('joomla_plugin_group',1);
 			jQuery('#jform_joomla_plugin_group').removeAttr('required');
 			jQuery('#jform_joomla_plugin_group').removeAttr('aria-required');
 			jQuery('#jform_joomla_plugin_group').removeClass('required');
-			jform_vvvvwcfvxl_required = true;
+			jform_vvvvwcfvxj_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index b37797509..bd643a77d 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -9,10 +9,10 @@
  */
 
 // Some Global Values
-jform_vvvvwcbvxh_required = false;
+jform_vvvvwcbvxf_required = false;
+jform_vvvvwccvxg_required = false;
+jform_vvvvwccvxh_required = false;
 jform_vvvvwccvxi_required = false;
-jform_vvvvwccvxj_required = false;
-jform_vvvvwccvxk_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -40,13 +40,13 @@ function vvvvwcb(target_vvvvwcb)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
 		// add required attribute to function_name field
-		if (jform_vvvvwcbvxh_required)
+		if (jform_vvvvwcbvxf_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvwcbvxh_required = false;
+			jform_vvvvwcbvxf_required = false;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
 		jQuery('#jform_system_name').closest('.control-group').show();
@@ -55,13 +55,13 @@ function vvvvwcb(target_vvvvwcb)
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
 		// remove required attribute from function_name field
-		if (!jform_vvvvwcbvxh_required)
+		if (!jform_vvvvwcbvxf_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvwcbvxh_required = true;
+			jform_vvvvwcbvxf_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
@@ -76,72 +76,72 @@ function vvvvwcc(target_vvvvwcc)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
 		// add required attribute to component field
-		if (jform_vvvvwccvxi_required)
+		if (jform_vvvvwccvxg_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwccvxi_required = false;
+			jform_vvvvwccvxg_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvwccvxj_required)
+		if (jform_vvvvwccvxh_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwccvxj_required = false;
+			jform_vvvvwccvxh_required = false;
 		}
 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
 		// add required attribute to type field
-		if (jform_vvvvwccvxk_required)
+		if (jform_vvvvwccvxi_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwccvxk_required = false;
+			jform_vvvvwccvxi_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
 		// remove required attribute from component field
-		if (!jform_vvvvwccvxi_required)
+		if (!jform_vvvvwccvxg_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwccvxi_required = true;
+			jform_vvvvwccvxg_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvwccvxj_required)
+		if (!jform_vvvvwccvxh_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwccvxj_required = true;
+			jform_vvvvwccvxh_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
 		// remove required attribute from type field
-		if (!jform_vvvvwccvxk_required)
+		if (!jform_vvvvwccvxi_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwccvxk_required = true;
+			jform_vvvvwccvxi_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index 0dd4495a4..087bc2fc1 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -9,19 +9,19 @@
  */
 
 // Some Global Values
-jform_vvvvwbavwu_required = false;
-jform_vvvvwbcvwv_required = false;
-jform_vvvvwbdvww_required = false;
-jform_vvvvwbevwx_required = false;
-jform_vvvvwbfvwy_required = false;
-jform_vvvvwbqvwz_required = false;
-jform_vvvvwbqvxa_required = false;
+jform_vvvvwbavws_required = false;
+jform_vvvvwbcvwt_required = false;
+jform_vvvvwbdvwu_required = false;
+jform_vvvvwbevwv_required = false;
+jform_vvvvwbfvww_required = false;
+jform_vvvvwbqvwx_required = false;
+jform_vvvvwbqvwy_required = false;
+jform_vvvvwbvvwz_required = false;
+jform_vvvvwbvvxa_required = false;
 jform_vvvvwbvvxb_required = false;
-jform_vvvvwbvvxc_required = false;
-jform_vvvvwbvvxd_required = false;
-jform_vvvvwbwvxe_required = false;
-jform_vvvvwbxvxf_required = false;
-jform_vvvvwbyvxg_required = false;
+jform_vvvvwbwvxc_required = false;
+jform_vvvvwbxvxd_required = false;
+jform_vvvvwbyvxe_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -122,26 +122,26 @@ function vvvvwba(gettype_vvvvwba)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
 		// add required attribute to getcustom field
-		if (jform_vvvvwbavwu_required)
+		if (jform_vvvvwbavws_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvwbavwu_required = false;
+			jform_vvvvwbavws_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_getcustom').closest('.control-group').hide();
 		// remove required attribute from getcustom field
-		if (!jform_vvvvwbavwu_required)
+		if (!jform_vvvvwbavws_required)
 		{
 			updateFieldRequired('getcustom',1);
 			jQuery('#jform_getcustom').removeAttr('required');
 			jQuery('#jform_getcustom').removeAttr('aria-required');
 			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvwbavwu_required = true;
+			jform_vvvvwbavws_required = true;
 		}
 	}
 }
@@ -216,26 +216,26 @@ function vvvvwbc(main_source_vvvvwbc)
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').show();
 		// add required attribute to view_table_main field
-		if (jform_vvvvwbcvwv_required)
+		if (jform_vvvvwbcvwt_required)
 		{
 			updateFieldRequired('view_table_main',0);
 			jQuery('#jform_view_table_main').prop('required','required');
 			jQuery('#jform_view_table_main').attr('aria-required',true);
 			jQuery('#jform_view_table_main').addClass('required');
-			jform_vvvvwbcvwv_required = false;
+			jform_vvvvwbcvwt_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_view_table_main').closest('.control-group').hide();
 		// remove required attribute from view_table_main field
-		if (!jform_vvvvwbcvwv_required)
+		if (!jform_vvvvwbcvwt_required)
 		{
 			updateFieldRequired('view_table_main',1);
 			jQuery('#jform_view_table_main').removeAttr('required');
 			jQuery('#jform_view_table_main').removeAttr('aria-required');
 			jQuery('#jform_view_table_main').removeClass('required');
-			jform_vvvvwbcvwv_required = true;
+			jform_vvvvwbcvwt_required = true;
 		}
 	}
 }
@@ -272,26 +272,26 @@ function vvvvwbd(main_source_vvvvwbd)
 	{
 		jQuery('#jform_view_selection').closest('.control-group').show();
 		// add required attribute to view_selection field
-		if (jform_vvvvwbdvww_required)
+		if (jform_vvvvwbdvwu_required)
 		{
 			updateFieldRequired('view_selection',0);
 			jQuery('#jform_view_selection').prop('required','required');
 			jQuery('#jform_view_selection').attr('aria-required',true);
 			jQuery('#jform_view_selection').addClass('required');
-			jform_vvvvwbdvww_required = false;
+			jform_vvvvwbdvwu_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_view_selection').closest('.control-group').hide();
 		// remove required attribute from view_selection field
-		if (!jform_vvvvwbdvww_required)
+		if (!jform_vvvvwbdvwu_required)
 		{
 			updateFieldRequired('view_selection',1);
 			jQuery('#jform_view_selection').removeAttr('required');
 			jQuery('#jform_view_selection').removeAttr('aria-required');
 			jQuery('#jform_view_selection').removeClass('required');
-			jform_vvvvwbdvww_required = true;
+			jform_vvvvwbdvwu_required = true;
 		}
 	}
 }
@@ -328,26 +328,26 @@ function vvvvwbe(main_source_vvvvwbe)
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').show();
 		// add required attribute to db_table_main field
-		if (jform_vvvvwbevwx_required)
+		if (jform_vvvvwbevwv_required)
 		{
 			updateFieldRequired('db_table_main',0);
 			jQuery('#jform_db_table_main').prop('required','required');
 			jQuery('#jform_db_table_main').attr('aria-required',true);
 			jQuery('#jform_db_table_main').addClass('required');
-			jform_vvvvwbevwx_required = false;
+			jform_vvvvwbevwv_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_db_table_main').closest('.control-group').hide();
 		// remove required attribute from db_table_main field
-		if (!jform_vvvvwbevwx_required)
+		if (!jform_vvvvwbevwv_required)
 		{
 			updateFieldRequired('db_table_main',1);
 			jQuery('#jform_db_table_main').removeAttr('required');
 			jQuery('#jform_db_table_main').removeAttr('aria-required');
 			jQuery('#jform_db_table_main').removeClass('required');
-			jform_vvvvwbevwx_required = true;
+			jform_vvvvwbevwv_required = true;
 		}
 	}
 }
@@ -384,26 +384,26 @@ function vvvvwbf(main_source_vvvvwbf)
 	{
 		jQuery('#jform_db_selection').closest('.control-group').show();
 		// add required attribute to db_selection field
-		if (jform_vvvvwbfvwy_required)
+		if (jform_vvvvwbfvww_required)
 		{
 			updateFieldRequired('db_selection',0);
 			jQuery('#jform_db_selection').prop('required','required');
 			jQuery('#jform_db_selection').attr('aria-required',true);
 			jQuery('#jform_db_selection').addClass('required');
-			jform_vvvvwbfvwy_required = false;
+			jform_vvvvwbfvww_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_db_selection').closest('.control-group').hide();
 		// remove required attribute from db_selection field
-		if (!jform_vvvvwbfvwy_required)
+		if (!jform_vvvvwbfvww_required)
 		{
 			updateFieldRequired('db_selection',1);
 			jQuery('#jform_db_selection').removeAttr('required');
 			jQuery('#jform_db_selection').removeAttr('aria-required');
 			jQuery('#jform_db_selection').removeClass('required');
-			jform_vvvvwbfvwy_required = true;
+			jform_vvvvwbfvww_required = true;
 		}
 	}
 }
@@ -786,46 +786,46 @@ function vvvvwbq(gettype_vvvvwbq)
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
 		// add required attribute to add_php_after_getitem field
-		if (jform_vvvvwbqvwz_required)
+		if (jform_vvvvwbqvwx_required)
 		{
 			updateFieldRequired('add_php_after_getitem',0);
 			jQuery('#jform_add_php_after_getitem').prop('required','required');
 			jQuery('#jform_add_php_after_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitem').addClass('required');
-			jform_vvvvwbqvwz_required = false;
+			jform_vvvvwbqvwx_required = false;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
 		// add required attribute to add_php_before_getitem field
-		if (jform_vvvvwbqvxa_required)
+		if (jform_vvvvwbqvwy_required)
 		{
 			updateFieldRequired('add_php_before_getitem',0);
 			jQuery('#jform_add_php_before_getitem').prop('required','required');
 			jQuery('#jform_add_php_before_getitem').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitem').addClass('required');
-			jform_vvvvwbqvxa_required = false;
+			jform_vvvvwbqvwy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
 		// remove required attribute from add_php_after_getitem field
-		if (!jform_vvvvwbqvwz_required)
+		if (!jform_vvvvwbqvwx_required)
 		{
 			updateFieldRequired('add_php_after_getitem',1);
 			jQuery('#jform_add_php_after_getitem').removeAttr('required');
 			jQuery('#jform_add_php_after_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitem').removeClass('required');
-			jform_vvvvwbqvwz_required = true;
+			jform_vvvvwbqvwx_required = true;
 		}
 		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
 		// remove required attribute from add_php_before_getitem field
-		if (!jform_vvvvwbqvxa_required)
+		if (!jform_vvvvwbqvwy_required)
 		{
 			updateFieldRequired('add_php_before_getitem',1);
 			jQuery('#jform_add_php_before_getitem').removeAttr('required');
 			jQuery('#jform_add_php_before_getitem').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitem').removeClass('required');
-			jform_vvvvwbqvxa_required = true;
+			jform_vvvvwbqvwy_required = true;
 		}
 	}
 }
@@ -1045,66 +1045,66 @@ function vvvvwbv(gettype_vvvvwbv)
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
 		// add required attribute to add_php_after_getitems field
-		if (jform_vvvvwbvvxb_required)
+		if (jform_vvvvwbvvwz_required)
 		{
 			updateFieldRequired('add_php_after_getitems',0);
 			jQuery('#jform_add_php_after_getitems').prop('required','required');
 			jQuery('#jform_add_php_after_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_after_getitems').addClass('required');
-			jform_vvvvwbvvxb_required = false;
+			jform_vvvvwbvvwz_required = false;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
 		// add required attribute to add_php_before_getitems field
-		if (jform_vvvvwbvvxc_required)
+		if (jform_vvvvwbvvxa_required)
 		{
 			updateFieldRequired('add_php_before_getitems',0);
 			jQuery('#jform_add_php_before_getitems').prop('required','required');
 			jQuery('#jform_add_php_before_getitems').attr('aria-required',true);
 			jQuery('#jform_add_php_before_getitems').addClass('required');
-			jform_vvvvwbvvxc_required = false;
+			jform_vvvvwbvvxa_required = false;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
 		// add required attribute to add_php_getlistquery field
-		if (jform_vvvvwbvvxd_required)
+		if (jform_vvvvwbvvxb_required)
 		{
 			updateFieldRequired('add_php_getlistquery',0);
 			jQuery('#jform_add_php_getlistquery').prop('required','required');
 			jQuery('#jform_add_php_getlistquery').attr('aria-required',true);
 			jQuery('#jform_add_php_getlistquery').addClass('required');
-			jform_vvvvwbvvxd_required = false;
+			jform_vvvvwbvvxb_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
 		// remove required attribute from add_php_after_getitems field
-		if (!jform_vvvvwbvvxb_required)
+		if (!jform_vvvvwbvvwz_required)
 		{
 			updateFieldRequired('add_php_after_getitems',1);
 			jQuery('#jform_add_php_after_getitems').removeAttr('required');
 			jQuery('#jform_add_php_after_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_after_getitems').removeClass('required');
-			jform_vvvvwbvvxb_required = true;
+			jform_vvvvwbvvwz_required = true;
 		}
 		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
 		// remove required attribute from add_php_before_getitems field
-		if (!jform_vvvvwbvvxc_required)
+		if (!jform_vvvvwbvvxa_required)
 		{
 			updateFieldRequired('add_php_before_getitems',1);
 			jQuery('#jform_add_php_before_getitems').removeAttr('required');
 			jQuery('#jform_add_php_before_getitems').removeAttr('aria-required');
 			jQuery('#jform_add_php_before_getitems').removeClass('required');
-			jform_vvvvwbvvxc_required = true;
+			jform_vvvvwbvvxa_required = true;
 		}
 		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
 		// remove required attribute from add_php_getlistquery field
-		if (!jform_vvvvwbvvxd_required)
+		if (!jform_vvvvwbvvxb_required)
 		{
 			updateFieldRequired('add_php_getlistquery',1);
 			jQuery('#jform_add_php_getlistquery').removeAttr('required');
 			jQuery('#jform_add_php_getlistquery').removeAttr('aria-required');
 			jQuery('#jform_add_php_getlistquery').removeClass('required');
-			jform_vvvvwbvvxd_required = true;
+			jform_vvvvwbvvxb_required = true;
 		}
 	}
 }
@@ -1141,26 +1141,26 @@ function vvvvwbw(gettype_vvvvwbw)
 	{
 		jQuery('#jform_pagination').closest('.control-group').show();
 		// add required attribute to pagination field
-		if (jform_vvvvwbwvxe_required)
+		if (jform_vvvvwbwvxc_required)
 		{
 			updateFieldRequired('pagination',0);
 			jQuery('#jform_pagination').prop('required','required');
 			jQuery('#jform_pagination').attr('aria-required',true);
 			jQuery('#jform_pagination').addClass('required');
-			jform_vvvvwbwvxe_required = false;
+			jform_vvvvwbwvxc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_pagination').closest('.control-group').hide();
 		// remove required attribute from pagination field
-		if (!jform_vvvvwbwvxe_required)
+		if (!jform_vvvvwbwvxc_required)
 		{
 			updateFieldRequired('pagination',1);
 			jQuery('#jform_pagination').removeAttr('required');
 			jQuery('#jform_pagination').removeAttr('aria-required');
 			jQuery('#jform_pagination').removeClass('required');
-			jform_vvvvwbwvxe_required = true;
+			jform_vvvvwbwvxc_required = true;
 		}
 	}
 }
@@ -1197,26 +1197,26 @@ function vvvvwbx(gettype_vvvvwbx)
 	{
 		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
 		// add required attribute to add_php_router_parse field
-		if (jform_vvvvwbxvxf_required)
+		if (jform_vvvvwbxvxd_required)
 		{
 			updateFieldRequired('add_php_router_parse',0);
 			jQuery('#jform_add_php_router_parse').prop('required','required');
 			jQuery('#jform_add_php_router_parse').attr('aria-required',true);
 			jQuery('#jform_add_php_router_parse').addClass('required');
-			jform_vvvvwbxvxf_required = false;
+			jform_vvvvwbxvxd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
 		// remove required attribute from add_php_router_parse field
-		if (!jform_vvvvwbxvxf_required)
+		if (!jform_vvvvwbxvxd_required)
 		{
 			updateFieldRequired('add_php_router_parse',1);
 			jQuery('#jform_add_php_router_parse').removeAttr('required');
 			jQuery('#jform_add_php_router_parse').removeAttr('aria-required');
 			jQuery('#jform_add_php_router_parse').removeClass('required');
-			jform_vvvvwbxvxf_required = true;
+			jform_vvvvwbxvxd_required = true;
 		}
 	}
 }
@@ -1265,26 +1265,26 @@ function vvvvwby(gettype_vvvvwby,add_php_router_parse_vvvvwby)
 	{
 		jQuery('#jform_php_router_parse').closest('.control-group').show();
 		// add required attribute to php_router_parse field
-		if (jform_vvvvwbyvxg_required)
+		if (jform_vvvvwbyvxe_required)
 		{
 			updateFieldRequired('php_router_parse',0);
 			jQuery('#jform_php_router_parse').prop('required','required');
 			jQuery('#jform_php_router_parse').attr('aria-required',true);
 			jQuery('#jform_php_router_parse').addClass('required');
-			jform_vvvvwbyvxg_required = false;
+			jform_vvvvwbyvxe_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_router_parse').closest('.control-group').hide();
 		// remove required attribute from php_router_parse field
-		if (!jform_vvvvwbyvxg_required)
+		if (!jform_vvvvwbyvxe_required)
 		{
 			updateFieldRequired('php_router_parse',1);
 			jQuery('#jform_php_router_parse').removeAttr('required');
 			jQuery('#jform_php_router_parse').removeAttr('aria-required');
 			jQuery('#jform_php_router_parse').removeClass('required');
-			jform_vvvvwbyvxg_required = true;
+			jform_vvvvwbyvxe_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index ef06915f0..4fc58d96e 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -9,19 +9,15 @@
  */
 
 // Some Global Values
-jform_vvvvwczvxr_required = false;
-jform_vvvvwdavxs_required = false;
-jform_vvvvwdbvxt_required = false;
-jform_vvvvwdcvxu_required = false;
-jform_vvvvwddvxv_required = false;
-jform_vvvvwdgvxw_required = false;
-jform_vvvvwdgvxx_required = false;
-jform_vvvvwdgvxy_required = false;
-jform_vvvvwdgvxz_required = false;
-jform_vvvvwdhvya_required = false;
-jform_vvvvwdhvyb_required = false;
-jform_vvvvwdhvyc_required = false;
-jform_vvvvwdhvyd_required = false;
+jform_vvvvwczvxo_required = false;
+jform_vvvvwdavxp_required = false;
+jform_vvvvwdbvxq_required = false;
+jform_vvvvwdcvxr_required = false;
+jform_vvvvwddvxs_required = false;
+jform_vvvvwdgvxt_required = false;
+jform_vvvvwdgvxu_required = false;
+jform_vvvvwdhvxv_required = false;
+jform_vvvvwdhvxw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -87,26 +83,26 @@ function vvvvwcz(datalenght_vvvvwcz)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwczvxr_required)
+		if (jform_vvvvwczvxo_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwczvxr_required = false;
+			jform_vvvvwczvxo_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwczvxr_required)
+		if (!jform_vvvvwczvxo_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwczvxr_required = true;
+			jform_vvvvwczvxo_required = true;
 		}
 	}
 }
@@ -143,26 +139,26 @@ function vvvvwda(datadefault_vvvvwda)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwdavxs_required)
+		if (jform_vvvvwdavxp_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwdavxs_required = false;
+			jform_vvvvwdavxp_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwdavxs_required)
+		if (!jform_vvvvwdavxp_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwdavxs_required = true;
+			jform_vvvvwdavxp_required = true;
 		}
 	}
 }
@@ -200,13 +196,13 @@ function vvvvwdb(datatype_vvvvwdb)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwdbvxt_required)
+		if (jform_vvvvwdbvxq_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwdbvxt_required = false;
+			jform_vvvvwdbvxq_required = false;
 		}
 	}
 	else
@@ -214,13 +210,13 @@ function vvvvwdb(datatype_vvvvwdb)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwdbvxt_required)
+		if (!jform_vvvvwdbvxq_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwdbvxt_required = true;
+			jform_vvvvwdbvxq_required = true;
 		}
 	}
 }
@@ -257,26 +253,26 @@ function vvvvwdc(datatype_vvvvwdc)
 	{
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		// add required attribute to datalenght field
-		if (jform_vvvvwdcvxu_required)
+		if (jform_vvvvwdcvxr_required)
 		{
 			updateFieldRequired('datalenght',0);
 			jQuery('#jform_datalenght').prop('required','required');
 			jQuery('#jform_datalenght').attr('aria-required',true);
 			jQuery('#jform_datalenght').addClass('required');
-			jform_vvvvwdcvxu_required = false;
+			jform_vvvvwdcvxr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		// remove required attribute from datalenght field
-		if (!jform_vvvvwdcvxu_required)
+		if (!jform_vvvvwdcvxr_required)
 		{
 			updateFieldRequired('datalenght',1);
 			jQuery('#jform_datalenght').removeAttr('required');
 			jQuery('#jform_datalenght').removeAttr('aria-required');
 			jQuery('#jform_datalenght').removeClass('required');
-			jform_vvvvwdcvxu_required = true;
+			jform_vvvvwdcvxr_required = true;
 		}
 	}
 }
@@ -313,26 +309,26 @@ function vvvvwdd(datatype_vvvvwdd)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
 		// add required attribute to store field
-		if (jform_vvvvwddvxv_required)
+		if (jform_vvvvwddvxs_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwddvxv_required = false;
+			jform_vvvvwddvxs_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
 		// remove required attribute from store field
-		if (!jform_vvvvwddvxv_required)
+		if (!jform_vvvvwddvxs_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwddvxv_required = true;
+			jform_vvvvwddvxs_required = true;
 		}
 	}
 }
@@ -441,89 +437,53 @@ function vvvvwdg(store_vvvvwdg,datatype_vvvvwdg)
 	if (store && datatype)
 	{
 		jQuery('#jform_initiator_on_get_model').closest('.control-group').show();
-		// add required attribute to initiator_on_get_model field
-		if (jform_vvvvwdgvxw_required)
-		{
-			updateFieldRequired('initiator_on_get_model',0);
-			jQuery('#jform_initiator_on_get_model').prop('required','required');
-			jQuery('#jform_initiator_on_get_model').attr('aria-required',true);
-			jQuery('#jform_initiator_on_get_model').addClass('required');
-			jform_vvvvwdgvxw_required = false;
-		}
 		jQuery('#jform_initiator_on_save_model').closest('.control-group').show();
-		// add required attribute to initiator_on_save_model field
-		if (jform_vvvvwdgvxx_required)
-		{
-			updateFieldRequired('initiator_on_save_model',0);
-			jQuery('#jform_initiator_on_save_model').prop('required','required');
-			jQuery('#jform_initiator_on_save_model').attr('aria-required',true);
-			jQuery('#jform_initiator_on_save_model').addClass('required');
-			jform_vvvvwdgvxx_required = false;
-		}
 		jQuery('#jform_on_save_model_field').closest('.control-group').show();
 		// add required attribute to on_save_model_field field
-		if (jform_vvvvwdgvxy_required)
+		if (jform_vvvvwdgvxt_required)
 		{
 			updateFieldRequired('on_save_model_field',0);
 			jQuery('#jform_on_save_model_field').prop('required','required');
 			jQuery('#jform_on_save_model_field').attr('aria-required',true);
 			jQuery('#jform_on_save_model_field').addClass('required');
-			jform_vvvvwdgvxy_required = false;
+			jform_vvvvwdgvxt_required = false;
 		}
 		jQuery('.note_expert_field_save_mode').closest('.control-group').show();
 		jQuery('#jform_on_get_model_field').closest('.control-group').show();
 		// add required attribute to on_get_model_field field
-		if (jform_vvvvwdgvxz_required)
+		if (jform_vvvvwdgvxu_required)
 		{
 			updateFieldRequired('on_get_model_field',0);
 			jQuery('#jform_on_get_model_field').prop('required','required');
 			jQuery('#jform_on_get_model_field').attr('aria-required',true);
 			jQuery('#jform_on_get_model_field').addClass('required');
-			jform_vvvvwdgvxz_required = false;
+			jform_vvvvwdgvxu_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_initiator_on_get_model').closest('.control-group').hide();
-		// remove required attribute from initiator_on_get_model field
-		if (!jform_vvvvwdgvxw_required)
-		{
-			updateFieldRequired('initiator_on_get_model',1);
-			jQuery('#jform_initiator_on_get_model').removeAttr('required');
-			jQuery('#jform_initiator_on_get_model').removeAttr('aria-required');
-			jQuery('#jform_initiator_on_get_model').removeClass('required');
-			jform_vvvvwdgvxw_required = true;
-		}
 		jQuery('#jform_initiator_on_save_model').closest('.control-group').hide();
-		// remove required attribute from initiator_on_save_model field
-		if (!jform_vvvvwdgvxx_required)
-		{
-			updateFieldRequired('initiator_on_save_model',1);
-			jQuery('#jform_initiator_on_save_model').removeAttr('required');
-			jQuery('#jform_initiator_on_save_model').removeAttr('aria-required');
-			jQuery('#jform_initiator_on_save_model').removeClass('required');
-			jform_vvvvwdgvxx_required = true;
-		}
 		jQuery('#jform_on_save_model_field').closest('.control-group').hide();
 		// remove required attribute from on_save_model_field field
-		if (!jform_vvvvwdgvxy_required)
+		if (!jform_vvvvwdgvxt_required)
 		{
 			updateFieldRequired('on_save_model_field',1);
 			jQuery('#jform_on_save_model_field').removeAttr('required');
 			jQuery('#jform_on_save_model_field').removeAttr('aria-required');
 			jQuery('#jform_on_save_model_field').removeClass('required');
-			jform_vvvvwdgvxy_required = true;
+			jform_vvvvwdgvxt_required = true;
 		}
 		jQuery('.note_expert_field_save_mode').closest('.control-group').hide();
 		jQuery('#jform_on_get_model_field').closest('.control-group').hide();
 		// remove required attribute from on_get_model_field field
-		if (!jform_vvvvwdgvxz_required)
+		if (!jform_vvvvwdgvxu_required)
 		{
 			updateFieldRequired('on_get_model_field',1);
 			jQuery('#jform_on_get_model_field').removeAttr('required');
 			jQuery('#jform_on_get_model_field').removeAttr('aria-required');
 			jQuery('#jform_on_get_model_field').removeClass('required');
-			jform_vvvvwdgvxz_required = true;
+			jform_vvvvwdgvxu_required = true;
 		}
 	}
 }
@@ -582,89 +542,53 @@ function vvvvwdh(datatype_vvvvwdh,store_vvvvwdh)
 	if (datatype && store)
 	{
 		jQuery('#jform_initiator_on_get_model').closest('.control-group').show();
-		// add required attribute to initiator_on_get_model field
-		if (jform_vvvvwdhvya_required)
-		{
-			updateFieldRequired('initiator_on_get_model',0);
-			jQuery('#jform_initiator_on_get_model').prop('required','required');
-			jQuery('#jform_initiator_on_get_model').attr('aria-required',true);
-			jQuery('#jform_initiator_on_get_model').addClass('required');
-			jform_vvvvwdhvya_required = false;
-		}
 		jQuery('#jform_initiator_on_save_model').closest('.control-group').show();
-		// add required attribute to initiator_on_save_model field
-		if (jform_vvvvwdhvyb_required)
-		{
-			updateFieldRequired('initiator_on_save_model',0);
-			jQuery('#jform_initiator_on_save_model').prop('required','required');
-			jQuery('#jform_initiator_on_save_model').attr('aria-required',true);
-			jQuery('#jform_initiator_on_save_model').addClass('required');
-			jform_vvvvwdhvyb_required = false;
-		}
 		jQuery('#jform_on_save_model_field').closest('.control-group').show();
 		// add required attribute to on_save_model_field field
-		if (jform_vvvvwdhvyc_required)
+		if (jform_vvvvwdhvxv_required)
 		{
 			updateFieldRequired('on_save_model_field',0);
 			jQuery('#jform_on_save_model_field').prop('required','required');
 			jQuery('#jform_on_save_model_field').attr('aria-required',true);
 			jQuery('#jform_on_save_model_field').addClass('required');
-			jform_vvvvwdhvyc_required = false;
+			jform_vvvvwdhvxv_required = false;
 		}
 		jQuery('.note_expert_field_save_mode').closest('.control-group').show();
 		jQuery('#jform_on_get_model_field').closest('.control-group').show();
 		// add required attribute to on_get_model_field field
-		if (jform_vvvvwdhvyd_required)
+		if (jform_vvvvwdhvxw_required)
 		{
 			updateFieldRequired('on_get_model_field',0);
 			jQuery('#jform_on_get_model_field').prop('required','required');
 			jQuery('#jform_on_get_model_field').attr('aria-required',true);
 			jQuery('#jform_on_get_model_field').addClass('required');
-			jform_vvvvwdhvyd_required = false;
+			jform_vvvvwdhvxw_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_initiator_on_get_model').closest('.control-group').hide();
-		// remove required attribute from initiator_on_get_model field
-		if (!jform_vvvvwdhvya_required)
-		{
-			updateFieldRequired('initiator_on_get_model',1);
-			jQuery('#jform_initiator_on_get_model').removeAttr('required');
-			jQuery('#jform_initiator_on_get_model').removeAttr('aria-required');
-			jQuery('#jform_initiator_on_get_model').removeClass('required');
-			jform_vvvvwdhvya_required = true;
-		}
 		jQuery('#jform_initiator_on_save_model').closest('.control-group').hide();
-		// remove required attribute from initiator_on_save_model field
-		if (!jform_vvvvwdhvyb_required)
-		{
-			updateFieldRequired('initiator_on_save_model',1);
-			jQuery('#jform_initiator_on_save_model').removeAttr('required');
-			jQuery('#jform_initiator_on_save_model').removeAttr('aria-required');
-			jQuery('#jform_initiator_on_save_model').removeClass('required');
-			jform_vvvvwdhvyb_required = true;
-		}
 		jQuery('#jform_on_save_model_field').closest('.control-group').hide();
 		// remove required attribute from on_save_model_field field
-		if (!jform_vvvvwdhvyc_required)
+		if (!jform_vvvvwdhvxv_required)
 		{
 			updateFieldRequired('on_save_model_field',1);
 			jQuery('#jform_on_save_model_field').removeAttr('required');
 			jQuery('#jform_on_save_model_field').removeAttr('aria-required');
 			jQuery('#jform_on_save_model_field').removeClass('required');
-			jform_vvvvwdhvyc_required = true;
+			jform_vvvvwdhvxv_required = true;
 		}
 		jQuery('.note_expert_field_save_mode').closest('.control-group').hide();
 		jQuery('#jform_on_get_model_field').closest('.control-group').hide();
 		// remove required attribute from on_get_model_field field
-		if (!jform_vvvvwdhvyd_required)
+		if (!jform_vvvvwdhvxw_required)
 		{
 			updateFieldRequired('on_get_model_field',1);
 			jQuery('#jform_on_get_model_field').removeAttr('required');
 			jQuery('#jform_on_get_model_field').removeAttr('aria-required');
 			jQuery('#jform_on_get_model_field').removeClass('required');
-			jform_vvvvwdhvyd_required = true;
+			jform_vvvvwdhvxw_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/fieldtype.js b/admin/models/forms/fieldtype.js
index 72f876106..191e8c1e4 100644
--- a/admin/models/forms/fieldtype.js
+++ b/admin/models/forms/fieldtype.js
@@ -9,14 +9,14 @@
  */
 
 // Some Global Values
-jform_vvvvwdmvye_required = false;
-jform_vvvvwdovyf_required = false;
-jform_vvvvwdqvyg_required = false;
-jform_vvvvwdsvyh_required = false;
-jform_vvvvwdtvyi_required = false;
-jform_vvvvwduvyj_required = false;
-jform_vvvvwdzvyk_required = false;
-jform_vvvvwdzvyl_required = false;
+jform_vvvvwdmvxx_required = false;
+jform_vvvvwdovxy_required = false;
+jform_vvvvwdqvxz_required = false;
+jform_vvvvwdsvya_required = false;
+jform_vvvvwdtvyb_required = false;
+jform_vvvvwduvyc_required = false;
+jform_vvvvwdzvyd_required = false;
+jform_vvvvwdzvye_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -97,26 +97,26 @@ function vvvvwdm(datalenght_vvvvwdm,has_defaults_vvvvwdm)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
 		// add required attribute to datalenght_other field
-		if (jform_vvvvwdmvye_required)
+		if (jform_vvvvwdmvxx_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwdmvye_required = false;
+			jform_vvvvwdmvxx_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		// remove required attribute from datalenght_other field
-		if (!jform_vvvvwdmvye_required)
+		if (!jform_vvvvwdmvxx_required)
 		{
 			updateFieldRequired('datalenght_other',1);
 			jQuery('#jform_datalenght_other').removeAttr('required');
 			jQuery('#jform_datalenght_other').removeAttr('aria-required');
 			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwdmvye_required = true;
+			jform_vvvvwdmvxx_required = true;
 		}
 	}
 }
@@ -176,26 +176,26 @@ function vvvvwdo(datadefault_vvvvwdo,has_defaults_vvvvwdo)
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		// add required attribute to datadefault_other field
-		if (jform_vvvvwdovyf_required)
+		if (jform_vvvvwdovxy_required)
 		{
 			updateFieldRequired('datadefault_other',0);
 			jQuery('#jform_datadefault_other').prop('required','required');
 			jQuery('#jform_datadefault_other').attr('aria-required',true);
 			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwdovyf_required = false;
+			jform_vvvvwdovxy_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		// remove required attribute from datadefault_other field
-		if (!jform_vvvvwdovyf_required)
+		if (!jform_vvvvwdovxy_required)
 		{
 			updateFieldRequired('datadefault_other',1);
 			jQuery('#jform_datadefault_other').removeAttr('required');
 			jQuery('#jform_datadefault_other').removeAttr('aria-required');
 			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwdovyf_required = true;
+			jform_vvvvwdovxy_required = true;
 		}
 	}
 }
@@ -255,26 +255,26 @@ function vvvvwdq(datatype_vvvvwdq,has_defaults_vvvvwdq)
 	{
 		jQuery('#jform_datalenght').closest('.control-group').show();
 		// add required attribute to datalenght field
-		if (jform_vvvvwdqvyg_required)
+		if (jform_vvvvwdqvxz_required)
 		{
 			updateFieldRequired('datalenght',0);
 			jQuery('#jform_datalenght').prop('required','required');
 			jQuery('#jform_datalenght').attr('aria-required',true);
 			jQuery('#jform_datalenght').addClass('required');
-			jform_vvvvwdqvyg_required = false;
+			jform_vvvvwdqvxz_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datalenght').closest('.control-group').hide();
 		// remove required attribute from datalenght field
-		if (!jform_vvvvwdqvyg_required)
+		if (!jform_vvvvwdqvxz_required)
 		{
 			updateFieldRequired('datalenght',1);
 			jQuery('#jform_datalenght').removeAttr('required');
 			jQuery('#jform_datalenght').removeAttr('aria-required');
 			jQuery('#jform_datalenght').removeClass('required');
-			jform_vvvvwdqvyg_required = true;
+			jform_vvvvwdqvxz_required = true;
 		}
 	}
 }
@@ -335,13 +335,13 @@ function vvvvwds(datatype_vvvvwds,has_defaults_vvvvwds)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwdsvyh_required)
+		if (jform_vvvvwdsvya_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwdsvyh_required = false;
+			jform_vvvvwdsvya_required = false;
 		}
 	}
 	else
@@ -349,13 +349,13 @@ function vvvvwds(datatype_vvvvwds,has_defaults_vvvvwds)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwdsvyh_required)
+		if (!jform_vvvvwdsvya_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwdsvyh_required = true;
+			jform_vvvvwdsvya_required = true;
 		}
 	}
 }
@@ -416,13 +416,13 @@ function vvvvwdt(has_defaults_vvvvwdt,datatype_vvvvwdt)
 		jQuery('#jform_datadefault').closest('.control-group').show();
 		jQuery('#jform_indexes').closest('.control-group').show();
 		// add required attribute to indexes field
-		if (jform_vvvvwdtvyi_required)
+		if (jform_vvvvwdtvyb_required)
 		{
 			updateFieldRequired('indexes',0);
 			jQuery('#jform_indexes').prop('required','required');
 			jQuery('#jform_indexes').attr('aria-required',true);
 			jQuery('#jform_indexes').addClass('required');
-			jform_vvvvwdtvyi_required = false;
+			jform_vvvvwdtvyb_required = false;
 		}
 	}
 	else
@@ -430,13 +430,13 @@ function vvvvwdt(has_defaults_vvvvwdt,datatype_vvvvwdt)
 		jQuery('#jform_datadefault').closest('.control-group').hide();
 		jQuery('#jform_indexes').closest('.control-group').hide();
 		// remove required attribute from indexes field
-		if (!jform_vvvvwdtvyi_required)
+		if (!jform_vvvvwdtvyb_required)
 		{
 			updateFieldRequired('indexes',1);
 			jQuery('#jform_indexes').removeAttr('required');
 			jQuery('#jform_indexes').removeAttr('aria-required');
 			jQuery('#jform_indexes').removeClass('required');
-			jform_vvvvwdtvyi_required = true;
+			jform_vvvvwdtvyb_required = true;
 		}
 	}
 }
@@ -496,26 +496,26 @@ function vvvvwdu(datatype_vvvvwdu,has_defaults_vvvvwdu)
 	{
 		jQuery('#jform_store').closest('.control-group').show();
 		// add required attribute to store field
-		if (jform_vvvvwduvyj_required)
+		if (jform_vvvvwduvyc_required)
 		{
 			updateFieldRequired('store',0);
 			jQuery('#jform_store').prop('required','required');
 			jQuery('#jform_store').attr('aria-required',true);
 			jQuery('#jform_store').addClass('required');
-			jform_vvvvwduvyj_required = false;
+			jform_vvvvwduvyc_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_store').closest('.control-group').hide();
 		// remove required attribute from store field
-		if (!jform_vvvvwduvyj_required)
+		if (!jform_vvvvwduvyc_required)
 		{
 			updateFieldRequired('store',1);
 			jQuery('#jform_store').removeAttr('required');
 			jQuery('#jform_store').removeAttr('aria-required');
 			jQuery('#jform_store').removeClass('required');
-			jform_vvvvwduvyj_required = true;
+			jform_vvvvwduvyc_required = true;
 		}
 	}
 }
@@ -802,46 +802,46 @@ function vvvvwdz(has_defaults_vvvvwdz)
 	{
 		jQuery('#jform_datatype').closest('.control-group').show();
 		// add required attribute to datatype field
-		if (jform_vvvvwdzvyk_required)
+		if (jform_vvvvwdzvyd_required)
 		{
 			updateFieldRequired('datatype',0);
 			jQuery('#jform_datatype').prop('required','required');
 			jQuery('#jform_datatype').attr('aria-required',true);
 			jQuery('#jform_datatype').addClass('required');
-			jform_vvvvwdzvyk_required = false;
+			jform_vvvvwdzvyd_required = false;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').show();
 		// add required attribute to null_switch field
-		if (jform_vvvvwdzvyl_required)
+		if (jform_vvvvwdzvye_required)
 		{
 			updateFieldRequired('null_switch',0);
 			jQuery('#jform_null_switch').prop('required','required');
 			jQuery('#jform_null_switch').attr('aria-required',true);
 			jQuery('#jform_null_switch').addClass('required');
-			jform_vvvvwdzvyl_required = false;
+			jform_vvvvwdzvye_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_datatype').closest('.control-group').hide();
 		// remove required attribute from datatype field
-		if (!jform_vvvvwdzvyk_required)
+		if (!jform_vvvvwdzvyd_required)
 		{
 			updateFieldRequired('datatype',1);
 			jQuery('#jform_datatype').removeAttr('required');
 			jQuery('#jform_datatype').removeAttr('aria-required');
 			jQuery('#jform_datatype').removeClass('required');
-			jform_vvvvwdzvyk_required = true;
+			jform_vvvvwdzvyd_required = true;
 		}
 		jQuery('#jform_null_switch').closest('.control-group').hide();
 		// remove required attribute from null_switch field
-		if (!jform_vvvvwdzvyl_required)
+		if (!jform_vvvvwdzvye_required)
 		{
 			updateFieldRequired('null_switch',1);
 			jQuery('#jform_null_switch').removeAttr('required');
 			jQuery('#jform_null_switch').removeAttr('aria-required');
 			jQuery('#jform_null_switch').removeClass('required');
-			jform_vvvvwdzvyl_required = true;
+			jform_vvvvwdzvye_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index 6931c5877..3c9358b81 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -9,11 +9,11 @@
  */
 
 // Some Global Values
-jform_vvvvwekvyx_required = false;
-jform_vvvvwelvyy_required = false;
-jform_vvvvwemvyz_required = false;
-jform_vvvvwenvza_required = false;
-jform_vvvvwepvzb_required = false;
+jform_vvvvwekvyq_required = false;
+jform_vvvvwelvyr_required = false;
+jform_vvvvwemvys_required = false;
+jform_vvvvwenvyt_required = false;
+jform_vvvvwepvyu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -45,26 +45,26 @@ function vvvvwek(location_vvvvwek)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
 		// add required attribute to admin_view field
-		if (jform_vvvvwekvyx_required)
+		if (jform_vvvvwekvyq_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwekvyx_required = false;
+			jform_vvvvwekvyq_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
 		// remove required attribute from admin_view field
-		if (!jform_vvvvwekvyx_required)
+		if (!jform_vvvvwekvyq_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwekvyx_required = true;
+			jform_vvvvwekvyq_required = true;
 		}
 	}
 }
@@ -77,26 +77,26 @@ function vvvvwel(location_vvvvwel)
 	{
 		jQuery('#jform_site_view').closest('.control-group').show();
 		// add required attribute to site_view field
-		if (jform_vvvvwelvyy_required)
+		if (jform_vvvvwelvyr_required)
 		{
 			updateFieldRequired('site_view',0);
 			jQuery('#jform_site_view').prop('required','required');
 			jQuery('#jform_site_view').attr('aria-required',true);
 			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwelvyy_required = false;
+			jform_vvvvwelvyr_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_site_view').closest('.control-group').hide();
 		// remove required attribute from site_view field
-		if (!jform_vvvvwelvyy_required)
+		if (!jform_vvvvwelvyr_required)
 		{
 			updateFieldRequired('site_view',1);
 			jQuery('#jform_site_view').removeAttr('required');
 			jQuery('#jform_site_view').removeAttr('aria-required');
 			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwelvyy_required = true;
+			jform_vvvvwelvyr_required = true;
 		}
 	}
 }
@@ -122,26 +122,26 @@ function vvvvwem(type_vvvvwem)
 	{
 		jQuery('#jform_url').closest('.control-group').show();
 		// add required attribute to url field
-		if (jform_vvvvwemvyz_required)
+		if (jform_vvvvwemvys_required)
 		{
 			updateFieldRequired('url',0);
 			jQuery('#jform_url').prop('required','required');
 			jQuery('#jform_url').attr('aria-required',true);
 			jQuery('#jform_url').addClass('required');
-			jform_vvvvwemvyz_required = false;
+			jform_vvvvwemvys_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_url').closest('.control-group').hide();
 		// remove required attribute from url field
-		if (!jform_vvvvwemvyz_required)
+		if (!jform_vvvvwemvys_required)
 		{
 			updateFieldRequired('url',1);
 			jQuery('#jform_url').removeAttr('required');
 			jQuery('#jform_url').removeAttr('aria-required');
 			jQuery('#jform_url').removeClass('required');
-			jform_vvvvwemvyz_required = true;
+			jform_vvvvwemvys_required = true;
 		}
 	}
 }
@@ -178,26 +178,26 @@ function vvvvwen(type_vvvvwen)
 	{
 		jQuery('#jform_article').closest('.control-group').show();
 		// add required attribute to article field
-		if (jform_vvvvwenvza_required)
+		if (jform_vvvvwenvyt_required)
 		{
 			updateFieldRequired('article',0);
 			jQuery('#jform_article').prop('required','required');
 			jQuery('#jform_article').attr('aria-required',true);
 			jQuery('#jform_article').addClass('required');
-			jform_vvvvwenvza_required = false;
+			jform_vvvvwenvyt_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_article').closest('.control-group').hide();
 		// remove required attribute from article field
-		if (!jform_vvvvwenvza_required)
+		if (!jform_vvvvwenvyt_required)
 		{
 			updateFieldRequired('article',1);
 			jQuery('#jform_article').removeAttr('required');
 			jQuery('#jform_article').removeAttr('aria-required');
 			jQuery('#jform_article').removeClass('required');
-			jform_vvvvwenvza_required = true;
+			jform_vvvvwenvyt_required = true;
 		}
 	}
 }
@@ -259,26 +259,26 @@ function vvvvwep(target_vvvvwep)
 	{
 		jQuery('#jform_groups').closest('.control-group').show();
 		// add required attribute to groups field
-		if (jform_vvvvwepvzb_required)
+		if (jform_vvvvwepvyu_required)
 		{
 			updateFieldRequired('groups',0);
 			jQuery('#jform_groups').prop('required','required');
 			jQuery('#jform_groups').attr('aria-required',true);
 			jQuery('#jform_groups').addClass('required');
-			jform_vvvvwepvzb_required = false;
+			jform_vvvvwepvyu_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_groups').closest('.control-group').hide();
 		// remove required attribute from groups field
-		if (!jform_vvvvwepvzb_required)
+		if (!jform_vvvvwepvyu_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwepvzb_required = true;
+			jform_vvvvwepvyu_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/joomla_module.js b/admin/models/forms/joomla_module.js
index d8f1ab1f1..7ee8318b6 100644
--- a/admin/models/forms/joomla_module.js
+++ b/admin/models/forms/joomla_module.js
@@ -9,10 +9,9 @@
  */
 
 // Some Global Values
-jform_vvvvvxcvwd_required = false;
-jform_vvvvvxrvwe_required = false;
-jform_vvvvvxsvwf_required = false;
-jform_vvvvvxtvwg_required = false;
+jform_vvvvvxrvwd_required = false;
+jform_vvvvvxsvwe_required = false;
+jform_vvvvvxtvwf_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -152,28 +151,10 @@ function vvvvvxc(add_class_helper_header_vvvvvxc,add_class_helper_vvvvvxc)
 	if (add_class_helper_header && add_class_helper)
 	{
 		jQuery('#jform_class_helper_header-lbl').closest('.control-group').show();
-		// add required attribute to class_helper_header field
-		if (jform_vvvvvxcvwd_required)
-		{
-			updateFieldRequired('class_helper_header',0);
-			jQuery('#jform_class_helper_header').prop('required','required');
-			jQuery('#jform_class_helper_header').attr('aria-required',true);
-			jQuery('#jform_class_helper_header').addClass('required');
-			jform_vvvvvxcvwd_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_class_helper_header-lbl').closest('.control-group').hide();
-		// remove required attribute from class_helper_header field
-		if (!jform_vvvvvxcvwd_required)
-		{
-			updateFieldRequired('class_helper_header',1);
-			jQuery('#jform_class_helper_header').removeAttr('required');
-			jQuery('#jform_class_helper_header').removeAttr('aria-required');
-			jQuery('#jform_class_helper_header').removeClass('required');
-			jform_vvvvvxcvwd_required = true;
-		}
 	}
 }
 
@@ -365,26 +346,26 @@ function vvvvvxr(add_update_server_vvvvvxr)
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').show();
 		// add required attribute to update_server_target field
-		if (jform_vvvvvxrvwe_required)
+		if (jform_vvvvvxrvwd_required)
 		{
 			updateFieldRequired('update_server_target',0);
 			jQuery('#jform_update_server_target').prop('required','required');
 			jQuery('#jform_update_server_target').attr('aria-required',true);
 			jQuery('#jform_update_server_target').addClass('required');
-			jform_vvvvvxrvwe_required = false;
+			jform_vvvvvxrvwd_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').hide();
 		// remove required attribute from update_server_target field
-		if (!jform_vvvvvxrvwe_required)
+		if (!jform_vvvvvxrvwd_required)
 		{
 			updateFieldRequired('update_server_target',1);
 			jQuery('#jform_update_server_target').removeAttr('required');
 			jQuery('#jform_update_server_target').removeAttr('aria-required');
 			jQuery('#jform_update_server_target').removeClass('required');
-			jform_vvvvvxrvwe_required = true;
+			jform_vvvvvxrvwd_required = true;
 		}
 	}
 }
@@ -397,26 +378,26 @@ function vvvvvxs(add_sql_vvvvvxs)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvxsvwf_required)
+		if (jform_vvvvvxsvwe_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvxsvwf_required = false;
+			jform_vvvvvxsvwe_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvxsvwf_required)
+		if (!jform_vvvvvxsvwe_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvxsvwf_required = true;
+			jform_vvvvvxsvwe_required = true;
 		}
 	}
 }
@@ -429,26 +410,26 @@ function vvvvvxt(add_sql_uninstall_vvvvvxt)
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').show();
 		// add required attribute to sql_uninstall field
-		if (jform_vvvvvxtvwg_required)
+		if (jform_vvvvvxtvwf_required)
 		{
 			updateFieldRequired('sql_uninstall',0);
 			jQuery('#jform_sql_uninstall').prop('required','required');
 			jQuery('#jform_sql_uninstall').attr('aria-required',true);
 			jQuery('#jform_sql_uninstall').addClass('required');
-			jform_vvvvvxtvwg_required = false;
+			jform_vvvvvxtvwf_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').hide();
 		// remove required attribute from sql_uninstall field
-		if (!jform_vvvvvxtvwg_required)
+		if (!jform_vvvvvxtvwf_required)
 		{
 			updateFieldRequired('sql_uninstall',1);
 			jQuery('#jform_sql_uninstall').removeAttr('required');
 			jQuery('#jform_sql_uninstall').removeAttr('aria-required');
 			jQuery('#jform_sql_uninstall').removeClass('required');
-			jform_vvvvvxtvwg_required = true;
+			jform_vvvvvxtvwf_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/joomla_plugin.js b/admin/models/forms/joomla_plugin.js
index b02d00119..27560609f 100644
--- a/admin/models/forms/joomla_plugin.js
+++ b/admin/models/forms/joomla_plugin.js
@@ -9,10 +9,9 @@
  */
 
 // Some Global Values
-jform_vvvvvyavwh_required = false;
-jform_vvvvvypvwi_required = false;
-jform_vvvvvyqvwj_required = false;
-jform_vvvvvyrvwk_required = false;
+jform_vvvvvypvwg_required = false;
+jform_vvvvvyqvwh_required = false;
+jform_vvvvvyrvwi_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -288,28 +287,10 @@ function vvvvvya(add_head_vvvvvya,class_extends_vvvvvya)
 	if (add_head && class_extends)
 	{
 		jQuery('#jform_head-lbl').closest('.control-group').show();
-		// add required attribute to head field
-		if (jform_vvvvvyavwh_required)
-		{
-			updateFieldRequired('head',0);
-			jQuery('#jform_head').prop('required','required');
-			jQuery('#jform_head').attr('aria-required',true);
-			jQuery('#jform_head').addClass('required');
-			jform_vvvvvyavwh_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_head-lbl').closest('.control-group').hide();
-		// remove required attribute from head field
-		if (!jform_vvvvvyavwh_required)
-		{
-			updateFieldRequired('head',1);
-			jQuery('#jform_head').removeAttr('required');
-			jQuery('#jform_head').removeAttr('aria-required');
-			jQuery('#jform_head').removeClass('required');
-			jform_vvvvvyavwh_required = true;
-		}
 	}
 }
 
@@ -501,26 +482,26 @@ function vvvvvyp(add_update_server_vvvvvyp)
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').show();
 		// add required attribute to update_server_target field
-		if (jform_vvvvvypvwi_required)
+		if (jform_vvvvvypvwg_required)
 		{
 			updateFieldRequired('update_server_target',0);
 			jQuery('#jform_update_server_target').prop('required','required');
 			jQuery('#jform_update_server_target').attr('aria-required',true);
 			jQuery('#jform_update_server_target').addClass('required');
-			jform_vvvvvypvwi_required = false;
+			jform_vvvvvypvwg_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').hide();
 		// remove required attribute from update_server_target field
-		if (!jform_vvvvvypvwi_required)
+		if (!jform_vvvvvypvwg_required)
 		{
 			updateFieldRequired('update_server_target',1);
 			jQuery('#jform_update_server_target').removeAttr('required');
 			jQuery('#jform_update_server_target').removeAttr('aria-required');
 			jQuery('#jform_update_server_target').removeClass('required');
-			jform_vvvvvypvwi_required = true;
+			jform_vvvvvypvwg_required = true;
 		}
 	}
 }
@@ -533,26 +514,26 @@ function vvvvvyq(add_sql_vvvvvyq)
 	{
 		jQuery('#jform_sql').closest('.control-group').show();
 		// add required attribute to sql field
-		if (jform_vvvvvyqvwj_required)
+		if (jform_vvvvvyqvwh_required)
 		{
 			updateFieldRequired('sql',0);
 			jQuery('#jform_sql').prop('required','required');
 			jQuery('#jform_sql').attr('aria-required',true);
 			jQuery('#jform_sql').addClass('required');
-			jform_vvvvvyqvwj_required = false;
+			jform_vvvvvyqvwh_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql').closest('.control-group').hide();
 		// remove required attribute from sql field
-		if (!jform_vvvvvyqvwj_required)
+		if (!jform_vvvvvyqvwh_required)
 		{
 			updateFieldRequired('sql',1);
 			jQuery('#jform_sql').removeAttr('required');
 			jQuery('#jform_sql').removeAttr('aria-required');
 			jQuery('#jform_sql').removeClass('required');
-			jform_vvvvvyqvwj_required = true;
+			jform_vvvvvyqvwh_required = true;
 		}
 	}
 }
@@ -565,26 +546,26 @@ function vvvvvyr(add_sql_uninstall_vvvvvyr)
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').show();
 		// add required attribute to sql_uninstall field
-		if (jform_vvvvvyrvwk_required)
+		if (jform_vvvvvyrvwi_required)
 		{
 			updateFieldRequired('sql_uninstall',0);
 			jQuery('#jform_sql_uninstall').prop('required','required');
 			jQuery('#jform_sql_uninstall').attr('aria-required',true);
 			jQuery('#jform_sql_uninstall').addClass('required');
-			jform_vvvvvyrvwk_required = false;
+			jform_vvvvvyrvwi_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_sql_uninstall').closest('.control-group').hide();
 		// remove required attribute from sql_uninstall field
-		if (!jform_vvvvvyrvwk_required)
+		if (!jform_vvvvvyrvwi_required)
 		{
 			updateFieldRequired('sql_uninstall',1);
 			jQuery('#jform_sql_uninstall').removeAttr('required');
 			jQuery('#jform_sql_uninstall').removeAttr('aria-required');
 			jQuery('#jform_sql_uninstall').removeClass('required');
-			jform_vvvvvyrvwk_required = true;
+			jform_vvvvvyrvwi_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js
index 7ddc51e9c..81ec16478 100644
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@@ -9,10 +9,9 @@
  */
 
 // Some Global Values
-jform_vvvvwcjvxn_required = false;
-jform_vvvvwcvvxo_required = false;
-jform_vvvvwcxvxp_required = false;
-jform_vvvvwcxvxq_required = false;
+jform_vvvvwcjvxl_required = false;
+jform_vvvvwcxvxm_required = false;
+jform_vvvvwcxvxn_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -162,26 +161,26 @@ function vvvvwcj(how_vvvvwcj,target_vvvvwcj)
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').show();
 		// add required attribute to php_setdocument field
-		if (jform_vvvvwcjvxn_required)
+		if (jform_vvvvwcjvxl_required)
 		{
 			updateFieldRequired('php_setdocument',0);
 			jQuery('#jform_php_setdocument').prop('required','required');
 			jQuery('#jform_php_setdocument').attr('aria-required',true);
 			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvwcjvxn_required = false;
+			jform_vvvvwcjvxl_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_php_setdocument').closest('.control-group').hide();
 		// remove required attribute from php_setdocument field
-		if (!jform_vvvvwcjvxn_required)
+		if (!jform_vvvvwcjvxl_required)
 		{
 			updateFieldRequired('php_setdocument',1);
 			jQuery('#jform_php_setdocument').removeAttr('required');
 			jQuery('#jform_php_setdocument').removeAttr('aria-required');
 			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvwcjvxn_required = true;
+			jform_vvvvwcjvxl_required = true;
 		}
 	}
 }
@@ -723,28 +722,10 @@ function vvvvwcv(target_vvvvwcv,type_vvvvwcv)
 	if (target_vvvvwcv == 1 && type_vvvvwcv == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		// add required attribute to libraries field
-		if (jform_vvvvwcvvxo_required)
-		{
-			updateFieldRequired('libraries',0);
-			jQuery('#jform_libraries').prop('required','required');
-			jQuery('#jform_libraries').attr('aria-required',true);
-			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwcvvxo_required = false;
-		}
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		// remove required attribute from libraries field
-		if (!jform_vvvvwcvvxo_required)
-		{
-			updateFieldRequired('libraries',1);
-			jQuery('#jform_libraries').removeAttr('required');
-			jQuery('#jform_libraries').removeAttr('aria-required');
-			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwcvvxo_required = true;
-		}
 	}
 }
 
@@ -756,46 +737,46 @@ function vvvvwcx(target_vvvvwcx)
 	{
 		jQuery('#jform_how').closest('.control-group').show();
 		// add required attribute to how field
-		if (jform_vvvvwcxvxp_required)
+		if (jform_vvvvwcxvxm_required)
 		{
 			updateFieldRequired('how',0);
 			jQuery('#jform_how').prop('required','required');
 			jQuery('#jform_how').attr('aria-required',true);
 			jQuery('#jform_how').addClass('required');
-			jform_vvvvwcxvxp_required = false;
+			jform_vvvvwcxvxm_required = false;
 		}
 		jQuery('#jform_type').closest('.control-group').show();
 		// add required attribute to type field
-		if (jform_vvvvwcxvxq_required)
+		if (jform_vvvvwcxvxn_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwcxvxq_required = false;
+			jform_vvvvwcxvxn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_how').closest('.control-group').hide();
 		// remove required attribute from how field
-		if (!jform_vvvvwcxvxp_required)
+		if (!jform_vvvvwcxvxm_required)
 		{
 			updateFieldRequired('how',1);
 			jQuery('#jform_how').removeAttr('required');
 			jQuery('#jform_how').removeAttr('aria-required');
 			jQuery('#jform_how').removeClass('required');
-			jform_vvvvwcxvxp_required = true;
+			jform_vvvvwcxvxm_required = true;
 		}
 		jQuery('#jform_type').closest('.control-group').hide();
 		// remove required attribute from type field
-		if (!jform_vvvvwcxvxq_required)
+		if (!jform_vvvvwcxvxn_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwcxvxq_required = true;
+			jform_vvvvwcxvxn_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/server.js b/admin/models/forms/server.js
index cce340b32..5ecf81cc7 100644
--- a/admin/models/forms/server.js
+++ b/admin/models/forms/server.js
@@ -9,15 +9,15 @@
  */
 
 // Some Global Values
-jform_vvvvweavyn_required = false;
-jform_vvvvweavyo_required = false;
-jform_vvvvweavyp_required = false;
-jform_vvvvweavyq_required = false;
-jform_vvvvweavyr_required = false;
-jform_vvvvwebvys_required = false;
-jform_vvvvwecvyt_required = false;
-jform_vvvvweevyu_required = false;
-jform_vvvvwegvyv_required = false;
+jform_vvvvweavyg_required = false;
+jform_vvvvweavyh_required = false;
+jform_vvvvweavyi_required = false;
+jform_vvvvweavyj_required = false;
+jform_vvvvweavyk_required = false;
+jform_vvvvwebvyl_required = false;
+jform_vvvvwecvym_required = false;
+jform_vvvvweevyn_required = false;
+jform_vvvvwegvyo_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -66,108 +66,108 @@ function vvvvwea(protocol_vvvvwea)
 	{
 		jQuery('#jform_authentication').closest('.control-group').show();
 		// add required attribute to authentication field
-		if (jform_vvvvweavyn_required)
+		if (jform_vvvvweavyg_required)
 		{
 			updateFieldRequired('authentication',0);
 			jQuery('#jform_authentication').prop('required','required');
 			jQuery('#jform_authentication').attr('aria-required',true);
 			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvweavyn_required = false;
+			jform_vvvvweavyg_required = false;
 		}
 		jQuery('#jform_host').closest('.control-group').show();
 		// add required attribute to host field
-		if (jform_vvvvweavyo_required)
+		if (jform_vvvvweavyh_required)
 		{
 			updateFieldRequired('host',0);
 			jQuery('#jform_host').prop('required','required');
 			jQuery('#jform_host').attr('aria-required',true);
 			jQuery('#jform_host').addClass('required');
-			jform_vvvvweavyo_required = false;
+			jform_vvvvweavyh_required = false;
 		}
 		jQuery('#jform_port').closest('.control-group').show();
 		// add required attribute to port field
-		if (jform_vvvvweavyp_required)
+		if (jform_vvvvweavyi_required)
 		{
 			updateFieldRequired('port',0);
 			jQuery('#jform_port').prop('required','required');
 			jQuery('#jform_port').attr('aria-required',true);
 			jQuery('#jform_port').addClass('required');
-			jform_vvvvweavyp_required = false;
+			jform_vvvvweavyi_required = false;
 		}
 		jQuery('#jform_path').closest('.control-group').show();
 		// add required attribute to path field
-		if (jform_vvvvweavyq_required)
+		if (jform_vvvvweavyj_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvweavyq_required = false;
+			jform_vvvvweavyj_required = false;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').show();
 		jQuery('#jform_username').closest('.control-group').show();
 		// add required attribute to username field
-		if (jform_vvvvweavyr_required)
+		if (jform_vvvvweavyk_required)
 		{
 			updateFieldRequired('username',0);
 			jQuery('#jform_username').prop('required','required');
 			jQuery('#jform_username').attr('aria-required',true);
 			jQuery('#jform_username').addClass('required');
-			jform_vvvvweavyr_required = false;
+			jform_vvvvweavyk_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_authentication').closest('.control-group').hide();
 		// remove required attribute from authentication field
-		if (!jform_vvvvweavyn_required)
+		if (!jform_vvvvweavyg_required)
 		{
 			updateFieldRequired('authentication',1);
 			jQuery('#jform_authentication').removeAttr('required');
 			jQuery('#jform_authentication').removeAttr('aria-required');
 			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvweavyn_required = true;
+			jform_vvvvweavyg_required = true;
 		}
 		jQuery('#jform_host').closest('.control-group').hide();
 		// remove required attribute from host field
-		if (!jform_vvvvweavyo_required)
+		if (!jform_vvvvweavyh_required)
 		{
 			updateFieldRequired('host',1);
 			jQuery('#jform_host').removeAttr('required');
 			jQuery('#jform_host').removeAttr('aria-required');
 			jQuery('#jform_host').removeClass('required');
-			jform_vvvvweavyo_required = true;
+			jform_vvvvweavyh_required = true;
 		}
 		jQuery('#jform_port').closest('.control-group').hide();
 		// remove required attribute from port field
-		if (!jform_vvvvweavyp_required)
+		if (!jform_vvvvweavyi_required)
 		{
 			updateFieldRequired('port',1);
 			jQuery('#jform_port').removeAttr('required');
 			jQuery('#jform_port').removeAttr('aria-required');
 			jQuery('#jform_port').removeClass('required');
-			jform_vvvvweavyp_required = true;
+			jform_vvvvweavyi_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
 		// remove required attribute from path field
-		if (!jform_vvvvweavyq_required)
+		if (!jform_vvvvweavyj_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvweavyq_required = true;
+			jform_vvvvweavyj_required = true;
 		}
 		jQuery('.note_ssh_security').closest('.control-group').hide();
 		jQuery('#jform_username').closest('.control-group').hide();
 		// remove required attribute from username field
-		if (!jform_vvvvweavyr_required)
+		if (!jform_vvvvweavyk_required)
 		{
 			updateFieldRequired('username',1);
 			jQuery('#jform_username').removeAttr('required');
 			jQuery('#jform_username').removeAttr('aria-required');
 			jQuery('#jform_username').removeClass('required');
-			jform_vvvvweavyr_required = true;
+			jform_vvvvweavyk_required = true;
 		}
 	}
 }
@@ -205,13 +205,13 @@ function vvvvweb(protocol_vvvvweb)
 		jQuery('.note_ftp_signature').closest('.control-group').show();
 		jQuery('#jform_signature').closest('.control-group').show();
 		// add required attribute to signature field
-		if (jform_vvvvwebvys_required)
+		if (jform_vvvvwebvyl_required)
 		{
 			updateFieldRequired('signature',0);
 			jQuery('#jform_signature').prop('required','required');
 			jQuery('#jform_signature').attr('aria-required',true);
 			jQuery('#jform_signature').addClass('required');
-			jform_vvvvwebvys_required = false;
+			jform_vvvvwebvyl_required = false;
 		}
 	}
 	else
@@ -219,13 +219,13 @@ function vvvvweb(protocol_vvvvweb)
 		jQuery('.note_ftp_signature').closest('.control-group').hide();
 		jQuery('#jform_signature').closest('.control-group').hide();
 		// remove required attribute from signature field
-		if (!jform_vvvvwebvys_required)
+		if (!jform_vvvvwebvyl_required)
 		{
 			updateFieldRequired('signature',1);
 			jQuery('#jform_signature').removeAttr('required');
 			jQuery('#jform_signature').removeAttr('aria-required');
 			jQuery('#jform_signature').removeClass('required');
-			jform_vvvvwebvys_required = true;
+			jform_vvvvwebvyl_required = true;
 		}
 	}
 }
@@ -274,26 +274,26 @@ function vvvvwec(protocol_vvvvwec,authentication_vvvvwec)
 	{
 		jQuery('#jform_password').closest('.control-group').show();
 		// add required attribute to password field
-		if (jform_vvvvwecvyt_required)
+		if (jform_vvvvwecvym_required)
 		{
 			updateFieldRequired('password',0);
 			jQuery('#jform_password').prop('required','required');
 			jQuery('#jform_password').attr('aria-required',true);
 			jQuery('#jform_password').addClass('required');
-			jform_vvvvwecvyt_required = false;
+			jform_vvvvwecvym_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_password').closest('.control-group').hide();
 		// remove required attribute from password field
-		if (!jform_vvvvwecvyt_required)
+		if (!jform_vvvvwecvym_required)
 		{
 			updateFieldRequired('password',1);
 			jQuery('#jform_password').removeAttr('required');
 			jQuery('#jform_password').removeAttr('aria-required');
 			jQuery('#jform_password').removeClass('required');
-			jform_vvvvwecvyt_required = true;
+			jform_vvvvwecvym_required = true;
 		}
 	}
 }
@@ -353,26 +353,26 @@ function vvvvwee(protocol_vvvvwee,authentication_vvvvwee)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
 		// add required attribute to private field
-		if (jform_vvvvweevyu_required)
+		if (jform_vvvvweevyn_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvweevyu_required = false;
+			jform_vvvvweevyn_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
 		// remove required attribute from private field
-		if (!jform_vvvvweevyu_required)
+		if (!jform_vvvvweevyn_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvweevyu_required = true;
+			jform_vvvvweevyn_required = true;
 		}
 	}
 }
@@ -432,26 +432,26 @@ function vvvvweg(protocol_vvvvweg,authentication_vvvvweg)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
 		// add required attribute to private_key field
-		if (jform_vvvvwegvyv_required)
+		if (jform_vvvvwegvyo_required)
 		{
 			updateFieldRequired('private_key',0);
 			jQuery('#jform_private_key').prop('required','required');
 			jQuery('#jform_private_key').attr('aria-required',true);
 			jQuery('#jform_private_key').addClass('required');
-			jform_vvvvwegvyv_required = false;
+			jform_vvvvwegvyo_required = false;
 		}
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
 		// remove required attribute from private_key field
-		if (!jform_vvvvwegvyv_required)
+		if (!jform_vvvvwegvyo_required)
 		{
 			updateFieldRequired('private_key',1);
 			jQuery('#jform_private_key').removeAttr('required');
 			jQuery('#jform_private_key').removeAttr('aria-required');
 			jQuery('#jform_private_key').removeClass('required');
-			jform_vvvvwegvyv_required = true;
+			jform_vvvvwegvyo_required = true;
 		}
 	}
 }
diff --git a/admin/models/server.php b/admin/models/server.php
index 6a9989832..dc29cbdf5 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -189,7 +189,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getVywlinked_components()
+	public function getVyplinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
diff --git a/admin/views/assistant/tmpl/default.php b/admin/views/assistant/tmpl/default.php
index 819b13cfc..8e79b5bd5 100644
--- a/admin/views/assistant/tmpl/default.php
+++ b/admin/views/assistant/tmpl/default.php
@@ -34,10 +34,7 @@ JHtml::_('behavior.keepalive');
 	}
 </script>
 <?php $urlId = (isset($this->item->id)) ? '&id='. (int) $this->item->id : ''; ?>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=assistant'.$urlId); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
-        <input type="hidden" name="task" value="" />
-        <?php echo JHtml::_('form.token'); ?>
-</form>
+
 <script type="text/javascript">
 // Add spindle-wheel for importations:
 jQuery(document).ready(function($) {
diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php
index 3661ac3cc..6c5f996bf 100644
--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@@ -22,23 +22,9 @@ JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
-<?php if ($this->canDo->get('compiler.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task === 'compiler.back') {
-			parent.history.back();
-			return false;
-		} else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=compiler'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
-        <input type="hidden" name="task" value="" />
-        <?php echo JHtml::_('form.token'); ?>
-</form>
+<?php if ($this->canDo->get('compiler.access')): ?>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=compiler'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+
 <script type="text/javascript">
 Joomla.submitbutton = function(task, key)
 {
@@ -54,11 +40,7 @@ Joomla.submitbutton = function(task, key)
 		if (isValid){
 			jQuery('#form').hide();
 			// get correct form based on task
-			if (task == 'compiler.compiler' || task == 'compiler.installCompiledModule' || task == 'compiler.installCompiledPlugin') {
-				var form = document.getElementById('compilerForm');
-			} else {
-				var form = document.getElementById('adminForm');
-			}
+			var form = document.getElementById('adminForm');
 			// set the plugin id
 			if (task == 'compiler.installCompiledModule' || task == 'compiler.installCompiledPlugin') {
 				form.install_item_id.value = key;
@@ -112,7 +94,7 @@ jQuery('<div id="loading"></div>')
 	<div id="form">
 		<div class="span4">
 			<h3><?php echo JText::_('COM_COMPONENTBUILDER_READY_TO_COMPILE_A_COMPONENT'); ?></h3>
-			<form action="index.php?option=com_componentbuilder&view=compiler" method="post" name="compilerForm" id="compilerForm" class="form-validate" enctype="multipart/form-data">
+			<div id="compilerForm">
 				<div>
 				<span class="notice" style="display:none; color:red;"><?php echo JText::_('COM_COMPONENTBUILDER_YOU_MUST_SELECT_A_COMPONENT'); ?></span><br />
 				<?php if ($this->form): ?>
@@ -131,9 +113,7 @@ jQuery('<div id="loading"></div>')
 				</button>
 				<input type="hidden" name="install_item_id" value="0"> 
 				<input type="hidden" name="version" value="3" />
-				<input type="hidden" name="task" value="compiler.compiler" />
-				<?php echo JHtml::_('form.token'); ?>
-			</form>
+			</div>
 		</div>
 		<div class="span7">
 			<div id="component-details"><?php echo $selectNotice; ?></div>
@@ -197,7 +177,10 @@ function JRouter(link) {
 ?>
 	return url+link;
 }
-</script>
+</script>
+<input type="hidden" name="task" value="" />
+<?php echo JHtml::_('form.token'); ?>
+</form>
 <?php else: ?>
         <h1><?php echo JText::_('COM_COMPONENTBUILDER_NO_ACCESS_GRANTED'); ?></h1>
 <?php endif; ?>
diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php
index 22e6dd893..280ed0b6b 100644
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@@ -222,12 +222,6 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/custom/marked.js");
 		// add the document default css file
 		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/compiler.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
-		// Set the Custom CSS script to view
-		$this->document->addStyleDeclaration("
-			.j-sidebar-container {
-			margin: -37px 0 0 -1px !important;
-			}
-		");
 		// Set the Custom JS script to view
 		$this->document->addScriptDeclaration("
 			function getComponentDetails_server(id){
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index f78aa43bb..a7bc6c49e 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -57,7 +57,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vymfields = $this->get('Vymfields');
+		$this->vyffields = $this->get('Vyffields');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/get_snippets/tmpl/default.php b/admin/views/get_snippets/tmpl/default.php
index a7ecb8b8a..d769d42f3 100644
--- a/admin/views/get_snippets/tmpl/default.php
+++ b/admin/views/get_snippets/tmpl/default.php
@@ -31,10 +31,11 @@ JHtml::_('behavior.keepalive');
 		}
 	}
 </script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=get_snippets'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
-        <input type="hidden" name="task" value="" />
-        <?php echo JHtml::_('form.token'); ?>
-</form>
+
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
 
 <div id="snippets-github" class="bulk-updater-toggler">
 	<br /><br /><br />
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index 84122e6c8..59c22a485 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -57,7 +57,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->vywlinked_components = $this->get('Vywlinked_components');
+		$this->vyplinked_components = $this->get('Vyplinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/componentbuilder.xml b/componentbuilder.xml
index add0d0d8b..c8b4818b2 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, 2020</creationDate>
+	<creationDate>4th February, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>