diff --git a/README.md b/README.md
index fff3d7b47..b8ba3cba6 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *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*: 7th August, 2018
-+ *Version*: 2.8.5
++ *Last Build*: 14th August, 2018
++ *Version*: 2.8.6
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **187020**
-+ *Field count*: **1059**
-+ *File count*: **1239**
++ *Line count*: **186762**
++ *Field count*: **1061**
++ *File count*: **1240**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/README.txt b/admin/README.txt
index fff3d7b47..b8ba3cba6 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo
 
 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!
 
-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.5) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.8.6) with **ALL** its features and **ALL** concepts totally open-source and free! 
 
 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)
 
@@ -125,13 +125,13 @@ Watch the [proposed development workflow](https://vdm.bz/proposed-development-wo
 + *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*: 7th August, 2018
-+ *Version*: 2.8.5
++ *Last Build*: 14th August, 2018
++ *Version*: 2.8.6
 + *Copyright*: Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **187020**
-+ *Field count*: **1059**
-+ *File count*: **1239**
++ *Line count*: **186762**
++ *Field count*: **1061**
++ *File count*: **1240**
 + *Folder count*: **197**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/JControllerForm.php
index f7d9a446f..305a23fec 100644
--- a/admin/compiler/joomla_3/JControllerForm.php
+++ b/admin/compiler/joomla_3/JControllerForm.php
@@ -145,48 +145,36 @@ class ###Component###Controller###View### extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -221,43 +209,40 @@ class ###Component###Controller###View### extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/compiler/joomla_3/JControllerForm_site.php b/admin/compiler/joomla_3/JControllerForm_site.php
index cd3836666..01a76de19 100644
--- a/admin/compiler/joomla_3/JControllerForm_site.php
+++ b/admin/compiler/joomla_3/JControllerForm_site.php
@@ -145,48 +145,36 @@ class ###Component###Controller###View### extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -221,43 +209,40 @@ class ###Component###Controller###View### extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php
index d4869b407..98ec4da90 100644
--- a/admin/controllers/admin_fields.php
+++ b/admin/controllers/admin_fields.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('admin_fields.access', 'com_componentbuilder');
+		$access = $user->authorise('admin_fields.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('admin_fields.create', $this->option);
+		return $user->authorise('admin_fields.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php
index cc194551f..741c5964c 100644
--- a/admin/controllers/admin_fields_conditions.php
+++ b/admin/controllers/admin_fields_conditions.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('admin_fields_conditions.access', 'com_componentbuilder');
+		$access = $user->authorise('admin_fields_conditions.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('admin_fields_conditions.create', $this->option);
+		return $user->authorise('admin_fields_conditions.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_fields_relations.php b/admin/controllers/admin_fields_relations.php
index 67c8444c9..66aa9238d 100644
--- a/admin/controllers/admin_fields_relations.php
+++ b/admin/controllers/admin_fields_relations.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('admin_fields_relations.access', 'com_componentbuilder');
+		$access = $user->authorise('admin_fields_relations.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('admin_fields_relations.create', $this->option);
+		return $user->authorise('admin_fields_relations.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php
index 5d737bc47..d58bda581 100644
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('admin_view.access', 'com_componentbuilder');
+		$access = $user->authorise('admin_view.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('admin_view.create', $this->option);
+		return $user->authorise('admin_view.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_admin_views.php b/admin/controllers/component_admin_views.php
index 1fa960484..7abb1dc4f 100644
--- a/admin/controllers/component_admin_views.php
+++ b/admin/controllers/component_admin_views.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_admin_views.access', 'com_componentbuilder');
+		$access = $user->authorise('component_admin_views.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_admin_views.create', $this->option);
+		return $user->authorise('component_admin_views.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_config.php b/admin/controllers/component_config.php
index b7920b637..92b967c28 100644
--- a/admin/controllers/component_config.php
+++ b/admin/controllers/component_config.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_config.access', 'com_componentbuilder');
+		$access = $user->authorise('component_config.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_config.create', $this->option);
+		return $user->authorise('component_config.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_custom_admin_menus.php b/admin/controllers/component_custom_admin_menus.php
index 45591980a..72cf18100 100644
--- a/admin/controllers/component_custom_admin_menus.php
+++ b/admin/controllers/component_custom_admin_menus.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_custom_admin_menus.access', 'com_componentbuilder');
+		$access = $user->authorise('component_custom_admin_menus.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_custom_admin_menus.create', $this->option);
+		return $user->authorise('component_custom_admin_menus.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_custom_admin_views.php b/admin/controllers/component_custom_admin_views.php
index f9a2c2875..b3709f96c 100644
--- a/admin/controllers/component_custom_admin_views.php
+++ b/admin/controllers/component_custom_admin_views.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_custom_admin_views.access', 'com_componentbuilder');
+		$access = $user->authorise('component_custom_admin_views.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_custom_admin_views.create', $this->option);
+		return $user->authorise('component_custom_admin_views.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_dashboard.php b/admin/controllers/component_dashboard.php
index 3be38033f..69d4a25fa 100644
--- a/admin/controllers/component_dashboard.php
+++ b/admin/controllers/component_dashboard.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_dashboard.access', 'com_componentbuilder');
+		$access = $user->authorise('component_dashboard.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_dashboard.create', $this->option);
+		return $user->authorise('component_dashboard.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_files_folders.php b/admin/controllers/component_files_folders.php
index a468a56c4..91c24208b 100644
--- a/admin/controllers/component_files_folders.php
+++ b/admin/controllers/component_files_folders.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_files_folders.access', 'com_componentbuilder');
+		$access = $user->authorise('component_files_folders.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_files_folders.create', $this->option);
+		return $user->authorise('component_files_folders.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_mysql_tweaks.php b/admin/controllers/component_mysql_tweaks.php
index bbe29a194..c71880b2d 100644
--- a/admin/controllers/component_mysql_tweaks.php
+++ b/admin/controllers/component_mysql_tweaks.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_mysql_tweaks.access', 'com_componentbuilder');
+		$access = $user->authorise('component_mysql_tweaks.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_mysql_tweaks.create', $this->option);
+		return $user->authorise('component_mysql_tweaks.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_site_views.php b/admin/controllers/component_site_views.php
index 5b6988fa1..ce29f1b87 100644
--- a/admin/controllers/component_site_views.php
+++ b/admin/controllers/component_site_views.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_site_views.access', 'com_componentbuilder');
+		$access = $user->authorise('component_site_views.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_site_views.create', $this->option);
+		return $user->authorise('component_site_views.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_updates.php b/admin/controllers/component_updates.php
index 5f7bf9fcc..ab3308581 100644
--- a/admin/controllers/component_updates.php
+++ b/admin/controllers/component_updates.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('component_updates.access', 'com_componentbuilder');
+		$access = $user->authorise('component_updates.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('component_updates.create', $this->option);
+		return $user->authorise('component_updates.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php
index 55413a5b1..f9b28c219 100644
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@@ -50,12 +50,15 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('custom_admin_view.access', 'com_componentbuilder');
+		$access = $user->authorise('custom_admin_view.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
 		return parent::allowAdd($data);
 	}
@@ -197,48 +200,36 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php
index f83c19b46..b29f4ae23 100644
--- a/admin/controllers/custom_code.php
+++ b/admin/controllers/custom_code.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('custom_code.access', 'com_componentbuilder');
+		$access = $user->authorise('custom_code.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('custom_code.create', $this->option);
+		return $user->authorise('custom_code.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php
index 9165141da..bd9522f04 100644
--- a/admin/controllers/dynamic_get.php
+++ b/admin/controllers/dynamic_get.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('dynamic_get.access', 'com_componentbuilder');
+		$access = $user->authorise('dynamic_get.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('dynamic_get.create', $this->option);
+		return $user->authorise('dynamic_get.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/field.php b/admin/controllers/field.php
index 9774bb407..9955e339c 100644
--- a/admin/controllers/field.php
+++ b/admin/controllers/field.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerField extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('field.access', 'com_componentbuilder');
+		$access = $user->authorise('field.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('field.create', $this->option);
+		return $user->authorise('field.create', $this->option);
 	}
 
 	/**
@@ -196,48 +199,36 @@ class ComponentbuilderControllerField extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -272,43 +263,40 @@ class ComponentbuilderControllerField extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php
index 7a69059aa..dd95d2e7a 100644
--- a/admin/controllers/fieldtype.php
+++ b/admin/controllers/fieldtype.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('fieldtype.access', 'com_componentbuilder');
+		$access = $user->authorise('fieldtype.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('fieldtype.create', $this->option);
+		return $user->authorise('fieldtype.create', $this->option);
 	}
 
 	/**
@@ -196,48 +199,36 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -272,43 +263,40 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index b348e5f35..825780a9c 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('help_document.access', 'com_componentbuilder');
+		$access = $user->authorise('help_document.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('help_document.create', $this->option);
+		return $user->authorise('help_document.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php
index 21f35b7f4..beb6c1fec 100644
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@@ -75,14 +75,17 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('joomla_component.access', 'com_componentbuilder');
+		$access = $user->authorise('joomla_component.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('joomla_component.create', $this->option);
+		return $user->authorise('joomla_component.create', $this->option);
 	}
 
 	/**
@@ -222,48 +225,36 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -298,43 +289,40 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/language.php b/admin/controllers/language.php
index 07749d167..edae57948 100644
--- a/admin/controllers/language.php
+++ b/admin/controllers/language.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('language.access', 'com_componentbuilder');
+		$access = $user->authorise('language.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('language.create', $this->option);
+		return $user->authorise('language.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php
index a2fe2b007..3d1f4793c 100644
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('language_translation.access', 'com_componentbuilder');
+		$access = $user->authorise('language_translation.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('language_translation.create', $this->option);
+		return $user->authorise('language_translation.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php
index 60951533e..e93bdf242 100644
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@@ -50,12 +50,15 @@ class ComponentbuilderControllerLayout extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('layout.access', 'com_componentbuilder');
+		$access = $user->authorise('layout.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
 		return parent::allowAdd($data);
 	}
@@ -197,48 +200,36 @@ class ComponentbuilderControllerLayout extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerLayout extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/library.php b/admin/controllers/library.php
index 196e144a4..d9ca74c27 100644
--- a/admin/controllers/library.php
+++ b/admin/controllers/library.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('library.access', 'com_componentbuilder');
+		$access = $user->authorise('library.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('library.create', $this->option);
+		return $user->authorise('library.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/library_config.php b/admin/controllers/library_config.php
index 26844d4ff..ec8159bcd 100644
--- a/admin/controllers/library_config.php
+++ b/admin/controllers/library_config.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('library_config.access', 'com_componentbuilder');
+		$access = $user->authorise('library_config.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('library_config.create', $this->option);
+		return $user->authorise('library_config.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/library_files_folders_urls.php b/admin/controllers/library_files_folders_urls.php
index a14a01990..5b5d1b758 100644
--- a/admin/controllers/library_files_folders_urls.php
+++ b/admin/controllers/library_files_folders_urls.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('library_files_folders_urls.access', 'com_componentbuilder');
+		$access = $user->authorise('library_files_folders_urls.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('library_files_folders_urls.create', $this->option);
+		return $user->authorise('library_files_folders_urls.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/server.php b/admin/controllers/server.php
index f13572a81..f14870b6c 100644
--- a/admin/controllers/server.php
+++ b/admin/controllers/server.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerServer extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('server.access', 'com_componentbuilder');
+		$access = $user->authorise('server.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('server.create', $this->option);
+		return $user->authorise('server.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerServer extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerServer extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php
index 206ed3149..0f682912a 100644
--- a/admin/controllers/site_view.php
+++ b/admin/controllers/site_view.php
@@ -50,12 +50,15 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('site_view.access', 'com_componentbuilder');
+		$access = $user->authorise('site_view.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
 		return parent::allowAdd($data);
 	}
@@ -197,48 +200,36 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php
index d512ac34a..4d8647945 100644
--- a/admin/controllers/snippet.php
+++ b/admin/controllers/snippet.php
@@ -50,12 +50,15 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('snippet.access', 'com_componentbuilder');
+		$access = $user->authorise('snippet.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
 		return parent::allowAdd($data);
 	}
@@ -197,48 +200,36 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/snippet_type.php b/admin/controllers/snippet_type.php
index 20e1a191b..e2c452b8a 100644
--- a/admin/controllers/snippet_type.php
+++ b/admin/controllers/snippet_type.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('snippet_type.access', 'com_componentbuilder');
+		$access = $user->authorise('snippet_type.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('snippet_type.create', $this->option);
+		return $user->authorise('snippet_type.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/template.php b/admin/controllers/template.php
index d06f5a160..5b003b296 100644
--- a/admin/controllers/template.php
+++ b/admin/controllers/template.php
@@ -50,12 +50,15 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('template.access', 'com_componentbuilder');
+		$access = $user->authorise('template.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
 		return parent::allowAdd($data);
 	}
@@ -197,48 +200,36 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/validation_rule.php b/admin/controllers/validation_rule.php
index 7c93d27f2..737370f91 100644
--- a/admin/controllers/validation_rule.php
+++ b/admin/controllers/validation_rule.php
@@ -50,14 +50,17 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 	 */
 	protected function allowAdd($data = array())
 	{
+		// Get user object.
+		$user = JFactory::getUser();
 		// Access check.
-		$access = JFactory::getUser()->authorise('validation_rule.access', 'com_componentbuilder');
+		$access = $user->authorise('validation_rule.access', 'com_componentbuilder');
 		if (!$access)
 		{
 			return false;
 		}
+
 		// In the absense of better information, revert to the component permissions.
-		return JFactory::getUser()->authorise('validation_rule.create', $this->option);
+		return $user->authorise('validation_rule.create', $this->option);
 	}
 
 	/**
@@ -197,48 +200,36 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 
 		$cancel = parent::cancel($key);
 
-		if ($cancel)
+		if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 		{
-			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
-
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view='.(string)$this->ref;
-
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-		}
-		else
-		{
-			// Redirect to the items screen.
+			// Redirect to the return value.
 			$this->setRedirect(
 				JRoute::_(
-					'index.php?option=' . $this->option . '&view=' . $this->view_list, false
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view='.(string)$this->ref;
+
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
 				)
 			);
 		}
@@ -273,43 +264,40 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($saved)
+		// This is not needed since parent save already does this
+		// Due to the ref and refid implementation we need to add this
+		if ($canReturn)
 		{
-			// This is not needed since parent save already does this
-			// Due to the ref and refid implementation we need to add this
-			if ($canReturn)
-			{
-				$redirect = base64_decode($return);
+			$redirect = base64_decode($return);
 
-				// Redirect to the return value.
-				$this->setRedirect(
-					JRoute::_(
-						$redirect, false
-					)
-				);
-			}
-			elseif ($this->refid && $this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
+			// Redirect to the return value.
+			$this->setRedirect(
+				JRoute::_(
+					$redirect, false
+				)
+			);
+		}
+		elseif ($this->refid && $this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref . '&layout=edit&id=' . (int)$this->refid;
 
-				// Redirect to the item screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
-			elseif ($this->ref)
-			{
-				$redirect = '&view=' . (string)$this->ref;
+			// Redirect to the item screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
+		}
+		elseif ($this->ref)
+		{
+			$redirect = '&view=' . (string)$this->ref;
 
-				// Redirect to the list screen.
-				$this->setRedirect(
-					JRoute::_(
-						'index.php?option=' . $this->option . $redirect, false
-					)
-				);
-			}
+			// Redirect to the list screen.
+			$this->setRedirect(
+				JRoute::_(
+					'index.php?option=' . $this->option . $redirect, false
+				)
+			);
 		}
 		return $saved;
 	}
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index a78f18bf7..2ba5e9fc3 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10469,6 +10469,8 @@ class Interpretation extends Fields
 		$allow = array();
 		// set component name
 		$component = ComponentbuilderHelper::safeString($this->componentData->name_code);
+		// prepare custom permission script
+		$customAllow = $this->getCustomScriptBuilder('php_allowadd', $viewName_single, '', null, true);
 		// setup correct core target
 		$coreLoad = false;
 		if (isset($this->permissionCore[$viewName_single]))
@@ -10533,22 +10535,26 @@ class Interpretation extends Fields
 		}
 		else
 		{
+			$allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Get user object.";
+			$allow[] = $this->_t(2) . "\$user = JFactory::getUser();";
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.access']) && isset($this->permissionBuilder['global'][$core['core.access']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.access']]) && in_array($viewName_single, $this->permissionBuilder['global'][$core['core.access']]))
 			{
-				$allow[] = PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Access check.";
-				$allow[] = $this->_t(2) . "\$access = JFactory::getUser()->authorise('" . $core['core.access'] . "', 'com_" . $component . "');";
+				$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Access check.";
+				$allow[] = $this->_t(2) . "\$access = \$user->authorise('" . $core['core.access'] . "', 'com_" . $component . "');";
 				$allow[] = $this->_t(2) . "if (!\$access)";
 				$allow[] = $this->_t(2) . "{";
 				$allow[] = $this->_t(3) . "return false;";
 				$allow[] = $this->_t(2) . "}";
 			}
+			// load custom permission script
+			$allow[] = $customAllow;
 			// check if the item has permissions.
 			if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName_single, $this->permissionBuilder['global'][$core['core.create']]))
 			{
 				// setup the default script
 				$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " In the absense of better information, revert to the component permissions.";
-				$allow[] = $this->_t(2) . "return JFactory::getUser()->authorise('" . $core['core.create'] . "', \$this->option);";
+				$allow[] = $this->_t(2) . "return \$user->authorise('" . $core['core.create'] . "', \$this->option);";
 			}
 			else
 			{
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 5c956fa3c..8ff85f09d 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -412,6 +412,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH="Add Php After Publish"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL="Add PHP (script - after publish)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX="Add Php Ajax"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AJAX_LABEL="Add PHP (AJAX)"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWADD="Add Php Allowadd"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWADD_LABEL="Add PHP (allowAdd Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT="Add Php Allowedit"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL="Add PHP (allowEdit Method)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY="Add Php Batchcopy"
@@ -754,6 +756,9 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL="PHP publish Method afte
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add PHP Methods that should run in the AJAX Model. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="PHP Ajax Methods"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWADD="Php Allowadd"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWADD_DESCRIPTION="Add PHP Here that should run in the allowAdd Method to add custom access control. Do not add the php tags."
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWADD_LABEL="PHP allowAdd Method<br /><small>An array of input data. => ($data) and the user object => ($user) are already set.</small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT="Php Allowedit"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION="Add PHP Here that should run in the allowEdit Method to add custom access control. Do not add the php tags."
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL="PHP allowEdit Method<br /><small>The record ID => ($recordId) and the user object => ($user) are already set.</small>"
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index da2caf42f..8e7e3809c 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -34,6 +34,8 @@ $fields = $displayData->get('fields') ?: array(
 	'php_save',
 	'add_php_postsavehook',
 	'php_postsavehook',
+	'add_php_allowadd',
+	'php_allowadd',
 	'add_php_allowedit',
 	'php_allowedit',
 	'add_php_batchcopy',
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index 46191ebd3..820b42de9 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->waefields;
+$items	= $displayData->waffields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
index f17ddb13c..81d32dd22 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->waolinked_components;
+$items	= $displayData->waplinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 2668adfbc..00f860107 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -86,10 +86,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}
 
-			if (!empty($item->php_import_headers))
+			if (!empty($item->php_import_save))
 			{
-				// base64 Decode php_import_headers.
-				$item->php_import_headers = base64_decode($item->php_import_headers);
+				// base64 Decode php_import_save.
+				$item->php_import_save = base64_decode($item->php_import_save);
 			}
 
 			if (!empty($item->html_import_view))
@@ -98,16 +98,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->html_import_view = base64_decode($item->html_import_view);
 			}
 
-			if (!empty($item->php_import_save))
+			if (!empty($item->php_import_headers))
 			{
-				// base64 Decode php_import_save.
-				$item->php_import_save = base64_decode($item->php_import_save);
-			}
-
-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
+				// base64 Decode php_import_headers.
+				$item->php_import_headers = base64_decode($item->php_import_headers);
 			}
 
 			if (!empty($item->php_getitems))
@@ -170,10 +164,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_postsavehook = base64_decode($item->php_postsavehook);
 			}
 
-			if (!empty($item->php_allowedit))
+			if (!empty($item->php_allowadd))
 			{
-				// base64 Decode php_allowedit.
-				$item->php_allowedit = base64_decode($item->php_allowedit);
+				// base64 Decode php_allowadd.
+				$item->php_allowadd = base64_decode($item->php_allowadd);
 			}
 
 			if (!empty($item->javascript_view_footer))
@@ -182,42 +176,48 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
 			}
 
+			if (!empty($item->php_allowedit))
+			{
+				// base64 Decode php_allowedit.
+				$item->php_allowedit = base64_decode($item->php_allowedit);
+			}
+
 			if (!empty($item->php_batchcopy))
 			{
 				// base64 Decode php_batchcopy.
 				$item->php_batchcopy = base64_decode($item->php_batchcopy);
 			}
 
-			if (!empty($item->php_batchmove))
-			{
-				// base64 Decode php_batchmove.
-				$item->php_batchmove = base64_decode($item->php_batchmove);
-			}
-
 			if (!empty($item->javascript_views_file))
 			{
 				// base64 Decode javascript_views_file.
 				$item->javascript_views_file = base64_decode($item->javascript_views_file);
 			}
 
+			if (!empty($item->php_batchmove))
+			{
+				// base64 Decode php_batchmove.
+				$item->php_batchmove = base64_decode($item->php_batchmove);
+			}
+
 			if (!empty($item->php_before_publish))
 			{
 				// base64 Decode php_before_publish.
 				$item->php_before_publish = base64_decode($item->php_before_publish);
 			}
 
-			if (!empty($item->php_after_publish))
-			{
-				// base64 Decode php_after_publish.
-				$item->php_after_publish = base64_decode($item->php_after_publish);
-			}
-
 			if (!empty($item->javascript_views_footer))
 			{
 				// base64 Decode javascript_views_footer.
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}
 
+			if (!empty($item->php_after_publish))
+			{
+				// base64 Decode php_after_publish.
+				$item->php_after_publish = base64_decode($item->php_after_publish);
+			}
+
 			if (!empty($item->php_before_delete))
 			{
 				// base64 Decode php_before_delete.
@@ -230,36 +230,36 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_after_delete = base64_decode($item->php_after_delete);
 			}
 
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}
 
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
 			if (!empty($item->php_model))
 			{
 				// base64 Decode php_model.
 				$item->php_model = base64_decode($item->php_model);
 			}
 
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
 			if (!empty($item->php_controller_list))
 			{
 				// base64 Decode php_controller_list.
 				$item->php_controller_list = base64_decode($item->php_controller_list);
 			}
 
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
+			}
+
 			if (!empty($item->php_model_list))
 			{
 				// base64 Decode php_model_list.
@@ -272,18 +272,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_display = base64_decode($item->php_import_display);
 			}
 
-			if (!empty($item->php_import))
-			{
-				// base64 Decode php_import.
-				$item->php_import = base64_decode($item->php_import);
-			}
-
 			if (!empty($item->php_ajaxmethod))
 			{
 				// base64 Decode php_ajaxmethod.
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}
 
+			if (!empty($item->php_import))
+			{
+				// base64 Decode php_import.
+				$item->php_import = base64_decode($item->php_import);
+			}
+
 			if (!empty($item->php_import_setdata))
 			{
 				// base64 Decode php_import_setdata.
@@ -296,12 +296,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_ext = base64_decode($item->php_import_ext);
 			}
 
-			if (!empty($item->addtables))
+			if (!empty($item->php_getitem))
 			{
-				// Convert the addtables field to an array.
-				$addtables = new Registry;
-				$addtables->loadString($item->addtables);
-				$item->addtables = $addtables->toArray();
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
 			}
 
 			if (!empty($item->addpermissions))
@@ -336,6 +334,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->alias_builder = $alias_builder->toArray();
 			}
 
+			if (!empty($item->addtables))
+			{
+				// Convert the addtables field to an array.
+				$addtables = new Registry;
+				$addtables->loadString($item->addtables);
+				$item->addtables = $addtables->toArray();
+			}
+
 			if (!empty($item->custom_button))
 			{
 				// Convert the custom_button field to an array.
@@ -1206,19 +1212,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['system_name'] = $data['name_single'];
 		}
 
-		// Set the addtables items to data.
-		if (isset($data['addtables']) && is_array($data['addtables']))
-		{
-			$addtables = new JRegistry;
-			$addtables->loadArray($data['addtables']);
-			$data['addtables'] = (string) $addtables;
-		}
-		elseif (!isset($data['addtables']))
-		{
-			// Set the empty addtables to data
-			$data['addtables'] = '';
-		}
-
 		// Set the addpermissions items to data.
 		if (isset($data['addpermissions']) && is_array($data['addpermissions']))
 		{
@@ -1271,6 +1264,19 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['alias_builder'] = '';
 		}
 
+		// Set the addtables items to data.
+		if (isset($data['addtables']) && is_array($data['addtables']))
+		{
+			$addtables = new JRegistry;
+			$addtables->loadArray($data['addtables']);
+			$data['addtables'] = (string) $addtables;
+		}
+		elseif (!isset($data['addtables']))
+		{
+			// Set the empty addtables to data
+			$data['addtables'] = '';
+		}
+
 		// Set the custom_button items to data.
 		if (isset($data['custom_button']) && is_array($data['custom_button']))
 		{
@@ -1297,10 +1303,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}
 
-		// Set the php_import_headers string to base64 string.
-		if (isset($data['php_import_headers']))
+		// Set the php_import_save string to base64 string.
+		if (isset($data['php_import_save']))
 		{
-			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
+			$data['php_import_save'] = base64_encode($data['php_import_save']);
 		}
 
 		// Set the html_import_view string to base64 string.
@@ -1309,16 +1315,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['html_import_view'] = base64_encode($data['html_import_view']);
 		}
 
-		// Set the php_import_save string to base64 string.
-		if (isset($data['php_import_save']))
+		// Set the php_import_headers string to base64 string.
+		if (isset($data['php_import_headers']))
 		{
-			$data['php_import_save'] = base64_encode($data['php_import_save']);
-		}
-
-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
+			$data['php_import_headers'] = base64_encode($data['php_import_headers']);
 		}
 
 		// Set the php_getitems string to base64 string.
@@ -1381,10 +1381,10 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_postsavehook'] = base64_encode($data['php_postsavehook']);
 		}
 
-		// Set the php_allowedit string to base64 string.
-		if (isset($data['php_allowedit']))
+		// Set the php_allowadd string to base64 string.
+		if (isset($data['php_allowadd']))
 		{
-			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+			$data['php_allowadd'] = base64_encode($data['php_allowadd']);
 		}
 
 		// Set the javascript_view_footer string to base64 string.
@@ -1393,42 +1393,48 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['javascript_view_footer'] = base64_encode($data['javascript_view_footer']);
 		}
 
+		// Set the php_allowedit string to base64 string.
+		if (isset($data['php_allowedit']))
+		{
+			$data['php_allowedit'] = base64_encode($data['php_allowedit']);
+		}
+
 		// Set the php_batchcopy string to base64 string.
 		if (isset($data['php_batchcopy']))
 		{
 			$data['php_batchcopy'] = base64_encode($data['php_batchcopy']);
 		}
 
-		// Set the php_batchmove string to base64 string.
-		if (isset($data['php_batchmove']))
-		{
-			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
-		}
-
 		// Set the javascript_views_file string to base64 string.
 		if (isset($data['javascript_views_file']))
 		{
 			$data['javascript_views_file'] = base64_encode($data['javascript_views_file']);
 		}
 
+		// Set the php_batchmove string to base64 string.
+		if (isset($data['php_batchmove']))
+		{
+			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
+		}
+
 		// Set the php_before_publish string to base64 string.
 		if (isset($data['php_before_publish']))
 		{
 			$data['php_before_publish'] = base64_encode($data['php_before_publish']);
 		}
 
-		// Set the php_after_publish string to base64 string.
-		if (isset($data['php_after_publish']))
-		{
-			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
-		}
-
 		// Set the javascript_views_footer string to base64 string.
 		if (isset($data['javascript_views_footer']))
 		{
 			$data['javascript_views_footer'] = base64_encode($data['javascript_views_footer']);
 		}
 
+		// Set the php_after_publish string to base64 string.
+		if (isset($data['php_after_publish']))
+		{
+			$data['php_after_publish'] = base64_encode($data['php_after_publish']);
+		}
+
 		// Set the php_before_delete string to base64 string.
 		if (isset($data['php_before_delete']))
 		{
@@ -1441,36 +1447,36 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_after_delete'] = base64_encode($data['php_after_delete']);
 		}
 
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
 
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
 		// Set the php_model string to base64 string.
 		if (isset($data['php_model']))
 		{
 			$data['php_model'] = base64_encode($data['php_model']);
 		}
 
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
 		// Set the php_controller_list string to base64 string.
 		if (isset($data['php_controller_list']))
 		{
 			$data['php_controller_list'] = base64_encode($data['php_controller_list']);
 		}
 
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
+		}
+
 		// Set the php_model_list string to base64 string.
 		if (isset($data['php_model_list']))
 		{
@@ -1483,18 +1489,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}
 
-		// Set the php_import string to base64 string.
-		if (isset($data['php_import']))
-		{
-			$data['php_import'] = base64_encode($data['php_import']);
-		}
-
 		// Set the php_ajaxmethod string to base64 string.
 		if (isset($data['php_ajaxmethod']))
 		{
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}
 
+		// Set the php_import string to base64 string.
+		if (isset($data['php_import']))
+		{
+			$data['php_import'] = base64_encode($data['php_import']);
+		}
+
 		// Set the php_import_setdata string to base64 string.
 		if (isset($data['php_import_setdata']))
 		{
@@ -1505,6 +1511,12 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		if (isset($data['php_import_ext']))
 		{
 			$data['php_import_ext'] = base64_encode($data['php_import_ext']);
+		}
+
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
 		}
         
 		// Set the Params Items to data
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 6f2df64d0..57ef44c0b 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -241,14 +241,12 @@ class ComponentbuilderModelAdmin_views extends JModelList
 							continue;
 						}
 
-						// decode php_import_headers
-						$item->php_import_headers = base64_decode($item->php_import_headers);
-						// decode html_import_view
-						$item->html_import_view = base64_decode($item->html_import_view);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
+						// decode html_import_view
+						$item->html_import_view = base64_decode($item->html_import_view);
+						// decode php_import_headers
+						$item->php_import_headers = base64_decode($item->php_import_headers);
 						// decode php_getitems
 						$item->php_getitems = base64_decode($item->php_getitems);
 						// decode php_getitems_after_all
@@ -269,48 +267,52 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->javascript_view_file = base64_decode($item->javascript_view_file);
 						// decode php_postsavehook
 						$item->php_postsavehook = base64_decode($item->php_postsavehook);
-						// decode php_allowedit
-						$item->php_allowedit = base64_decode($item->php_allowedit);
+						// decode php_allowadd
+						$item->php_allowadd = base64_decode($item->php_allowadd);
 						// decode javascript_view_footer
 						$item->javascript_view_footer = base64_decode($item->javascript_view_footer);
+						// decode php_allowedit
+						$item->php_allowedit = base64_decode($item->php_allowedit);
 						// decode php_batchcopy
 						$item->php_batchcopy = base64_decode($item->php_batchcopy);
-						// decode php_batchmove
-						$item->php_batchmove = base64_decode($item->php_batchmove);
 						// decode javascript_views_file
 						$item->javascript_views_file = base64_decode($item->javascript_views_file);
+						// decode php_batchmove
+						$item->php_batchmove = base64_decode($item->php_batchmove);
 						// decode php_before_publish
 						$item->php_before_publish = base64_decode($item->php_before_publish);
-						// decode php_after_publish
-						$item->php_after_publish = base64_decode($item->php_after_publish);
 						// decode javascript_views_footer
 						$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
+						// decode php_after_publish
+						$item->php_after_publish = base64_decode($item->php_after_publish);
 						// decode php_before_delete
 						$item->php_before_delete = base64_decode($item->php_before_delete);
 						// decode php_after_delete
 						$item->php_after_delete = base64_decode($item->php_after_delete);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
 						// decode php_model
 						$item->php_model = base64_decode($item->php_model);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
 						// decode php_controller_list
 						$item->php_controller_list = base64_decode($item->php_controller_list);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_model_list
 						$item->php_model_list = base64_decode($item->php_model_list);
 						// decode php_import_display
 						$item->php_import_display = base64_decode($item->php_import_display);
-						// decode php_import
-						$item->php_import = base64_decode($item->php_import);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode php_import
+						$item->php_import = base64_decode($item->php_import);
 						// decode php_import_setdata
 						$item->php_import_setdata = base64_decode($item->php_import_setdata);
 						// decode php_import_ext
 						$item->php_import_ext = base64_decode($item->php_import_ext);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
diff --git a/admin/models/fields/fields.php b/admin/models/fields/fields.php
index 2595b3fbc..ee76f9120 100644
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -35,24 +35,25 @@ class JFormFieldFields extends JFormFieldList
 	 */
 	public function getOptions()
 	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name','b.name'),array('id','field_name','type')));
-		$query->from($db->quoteName('#__componentbuilder_field', 'a'));
-		$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
-		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [' . $item->type . ']');
-			}
-		}
-		return $options;
+		$db = JFactory::getDBO();
+$query = $db->getQuery(true);
+$query->select($db->quoteName(array('a.id','a.name','b.name'),array('id','field_name','type')));
+$query->from($db->quoteName('#__componentbuilder_field', 'a'));
+		$query->join('LEFT', '#__componentbuilder_fieldtype AS b ON b.id = a.fieldtype');
+$query->where($db->quoteName('a.published') . ' >= 1');
+$query->order('a.name ASC');
+$db->setQuery((string)$query);
+$items = $db->loadObjectList();
+$options = array();
+if ($items)
+{
+	$options[] = JHtml::_('select.option', '', 'Select an option');
+	foreach($items as $item)
+	{
+		$options[] = JHtml::_('select.option', $item->id, $item->field_name . ' [' . $item->type . ']');
+	}
+}
+
+return $options;
 	}
 }
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 3dc229162..03aa3f4a2 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -125,7 +125,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWaefields()
+	public function getWaffields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@@ -207,13 +207,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationWaefields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWaffields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationWaefields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWaffields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationWaefields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWaffields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationWaefields($item->store, 'store');
+					$item->store = $this->selectionTranslationWaffields($item->store, 'store');
 				}
 			}
 
@@ -227,7 +227,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 *
 	 * @return translatable string
 	 */
-	public function selectionTranslationWaefields($value,$name)
+	public function selectionTranslationWaffields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
diff --git a/admin/models/forms/admin_fields.xml b/admin/models/forms/admin_fields.xml
index 61a6ee536..e72456dbc 100644
--- a/admin/models/forms/admin_fields.xml
+++ b/admin/models/forms/admin_fields.xml
@@ -114,7 +114,7 @@
 					name="field"
 					label="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_ADMIN_FIELDS_FIELD_DESCRIPTION"
-					class="list_class"
+					class="list_class fieldFull"
 					multiple="false"
 					required="false"
 					button="false"
diff --git a/admin/models/forms/admin_view.js b/admin/models/forms/admin_view.js
index 23c22d172..aa2e0ff50 100644
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
@@ -34,17 +34,18 @@ jform_vvvvvxvvxj_required = false;
 jform_vvvvvxwvxk_required = false;
 jform_vvvvvxxvxl_required = false;
 jform_vvvvvxyvxm_required = false;
-jform_vvvvvycvxn_required = false;
-jform_vvvvvycvxo_required = false;
-jform_vvvvvycvxp_required = false;
-jform_vvvvvycvxq_required = false;
-jform_vvvvvycvxr_required = false;
-jform_vvvvvycvxs_required = false;
-jform_vvvvvycvxt_required = false;
-jform_vvvvvyevxu_required = false;
-jform_vvvvvyevxv_required = false;
-jform_vvvvvyevxw_required = false;
-jform_vvvvvyevxx_required = false;
+jform_vvvvvxzvxn_required = false;
+jform_vvvvvydvxo_required = false;
+jform_vvvvvydvxp_required = false;
+jform_vvvvvydvxq_required = false;
+jform_vvvvvydvxr_required = false;
+jform_vvvvvydvxs_required = false;
+jform_vvvvvydvxt_required = false;
+jform_vvvvvydvxu_required = false;
+jform_vvvvvyfvxv_required = false;
+jform_vvvvvyfvxw_required = false;
+jform_vvvvvyfvxx_required = false;
+jform_vvvvvyfvxy_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
@@ -94,49 +95,52 @@ jQuery(document).ready(function()
 	var add_php_postsavehook_vvvvvxo = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
 	vvvvvxo(add_php_postsavehook_vvvvvxo);
 
-	var add_php_allowedit_vvvvvxp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxp(add_php_allowedit_vvvvvxp);
+	var add_php_allowadd_vvvvvxp = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
+	vvvvvxp(add_php_allowadd_vvvvvxp);
 
-	var add_php_batchcopy_vvvvvxq = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxq(add_php_batchcopy_vvvvvxq);
+	var add_php_allowedit_vvvvvxq = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxq(add_php_allowedit_vvvvvxq);
 
-	var add_php_batchmove_vvvvvxr = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxr(add_php_batchmove_vvvvvxr);
+	var add_php_batchcopy_vvvvvxr = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxr(add_php_batchcopy_vvvvvxr);
 
-	var add_php_before_publish_vvvvvxs = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxs(add_php_before_publish_vvvvvxs);
+	var add_php_batchmove_vvvvvxs = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxs(add_php_batchmove_vvvvvxs);
 
-	var add_php_after_publish_vvvvvxt = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxt(add_php_after_publish_vvvvvxt);
+	var add_php_before_publish_vvvvvxt = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxt(add_php_before_publish_vvvvvxt);
 
-	var add_php_before_delete_vvvvvxu = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxu(add_php_before_delete_vvvvvxu);
+	var add_php_after_publish_vvvvvxu = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxu(add_php_after_publish_vvvvvxu);
 
-	var add_php_after_delete_vvvvvxv = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxv(add_php_after_delete_vvvvvxv);
+	var add_php_before_delete_vvvvvxv = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxv(add_php_before_delete_vvvvvxv);
 
-	var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxw(add_php_document_vvvvvxw);
+	var add_php_after_delete_vvvvvxw = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxw(add_php_after_delete_vvvvvxw);
 
-	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(add_sql_vvvvvxx);
+	var add_php_document_vvvvvxx = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxx(add_php_document_vvvvvxx);
 
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	vvvvvxy(add_sql_vvvvvxy);
 
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
 
-	var add_custom_import_vvvvvyc = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyc(add_custom_import_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 	var add_custom_import_vvvvvyd = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
 	vvvvvyd(add_custom_import_vvvvvyd);
 
-	var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvye(add_custom_button_vvvvvye);
+	var add_custom_import_vvvvvye = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvye(add_custom_import_vvvvvye);
+
+	var add_custom_button_vvvvvyf = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyf(add_custom_button_vvvvvyf);
 });
 
 // the vvvvvxa function
@@ -607,320 +611,351 @@ function vvvvvxo(add_php_postsavehook_vvvvvxo)
 }
 
 // the vvvvvxp function
-function vvvvvxp(add_php_allowedit_vvvvvxp)
+function vvvvvxp(add_php_allowadd_vvvvvxp)
 {
 	// set the function logic
-	if (add_php_allowedit_vvvvvxp == 1)
+	if (add_php_allowadd_vvvvvxp == 1)
 	{
-		jQuery('#jform_php_allowedit-lbl').closest('.control-group').show();
+		jQuery('#jform_php_allowadd-lbl').closest('.control-group').show();
 		if (jform_vvvvvxpvxd_required)
 		{
-			updateFieldRequired('php_allowedit',0);
-			jQuery('#jform_php_allowedit').prop('required','required');
-			jQuery('#jform_php_allowedit').attr('aria-required',true);
-			jQuery('#jform_php_allowedit').addClass('required');
+			updateFieldRequired('php_allowadd',0);
+			jQuery('#jform_php_allowadd').prop('required','required');
+			jQuery('#jform_php_allowadd').attr('aria-required',true);
+			jQuery('#jform_php_allowadd').addClass('required');
 			jform_vvvvvxpvxd_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_allowedit-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_allowadd-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxpvxd_required)
 		{
-			updateFieldRequired('php_allowedit',1);
-			jQuery('#jform_php_allowedit').removeAttr('required');
-			jQuery('#jform_php_allowedit').removeAttr('aria-required');
-			jQuery('#jform_php_allowedit').removeClass('required');
+			updateFieldRequired('php_allowadd',1);
+			jQuery('#jform_php_allowadd').removeAttr('required');
+			jQuery('#jform_php_allowadd').removeAttr('aria-required');
+			jQuery('#jform_php_allowadd').removeClass('required');
 			jform_vvvvvxpvxd_required = true;
 		}
 	}
 }
 
 // the vvvvvxq function
-function vvvvvxq(add_php_batchcopy_vvvvvxq)
+function vvvvvxq(add_php_allowedit_vvvvvxq)
 {
 	// set the function logic
-	if (add_php_batchcopy_vvvvvxq == 1)
+	if (add_php_allowedit_vvvvvxq == 1)
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
+		jQuery('#jform_php_allowedit-lbl').closest('.control-group').show();
 		if (jform_vvvvvxqvxe_required)
 		{
-			updateFieldRequired('php_batchcopy',0);
-			jQuery('#jform_php_batchcopy').prop('required','required');
-			jQuery('#jform_php_batchcopy').attr('aria-required',true);
-			jQuery('#jform_php_batchcopy').addClass('required');
+			updateFieldRequired('php_allowedit',0);
+			jQuery('#jform_php_allowedit').prop('required','required');
+			jQuery('#jform_php_allowedit').attr('aria-required',true);
+			jQuery('#jform_php_allowedit').addClass('required');
 			jform_vvvvvxqvxe_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_allowedit-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxqvxe_required)
 		{
-			updateFieldRequired('php_batchcopy',1);
-			jQuery('#jform_php_batchcopy').removeAttr('required');
-			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
-			jQuery('#jform_php_batchcopy').removeClass('required');
+			updateFieldRequired('php_allowedit',1);
+			jQuery('#jform_php_allowedit').removeAttr('required');
+			jQuery('#jform_php_allowedit').removeAttr('aria-required');
+			jQuery('#jform_php_allowedit').removeClass('required');
 			jform_vvvvvxqvxe_required = true;
 		}
 	}
 }
 
 // the vvvvvxr function
-function vvvvvxr(add_php_batchmove_vvvvvxr)
+function vvvvvxr(add_php_batchcopy_vvvvvxr)
 {
 	// set the function logic
-	if (add_php_batchmove_vvvvvxr == 1)
+	if (add_php_batchcopy_vvvvvxr == 1)
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').show();
 		if (jform_vvvvvxrvxf_required)
 		{
-			updateFieldRequired('php_batchmove',0);
-			jQuery('#jform_php_batchmove').prop('required','required');
-			jQuery('#jform_php_batchmove').attr('aria-required',true);
-			jQuery('#jform_php_batchmove').addClass('required');
+			updateFieldRequired('php_batchcopy',0);
+			jQuery('#jform_php_batchcopy').prop('required','required');
+			jQuery('#jform_php_batchcopy').attr('aria-required',true);
+			jQuery('#jform_php_batchcopy').addClass('required');
 			jform_vvvvvxrvxf_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_batchcopy-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxrvxf_required)
 		{
-			updateFieldRequired('php_batchmove',1);
-			jQuery('#jform_php_batchmove').removeAttr('required');
-			jQuery('#jform_php_batchmove').removeAttr('aria-required');
-			jQuery('#jform_php_batchmove').removeClass('required');
+			updateFieldRequired('php_batchcopy',1);
+			jQuery('#jform_php_batchcopy').removeAttr('required');
+			jQuery('#jform_php_batchcopy').removeAttr('aria-required');
+			jQuery('#jform_php_batchcopy').removeClass('required');
 			jform_vvvvvxrvxf_required = true;
 		}
 	}
 }
 
 // the vvvvvxs function
-function vvvvvxs(add_php_before_publish_vvvvvxs)
+function vvvvvxs(add_php_batchmove_vvvvvxs)
 {
 	// set the function logic
-	if (add_php_before_publish_vvvvvxs == 1)
+	if (add_php_batchmove_vvvvvxs == 1)
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').show();
 		if (jform_vvvvvxsvxg_required)
 		{
-			updateFieldRequired('php_before_publish',0);
-			jQuery('#jform_php_before_publish').prop('required','required');
-			jQuery('#jform_php_before_publish').attr('aria-required',true);
-			jQuery('#jform_php_before_publish').addClass('required');
+			updateFieldRequired('php_batchmove',0);
+			jQuery('#jform_php_batchmove').prop('required','required');
+			jQuery('#jform_php_batchmove').attr('aria-required',true);
+			jQuery('#jform_php_batchmove').addClass('required');
 			jform_vvvvvxsvxg_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_batchmove-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxsvxg_required)
 		{
-			updateFieldRequired('php_before_publish',1);
-			jQuery('#jform_php_before_publish').removeAttr('required');
-			jQuery('#jform_php_before_publish').removeAttr('aria-required');
-			jQuery('#jform_php_before_publish').removeClass('required');
+			updateFieldRequired('php_batchmove',1);
+			jQuery('#jform_php_batchmove').removeAttr('required');
+			jQuery('#jform_php_batchmove').removeAttr('aria-required');
+			jQuery('#jform_php_batchmove').removeClass('required');
 			jform_vvvvvxsvxg_required = true;
 		}
 	}
 }
 
 // the vvvvvxt function
-function vvvvvxt(add_php_after_publish_vvvvvxt)
+function vvvvvxt(add_php_before_publish_vvvvvxt)
 {
 	// set the function logic
-	if (add_php_after_publish_vvvvvxt == 1)
+	if (add_php_before_publish_vvvvvxt == 1)
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').show();
 		if (jform_vvvvvxtvxh_required)
 		{
-			updateFieldRequired('php_after_publish',0);
-			jQuery('#jform_php_after_publish').prop('required','required');
-			jQuery('#jform_php_after_publish').attr('aria-required',true);
-			jQuery('#jform_php_after_publish').addClass('required');
+			updateFieldRequired('php_before_publish',0);
+			jQuery('#jform_php_before_publish').prop('required','required');
+			jQuery('#jform_php_before_publish').attr('aria-required',true);
+			jQuery('#jform_php_before_publish').addClass('required');
 			jform_vvvvvxtvxh_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_before_publish-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxtvxh_required)
 		{
-			updateFieldRequired('php_after_publish',1);
-			jQuery('#jform_php_after_publish').removeAttr('required');
-			jQuery('#jform_php_after_publish').removeAttr('aria-required');
-			jQuery('#jform_php_after_publish').removeClass('required');
+			updateFieldRequired('php_before_publish',1);
+			jQuery('#jform_php_before_publish').removeAttr('required');
+			jQuery('#jform_php_before_publish').removeAttr('aria-required');
+			jQuery('#jform_php_before_publish').removeClass('required');
 			jform_vvvvvxtvxh_required = true;
 		}
 	}
 }
 
 // the vvvvvxu function
-function vvvvvxu(add_php_before_delete_vvvvvxu)
+function vvvvvxu(add_php_after_publish_vvvvvxu)
 {
 	// set the function logic
-	if (add_php_before_delete_vvvvvxu == 1)
+	if (add_php_after_publish_vvvvvxu == 1)
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').show();
 		if (jform_vvvvvxuvxi_required)
 		{
-			updateFieldRequired('php_before_delete',0);
-			jQuery('#jform_php_before_delete').prop('required','required');
-			jQuery('#jform_php_before_delete').attr('aria-required',true);
-			jQuery('#jform_php_before_delete').addClass('required');
+			updateFieldRequired('php_after_publish',0);
+			jQuery('#jform_php_after_publish').prop('required','required');
+			jQuery('#jform_php_after_publish').attr('aria-required',true);
+			jQuery('#jform_php_after_publish').addClass('required');
 			jform_vvvvvxuvxi_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_after_publish-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxuvxi_required)
 		{
-			updateFieldRequired('php_before_delete',1);
-			jQuery('#jform_php_before_delete').removeAttr('required');
-			jQuery('#jform_php_before_delete').removeAttr('aria-required');
-			jQuery('#jform_php_before_delete').removeClass('required');
+			updateFieldRequired('php_after_publish',1);
+			jQuery('#jform_php_after_publish').removeAttr('required');
+			jQuery('#jform_php_after_publish').removeAttr('aria-required');
+			jQuery('#jform_php_after_publish').removeClass('required');
 			jform_vvvvvxuvxi_required = true;
 		}
 	}
 }
 
 // the vvvvvxv function
-function vvvvvxv(add_php_after_delete_vvvvvxv)
+function vvvvvxv(add_php_before_delete_vvvvvxv)
 {
 	// set the function logic
-	if (add_php_after_delete_vvvvvxv == 1)
+	if (add_php_before_delete_vvvvvxv == 1)
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').show();
 		if (jform_vvvvvxvvxj_required)
 		{
-			updateFieldRequired('php_after_delete',0);
-			jQuery('#jform_php_after_delete').prop('required','required');
-			jQuery('#jform_php_after_delete').attr('aria-required',true);
-			jQuery('#jform_php_after_delete').addClass('required');
+			updateFieldRequired('php_before_delete',0);
+			jQuery('#jform_php_before_delete').prop('required','required');
+			jQuery('#jform_php_before_delete').attr('aria-required',true);
+			jQuery('#jform_php_before_delete').addClass('required');
 			jform_vvvvvxvvxj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_before_delete-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxvvxj_required)
 		{
-			updateFieldRequired('php_after_delete',1);
-			jQuery('#jform_php_after_delete').removeAttr('required');
-			jQuery('#jform_php_after_delete').removeAttr('aria-required');
-			jQuery('#jform_php_after_delete').removeClass('required');
+			updateFieldRequired('php_before_delete',1);
+			jQuery('#jform_php_before_delete').removeAttr('required');
+			jQuery('#jform_php_before_delete').removeAttr('aria-required');
+			jQuery('#jform_php_before_delete').removeClass('required');
 			jform_vvvvvxvvxj_required = true;
 		}
 	}
 }
 
 // the vvvvvxw function
-function vvvvvxw(add_php_document_vvvvvxw)
+function vvvvvxw(add_php_after_delete_vvvvvxw)
 {
 	// set the function logic
-	if (add_php_document_vvvvvxw == 1)
+	if (add_php_after_delete_vvvvvxw == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').show();
 		if (jform_vvvvvxwvxk_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_after_delete',0);
+			jQuery('#jform_php_after_delete').prop('required','required');
+			jQuery('#jform_php_after_delete').attr('aria-required',true);
+			jQuery('#jform_php_after_delete').addClass('required');
 			jform_vvvvvxwvxk_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_after_delete-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxwvxk_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_after_delete',1);
+			jQuery('#jform_php_after_delete').removeAttr('required');
+			jQuery('#jform_php_after_delete').removeAttr('aria-required');
+			jQuery('#jform_php_after_delete').removeClass('required');
 			jform_vvvvvxwvxk_required = true;
 		}
 	}
 }
 
 // the vvvvvxx function
-function vvvvvxx(add_sql_vvvvvxx)
+function vvvvvxx(add_php_document_vvvvvxx)
 {
 	// set the function logic
-	if (add_sql_vvvvvxx == 1)
+	if (add_php_document_vvvvvxx == 1)
 	{
-		jQuery('#jform_source').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvxxvxl_required)
 		{
-			updateFieldRequired('source',0);
-			jQuery('#jform_source').prop('required','required');
-			jQuery('#jform_source').attr('aria-required',true);
-			jQuery('#jform_source').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvxxvxl_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_source').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvxxvxl_required)
 		{
-			updateFieldRequired('source',1);
-			jQuery('#jform_source').removeAttr('required');
-			jQuery('#jform_source').removeAttr('aria-required');
-			jQuery('#jform_source').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvxxvxl_required = true;
 		}
 	}
 }
 
 // the vvvvvxy function
-function vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy)
+function vvvvvxy(add_sql_vvvvvxy)
 {
 	// set the function logic
-	if (source_vvvvvxy == 2 && add_sql_vvvvvxy == 1)
+	if (add_sql_vvvvvxy == 1)
 	{
-		jQuery('#jform_sql').closest('.control-group').show();
+		jQuery('#jform_source').closest('.control-group').show();
 		if (jform_vvvvvxyvxm_required)
 		{
-			updateFieldRequired('sql',0);
-			jQuery('#jform_sql').prop('required','required');
-			jQuery('#jform_sql').attr('aria-required',true);
-			jQuery('#jform_sql').addClass('required');
+			updateFieldRequired('source',0);
+			jQuery('#jform_source').prop('required','required');
+			jQuery('#jform_source').attr('aria-required',true);
+			jQuery('#jform_source').addClass('required');
 			jform_vvvvvxyvxm_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_sql').closest('.control-group').hide();
+		jQuery('#jform_source').closest('.control-group').hide();
 		if (!jform_vvvvvxyvxm_required)
 		{
-			updateFieldRequired('sql',1);
-			jQuery('#jform_sql').removeAttr('required');
-			jQuery('#jform_sql').removeAttr('aria-required');
-			jQuery('#jform_sql').removeClass('required');
+			updateFieldRequired('source',1);
+			jQuery('#jform_source').removeAttr('required');
+			jQuery('#jform_source').removeAttr('aria-required');
+			jQuery('#jform_source').removeClass('required');
 			jform_vvvvvxyvxm_required = true;
 		}
 	}
 }
 
-// the vvvvvya function
-function vvvvvya(source_vvvvvya,add_sql_vvvvvya)
+// the vvvvvxz function
+function vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz)
 {
 	// set the function logic
-	if (source_vvvvvya == 1 && add_sql_vvvvvya == 1)
+	if (source_vvvvvxz == 2 && add_sql_vvvvvxz == 1)
+	{
+		jQuery('#jform_sql').closest('.control-group').show();
+		if (jform_vvvvvxzvxn_required)
+		{
+			updateFieldRequired('sql',0);
+			jQuery('#jform_sql').prop('required','required');
+			jQuery('#jform_sql').attr('aria-required',true);
+			jQuery('#jform_sql').addClass('required');
+			jform_vvvvvxzvxn_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_sql').closest('.control-group').hide();
+		if (!jform_vvvvvxzvxn_required)
+		{
+			updateFieldRequired('sql',1);
+			jQuery('#jform_sql').removeAttr('required');
+			jQuery('#jform_sql').removeAttr('aria-required');
+			jQuery('#jform_sql').removeClass('required');
+			jform_vvvvvxzvxn_required = true;
+		}
+	}
+}
+
+// the vvvvvyb function
+function vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb)
+{
+	// set the function logic
+	if (source_vvvvvyb == 1 && add_sql_vvvvvyb == 1)
 	{
 		jQuery('#jform_addtables-lbl').closest('.control-group').show();
 	}
@@ -930,158 +965,158 @@ function vvvvvya(source_vvvvvya,add_sql_vvvvvya)
 	}
 }
 
-// the vvvvvyc function
-function vvvvvyc(add_custom_import_vvvvvyc)
+// the vvvvvyd function
+function vvvvvyd(add_custom_import_vvvvvyd)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyc == 1)
+	if (add_custom_import_vvvvvyd == 1)
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').show();
-		if (jform_vvvvvycvxn_required)
+		if (jform_vvvvvydvxo_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_vvvvvycvxn_required = false;
+			jform_vvvvvydvxo_required = false;
 		}
 
 		jQuery('.note_advanced_import').closest('.control-group').show();
 		jQuery('#jform_php_import_display').closest('.control-group').show();
-		if (jform_vvvvvycvxo_required)
+		if (jform_vvvvvydvxp_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_vvvvvycvxo_required = false;
+			jform_vvvvvydvxp_required = false;
 		}
 
 		jQuery('#jform_php_import_ext').closest('.control-group').show();
-		if (jform_vvvvvycvxp_required)
+		if (jform_vvvvvydvxq_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_vvvvvycvxp_required = false;
+			jform_vvvvvydvxq_required = false;
 		}
 
 		jQuery('#jform_php_import_headers').closest('.control-group').show();
-		if (jform_vvvvvycvxq_required)
+		if (jform_vvvvvydvxr_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_vvvvvycvxq_required = false;
+			jform_vvvvvydvxr_required = false;
 		}
 
 		jQuery('#jform_php_import').closest('.control-group').show();
-		if (jform_vvvvvycvxr_required)
+		if (jform_vvvvvydvxs_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_vvvvvycvxr_required = false;
+			jform_vvvvvydvxs_required = false;
 		}
 
 		jQuery('#jform_php_import_save').closest('.control-group').show();
-		if (jform_vvvvvycvxs_required)
+		if (jform_vvvvvydvxt_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_vvvvvycvxs_required = false;
+			jform_vvvvvydvxt_required = false;
 		}
 
 		jQuery('#jform_php_import_setdata').closest('.control-group').show();
-		if (jform_vvvvvycvxt_required)
+		if (jform_vvvvvydvxu_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_vvvvvycvxt_required = false;
+			jform_vvvvvydvxu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_html_import_view').closest('.control-group').hide();
-		if (!jform_vvvvvycvxn_required)
+		if (!jform_vvvvvydvxo_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_vvvvvycvxn_required = true;
+			jform_vvvvvydvxo_required = true;
 		}
 		jQuery('.note_advanced_import').closest('.control-group').hide();
 		jQuery('#jform_php_import_display').closest('.control-group').hide();
-		if (!jform_vvvvvycvxo_required)
+		if (!jform_vvvvvydvxp_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_vvvvvycvxo_required = true;
+			jform_vvvvvydvxp_required = true;
 		}
 		jQuery('#jform_php_import_ext').closest('.control-group').hide();
-		if (!jform_vvvvvycvxp_required)
+		if (!jform_vvvvvydvxq_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_vvvvvycvxp_required = true;
+			jform_vvvvvydvxq_required = true;
 		}
 		jQuery('#jform_php_import_headers').closest('.control-group').hide();
-		if (!jform_vvvvvycvxq_required)
+		if (!jform_vvvvvydvxr_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_vvvvvycvxq_required = true;
+			jform_vvvvvydvxr_required = true;
 		}
 		jQuery('#jform_php_import').closest('.control-group').hide();
-		if (!jform_vvvvvycvxr_required)
+		if (!jform_vvvvvydvxs_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_vvvvvycvxr_required = true;
+			jform_vvvvvydvxs_required = true;
 		}
 		jQuery('#jform_php_import_save').closest('.control-group').hide();
-		if (!jform_vvvvvycvxs_required)
+		if (!jform_vvvvvydvxt_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_vvvvvycvxs_required = true;
+			jform_vvvvvydvxt_required = true;
 		}
 		jQuery('#jform_php_import_setdata').closest('.control-group').hide();
-		if (!jform_vvvvvycvxt_required)
+		if (!jform_vvvvvydvxu_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_vvvvvycvxt_required = true;
+			jform_vvvvvydvxu_required = true;
 		}
 	}
 }
 
-// the vvvvvyd function
-function vvvvvyd(add_custom_import_vvvvvyd)
+// the vvvvvye function
+function vvvvvye(add_custom_import_vvvvvye)
 {
 	// set the function logic
-	if (add_custom_import_vvvvvyd == 0)
+	if (add_custom_import_vvvvvye == 0)
 	{
 		jQuery('.note_beginner_import').closest('.control-group').show();
 	}
@@ -1091,51 +1126,51 @@ function vvvvvyd(add_custom_import_vvvvvyd)
 	}
 }
 
-// the vvvvvye function
-function vvvvvye(add_custom_button_vvvvvye)
+// the vvvvvyf function
+function vvvvvyf(add_custom_button_vvvvvyf)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvye == 1)
+	if (add_custom_button_vvvvvyf == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		if (jform_vvvvvyevxu_required)
+		if (jform_vvvvvyfvxv_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyevxu_required = false;
+			jform_vvvvvyfvxv_required = false;
 		}
 
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').show();
-		if (jform_vvvvvyevxv_required)
+		if (jform_vvvvvyfvxw_required)
 		{
 			updateFieldRequired('php_controller_list',0);
 			jQuery('#jform_php_controller_list').prop('required','required');
 			jQuery('#jform_php_controller_list').attr('aria-required',true);
 			jQuery('#jform_php_controller_list').addClass('required');
-			jform_vvvvvyevxv_required = false;
+			jform_vvvvvyfvxw_required = false;
 		}
 
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		if (jform_vvvvvyevxw_required)
+		if (jform_vvvvvyfvxx_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyevxw_required = false;
+			jform_vvvvvyfvxx_required = false;
 		}
 
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').show();
-		if (jform_vvvvvyevxx_required)
+		if (jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_model_list',0);
 			jQuery('#jform_php_model_list').prop('required','required');
 			jQuery('#jform_php_model_list').attr('aria-required',true);
 			jQuery('#jform_php_model_list').addClass('required');
-			jform_vvvvvyevxx_required = false;
+			jform_vvvvvyfvxy_required = false;
 		}
 
 	}
@@ -1143,40 +1178,40 @@ function vvvvvye(add_custom_button_vvvvvye)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyevxu_required)
+		if (!jform_vvvvvyfvxv_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyevxu_required = true;
+			jform_vvvvvyfvxv_required = true;
 		}
 		jQuery('#jform_php_controller_list-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyevxv_required)
+		if (!jform_vvvvvyfvxw_required)
 		{
 			updateFieldRequired('php_controller_list',1);
 			jQuery('#jform_php_controller_list').removeAttr('required');
 			jQuery('#jform_php_controller_list').removeAttr('aria-required');
 			jQuery('#jform_php_controller_list').removeClass('required');
-			jform_vvvvvyevxv_required = true;
+			jform_vvvvvyfvxw_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyevxw_required)
+		if (!jform_vvvvvyfvxx_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyevxw_required = true;
+			jform_vvvvvyfvxx_required = true;
 		}
 		jQuery('#jform_php_model_list-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyevxx_required)
+		if (!jform_vvvvvyfvxy_required)
 		{
 			updateFieldRequired('php_model_list',1);
 			jQuery('#jform_php_model_list').removeAttr('required');
 			jQuery('#jform_php_model_list').removeAttr('aria-required');
 			jQuery('#jform_php_model_list').removeClass('required');
-			jform_vvvvvyevxx_required = true;
+			jform_vvvvvyfvxy_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/admin_view.xml b/admin/models/forms/admin_view.xml
index 271ab8760..9412af4c2 100644
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@@ -144,25 +144,11 @@
 			message="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_MESSAGE"
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SHORT_DESCRIPTION_HINT"
 		/>
-		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
+		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
+			name="add_php_allowedit"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -200,61 +186,48 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Icon_add Field. Type: Media. (joomla) -->
+		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
 		<field
-			type="media"
-			name="icon_add"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
-			directory=""
-		/>
-		<!-- Php_import_headers Field. Type: Textarea. (joomla) -->
+			type="radio"
+			name="add_php_getlistquery"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_headers"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
+			name="php_import_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
 			required="true"
 		/>
-		<!-- Addtables Field. Type: Subform. (joomla) -->
+		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
+		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
 		<field
-			type="subform"
-			name="addtables"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
-			layout="joomla.form.field.subform.repeatable-table"
-			multiple="true"
-			icon="list">
-			<form hidden="true" name="list_addtables_modal" repeat="true">
-				<!-- Table Field. Type: Dbtables. (custom) -->
-				<field
-					type="dbtables"
-					name="table"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL"
-					class="list_class"
-					multiple="false"
-					default="0"
-					required="false"
-					button="false"
-				/>
-				<!-- Sourcemap Field. Type: Textarea. (joomla) -->
-				<field
-					type="textarea"
-					name="sourcemap"
-					label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
-					rows="22"
-					cols="30"
-					description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
-					class="text_area span4"
-					filter="HTML"
-					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
-					required="false"
-				/>
-			</form>
+			type="radio"
+			name="add_php_after_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
 		<!-- Type Field. Type: List. (joomla) -->
 		<field
@@ -307,11 +280,11 @@
 			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_CATEGORY_DESCRIPTION"
 			directory=""
 		/>
-		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
+			name="add_php_batchmove"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -327,54 +300,11 @@
 			name="not_required"
 			default="[]"
 		/>
-		<!-- Add_php_document Field. Type: Radio. (joomla) -->
+		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_php_getitems Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_getitems"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_custom_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
-		<!-- Add_php_getlistquery Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_php_getlistquery"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETLISTQUERY_LABEL"
+			name="add_php_after_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -386,19 +316,11 @@
 		</field>
 		<!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_permissions" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION" heading="h4" class="alert alert-info note_on_permissions" />
-		<!-- Icon Field. Type: Media. (joomla) -->
-		<field
-			type="media"
-			name="icon"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
-			directory=""
-		/>
-		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
+		<!-- Add_sql Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_getitems_after_all"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
+			name="add_sql"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -481,36 +403,29 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_php_getform Field. Type: Radio. (joomla) -->
+		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_getform"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
+			type="textarea"
+			name="html_import_view"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
+			required="true"
+		/>
 		<!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_tabs" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION" heading="h4" class="alert alert-info note_on_tabs" />
-		<!-- Add_php_save Field. Type: Radio. (joomla) -->
+		<!-- Icon_add Field. Type: Media. (joomla) -->
 		<field
-			type="radio"
-			name="add_php_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
-			<option value="0">
-				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
-		</field>
+			type="media"
+			name="icon_add"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_ADD_DESCRIPTION"
+			directory=""
+		/>
 		<!-- Addtabs Field. Type: Subform. (joomla) -->
 		<field
 			type="subform"
@@ -539,11 +454,11 @@
 				/>
 			</form>
 		</field>
-		<!-- Add_php_allowedit Field. Type: Radio. (joomla) -->
+		<!-- Add_php_getform Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWEDIT_LABEL"
+			name="add_php_getform"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETFORM_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -555,11 +470,11 @@
 		</field>
 		<!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_on_linked_views" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION" heading="h4" class="alert alert-info note_on_linked_views" />
-		<!-- Add_php_batchmove Field. Type: Radio. (joomla) -->
+		<!-- Add_php_save Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHMOVE_LABEL"
+			name="add_php_save"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_SAVE_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -658,11 +573,11 @@
 				</field>
 			</form>
 		</field>
-		<!-- Add_php_after_publish Field. Type: Radio. (joomla) -->
+		<!-- Add_php_allowadd Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_PUBLISH_LABEL"
+			name="add_php_allowadd"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_ALLOWADD_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -674,11 +589,11 @@
 		</field>
 		<!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_notice" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION" heading="h4" class="alert alert-info note_create_edit_notice" />
-		<!-- Add_php_after_delete Field. Type: Radio. (joomla) -->
+		<!-- Add_php_batchcopy Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_AFTER_DELETE_LABEL"
+			name="add_php_batchcopy"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BATCHCOPY_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -702,11 +617,11 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_CUSTOM</option>
 		</field>
-		<!-- Add_sql Field. Type: Radio. (joomla) -->
+		<!-- Add_php_before_publish Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_sql"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_SQL_LABEL"
+			name="add_php_before_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_PUBLISH_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -718,23 +633,36 @@
 		</field>
 		<!-- Note_alias_builder_custom Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_alias_builder_custom" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_CUSTOM_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_custom" showon="alias_builder_type:2" />
-		<!-- Note_beginner_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_beginner_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_BEGINNER_IMPORT_DESCRIPTION" heading="h4" class="alert alert-info note_beginner_import" />
+		<!-- Add_php_before_delete Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_before_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_BEFORE_DELETE_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Note_alias_builder_default Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_alias_builder_default" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ALIAS_BUILDER_DEFAULT_DESCRIPTION" heading="h4" class="alert alert-info note_alias_builder_default" showon="alias_builder_type:1" />
-		<!-- Html_import_view Field. Type: Textarea. (joomla) -->
+		<!-- Add_php_document Field. Type: Radio. (joomla) -->
 		<field
-			type="textarea"
-			name="html_import_view"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_HTML_IMPORT_VIEW_HINT"
-			required="true"
-		/>
+			type="radio"
+			name="add_php_document"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Alias_builder Field. Type: Aliasbuilder. (custom) -->
 		<field
 			type="aliasbuilder"
@@ -745,40 +673,109 @@
 			multiple="true"
 			showon="alias_builder_type:2"
 		/>
-		<!-- Php_import_save Field. Type: Textarea. (joomla) -->
+		<!-- Addtables Field. Type: Subform. (joomla) -->
 		<field
-			type="textarea"
-			name="php_import_save"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SAVE_HINT"
-			required="true"
-		/>
+			type="subform"
+			name="addtables"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADDTABLES_LABEL"
+			layout="joomla.form.field.subform.repeatable-table"
+			multiple="true"
+			icon="list">
+			<form hidden="true" name="list_addtables_modal" repeat="true">
+				<!-- Table Field. Type: Dbtables. (custom) -->
+				<field
+					type="dbtables"
+					name="table"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_TABLE_LABEL"
+					class="list_class"
+					multiple="false"
+					default="0"
+					required="false"
+					button="false"
+				/>
+				<!-- Sourcemap Field. Type: Textarea. (joomla) -->
+				<field
+					type="textarea"
+					name="sourcemap"
+					label="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_LABEL"
+					rows="22"
+					cols="30"
+					description="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_DESCRIPTION"
+					class="text_area span4"
+					filter="HTML"
+					hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SOURCEMAP_HINT"
+					required="false"
+				/>
+			</form>
+		</field>
 		<!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_buttons" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION" class="note_create_edit_buttons" />
-		<!-- Php_getitem Field. Type: Editor. (joomla) -->
+		<!-- Add_custom_import Field. Type: Radio. (joomla) -->
 		<field
-			type="editor"
-			name="php_getitem"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
+			type="radio"
+			name="add_custom_import"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_CUSTOM_IMPORT_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Add_php_getitems Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_getitems"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
+		<!-- Php_import_headers Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_headers"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_LABEL"
 			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_DESCRIPTION"
+			class="text_area span12"
 			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HEADERS_HINT"
 			required="true"
-			validate="code"
 		/>
+		<!-- Add_php_getitems_after_all Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_php_getitems_after_all"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ADD_PHP_GETITEMS_AFTER_ALL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_YES</option>
+			<option value="0">
+				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
+		</field>
 		<!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla) -->
 		<field type="note" name="note_create_edit_display" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION" class="note_create_edit_display" />
+		<!-- Icon Field. Type: Media. (joomla) -->
+		<field
+			type="media"
+			name="icon"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_ICON_DESCRIPTION"
+			directory=""
+		/>
 		<!-- Php_getitems Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -1005,12 +1002,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_allowedit Field. Type: Editor. (joomla) -->
+		<!-- Php_allowadd Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_allowedit"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION"
+			name="php_allowadd"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWADD_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWADD_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1039,12 +1036,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
+		<!-- Php_allowedit Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchcopy"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
+			name="php_allowedit"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_ALLOWEDIT_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1070,12 +1067,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
+		<!-- Php_batchcopy Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_batchmove"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
+			name="php_batchcopy"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1104,12 +1101,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_batchmove Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
+			name="php_batchmove"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1135,12 +1132,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
+		<!-- Php_before_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_publish"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
+			name="php_before_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1169,12 +1166,12 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_after_publish Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_before_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
+			name="php_after_publish"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1200,12 +1197,12 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
+		<!-- Php_before_delete Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_after_delete"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
+			name="php_before_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1726,16 +1723,16 @@
 				</field>
 			</form>
 		</field>
-		<!-- Php_document Field. Type: Editor. (joomla) -->
+		<!-- Php_after_delete Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_document"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+			name="php_after_delete"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_DELETE_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
-			rows="50"
+			rows="30"
 			buttons="no"
 			syntax="php"
 			editor="codemirror|none"
@@ -1760,6 +1757,40 @@
 			required="false"
 			validate="code"
 		/>
+		<!-- Php_document Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_document"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="50"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
+		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_model"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+		/>
 		<!-- Source Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1773,12 +1804,12 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_DUMP</option>
 		</field>
-		<!-- Php_model Field. Type: Editor. (joomla) -->
+		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="php_model"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+			name="php_controller_list"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
 			width="100%"
 			height="450px"
 			cols="15"
@@ -1803,25 +1834,6 @@
 			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
 			required="true"
 		/>
-		<!-- Php_controller_list Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="php_controller_list"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_LABEL"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_CONTROLLER_LIST_DESCRIPTION"
-			width="100%"
-			height="450px"
-			cols="15"
-			rows="30"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-		/>
-		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
-		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
 		<!-- Php_model_list Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
@@ -1839,19 +1851,8 @@
 			required="false"
 			validate="code"
 		/>
-		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
-		<field
-			type="textarea"
-			name="php_import_display"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
-			rows="30"
-			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
-			class="text_area span12"
-			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
-			required="true"
-		/>
+		<!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla) -->
+		<field type="note" name="note_advanced_import" label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL" description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION" heading="h4" class="alert alert-success note_advanced_import" />
 		<!-- Add_php_ajax Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -1866,17 +1867,17 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
-		<!-- Php_import Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_display Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
+			name="php_import_display"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
 			required="true"
 		/>
 		<!-- Php_ajaxmethod Field. Type: Editor. (joomla) -->
@@ -1896,17 +1897,17 @@
 			required="true"
 			validate="code"
 		/>
-		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
+		<!-- Php_import Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_setdata"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
+			name="php_import"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
 			required="true"
 		/>
 		<!-- Ajax_input Field. Type: Subform. (joomla) -->
@@ -2040,17 +2041,17 @@
 				/>
 			</form>
 		</field>
-		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<!-- Php_import_setdata Field. Type: Textarea. (joomla) -->
 		<field
 			type="textarea"
-			name="php_import_ext"
-			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			name="php_import_setdata"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_LABEL"
 			rows="30"
 			cols="15"
-			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_DESCRIPTION"
 			class="text_area span12"
 			filter="raw"
-			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_SETDATA_HINT"
 			required="true"
 		/>
 		<!-- Add_php_getitem Field. Type: Radio. (joomla) -->
@@ -2067,6 +2068,36 @@
 			<option value="0">
 				COM_COMPONENTBUILDER_ADMIN_VIEW_NO</option>
 		</field>
+		<!-- Php_import_ext Field. Type: Textarea. (joomla) -->
+		<field
+			type="textarea"
+			name="php_import_ext"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_LABEL"
+			rows="30"
+			cols="15"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_DESCRIPTION"
+			class="text_area span12"
+			filter="raw"
+			hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_EXT_HINT"
+			required="true"
+		/>
+		<!-- Php_getitem Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="php_getitem"
+			label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
+			description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
+			width="100%"
+			height="450px"
+			cols="15"
+			rows="30"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="true"
+			validate="code"
+		/>
 	</fieldset>
 	
 	<!-- Access Control Fields. -->
diff --git a/admin/models/forms/component_config.xml b/admin/models/forms/component_config.xml
index 23458e704..6fdb99479 100644
--- a/admin/models/forms/component_config.xml
+++ b/admin/models/forms/component_config.xml
@@ -113,7 +113,7 @@
 					name="field"
 					label="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_COMPONENT_CONFIG_FIELD_DESCRIPTION"
-					class="list_class"
+					class="list_class fieldFull"
 					multiple="false"
 					required="false"
 					button="false"
diff --git a/admin/models/forms/custom_admin_view.js b/admin/models/forms/custom_admin_view.js
index cff7d2f5e..ee0fd3663 100644
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvyfvxy_required = false;
 jform_vvvvvygvxz_required = false;
 jform_vvvvvyhvya_required = false;
 jform_vvvvvyivyb_required = false;
@@ -17,286 +16,287 @@ jform_vvvvvyjvyc_required = false;
 jform_vvvvvykvyd_required = false;
 jform_vvvvvylvye_required = false;
 jform_vvvvvymvyf_required = false;
-jform_vvvvvymvyg_required = false;
+jform_vvvvvynvyg_required = false;
 jform_vvvvvynvyh_required = false;
 jform_vvvvvyovyi_required = false;
+jform_vvvvvypvyj_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyf(add_php_view_vvvvvyf);
+	var add_php_view_vvvvvyg = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyg(add_php_view_vvvvvyg);
 
-	var add_php_jview_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyg(add_php_jview_display_vvvvvyg);
+	var add_php_jview_display_vvvvvyh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyh(add_php_jview_display_vvvvvyh);
 
-	var add_php_jview_vvvvvyh = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyh(add_php_jview_vvvvvyh);
+	var add_php_jview_vvvvvyi = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyi(add_php_jview_vvvvvyi);
 
-	var add_php_document_vvvvvyi = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyi(add_php_document_vvvvvyi);
+	var add_php_document_vvvvvyj = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyj(add_php_document_vvvvvyj);
 
-	var add_css_document_vvvvvyj = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyj(add_css_document_vvvvvyj);
+	var add_css_document_vvvvvyk = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyk(add_css_document_vvvvvyk);
 
-	var add_javascript_file_vvvvvyk = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyk(add_javascript_file_vvvvvyk);
+	var add_javascript_file_vvvvvyl = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyl(add_javascript_file_vvvvvyl);
 
-	var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyl(add_js_document_vvvvvyl);
+	var add_js_document_vvvvvym = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvym(add_js_document_vvvvvym);
 
-	var add_custom_button_vvvvvym = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvym(add_custom_button_vvvvvym);
+	var add_custom_button_vvvvvyn = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyn(add_custom_button_vvvvvyn);
 
-	var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyn(add_css_vvvvvyn);
+	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyo(add_css_vvvvvyo);
 
-	var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyo(add_php_ajax_vvvvvyo);
+	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyp(add_php_ajax_vvvvvyp);
 });
 
-// the vvvvvyf function
-function vvvvvyf(add_php_view_vvvvvyf)
+// the vvvvvyg function
+function vvvvvyg(add_php_view_vvvvvyg)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyf == 1)
+	if (add_php_view_vvvvvyg == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvyfvxy_required)
+		if (jform_vvvvvygvxz_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyfvxy_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyfvxy_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyfvxy_required = true;
-		}
-	}
-}
-
-// the vvvvvyg function
-function vvvvvyg(add_php_jview_display_vvvvvyg)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyg == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		if (jform_vvvvvygvxz_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvygvxz_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvygvxz_required)
 		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			updateFieldRequired('php_view',1);
+			jQuery('#jform_php_view').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvygvxz_required = true;
 		}
 	}
 }
 
 // the vvvvvyh function
-function vvvvvyh(add_php_jview_vvvvvyh)
+function vvvvvyh(add_php_jview_display_vvvvvyh)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyh == 1)
+	if (add_php_jview_display_vvvvvyh == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 		if (jform_vvvvvyhvya_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyhvya_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyhvya_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyhvya_required = true;
 		}
 	}
 }
 
 // the vvvvvyi function
-function vvvvvyi(add_php_document_vvvvvyi)
+function vvvvvyi(add_php_jview_vvvvvyi)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyi == 1)
+	if (add_php_jview_vvvvvyi == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 		if (jform_vvvvvyivyb_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvyivyb_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyivyb_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvyivyb_required = true;
 		}
 	}
 }
 
 // the vvvvvyj function
-function vvvvvyj(add_css_document_vvvvvyj)
+function vvvvvyj(add_php_document_vvvvvyj)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyj == 1)
+	if (add_php_document_vvvvvyj == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyjvyc_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyjvyc_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyjvyc_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyjvyc_required = true;
 		}
 	}
 }
 
 // the vvvvvyk function
-function vvvvvyk(add_javascript_file_vvvvvyk)
+function vvvvvyk(add_css_document_vvvvvyk)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyk == 1)
+	if (add_css_document_vvvvvyk == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvykvyd_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvykvyd_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvykvyd_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvykvyd_required = true;
 		}
 	}
 }
 
 // the vvvvvyl function
-function vvvvvyl(add_js_document_vvvvvyl)
+function vvvvvyl(add_javascript_file_vvvvvyl)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyl == 1)
+	if (add_javascript_file_vvvvvyl == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 		if (jform_vvvvvylvye_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvylvye_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvylvye_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvylvye_required = true;
 		}
 	}
 }
 
 // the vvvvvym function
-function vvvvvym(add_custom_button_vvvvvym)
+function vvvvvym(add_js_document_vvvvvym)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvym == 1)
+	if (add_js_document_vvvvvym == 1)
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		if (jform_vvvvvymvyf_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvymvyf_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvymvyf_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvymvyf_required = true;
+		}
+	}
+}
+
+// the vvvvvyn function
+function vvvvvyn(add_custom_button_vvvvvyn)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyn == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		if (jform_vvvvvymvyf_required)
+		if (jform_vvvvvynvyg_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvymvyf_required = false;
+			jform_vvvvvynvyg_required = false;
 		}
 
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		if (jform_vvvvvymvyg_required)
+		if (jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvymvyg_required = false;
+			jform_vvvvvynvyh_required = false;
 		}
 
 	}
@@ -304,72 +304,72 @@ function vvvvvym(add_custom_button_vvvvvym)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvymvyf_required)
+		if (!jform_vvvvvynvyg_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvymvyf_required = true;
+			jform_vvvvvynvyg_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvymvyg_required)
+		if (!jform_vvvvvynvyh_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvymvyg_required = true;
-		}
-	}
-}
-
-// the vvvvvyn function
-function vvvvvyn(add_css_vvvvvyn)
-{
-	// set the function logic
-	if (add_css_vvvvvyn == 1)
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
-		if (jform_vvvvvynvyh_required)
-		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
-			jform_vvvvvynvyh_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvynvyh_required)
-		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
 			jform_vvvvvynvyh_required = true;
 		}
 	}
 }
 
 // the vvvvvyo function
-function vvvvvyo(add_php_ajax_vvvvvyo)
+function vvvvvyo(add_css_vvvvvyo)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyo == 1)
+	if (add_css_vvvvvyo == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		if (jform_vvvvvyovyi_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyovyi_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvyovyi_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyovyi_required = true;
+		}
+	}
+}
+
+// the vvvvvyp function
+function vvvvvyp(add_php_ajax_vvvvvyp)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyp == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
-		if (jform_vvvvvyovyi_required)
+		if (jform_vvvvvypvyj_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyovyi_required = false;
+			jform_vvvvvypvyj_required = false;
 		}
 
 	}
@@ -377,13 +377,13 @@ function vvvvvyo(add_php_ajax_vvvvvyo)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyovyi_required)
+		if (!jform_vvvvvypvyj_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyovyi_required = true;
+			jform_vvvvvypvyj_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/custom_code.js b/admin/models/forms/custom_code.js
index 7e3e8668d..ba0657c7c 100644
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@@ -9,43 +9,43 @@
  */
 
 // Some Global Values
-jform_vvvvwabvzq_required = false;
 jform_vvvvwacvzr_required = false;
-jform_vvvvwacvzs_required = false;
-jform_vvvvwacvzt_required = false;
+jform_vvvvwadvzs_required = false;
+jform_vvvvwadvzt_required = false;
+jform_vvvvwadvzu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab);
-
 	var target_vvvvwac = jQuery("#jform_target input[type='radio']:checked").val();
 	vvvvwac(target_vvvvwac);
 
 	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwad(target_vvvvwad,type_vvvvwad);
+	vvvvwad(target_vvvvwad);
 
-	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwae(type_vvvvwae,target_vvvvwae);
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwae(target_vvvvwae,type_vvvvwae);
+
+	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaf(type_vvvvwaf,target_vvvvwaf);
 });
 
-// the vvvvwab function
-function vvvvwab(target_vvvvwab)
+// the vvvvwac function
+function vvvvwac(target_vvvvwac)
 {
 	// set the function logic
-	if (target_vvvvwab == 2)
+	if (target_vvvvwac == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvwabvzq_required)
+		if (jform_vvvvwacvzr_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_vvvvwabvzq_required = false;
+			jform_vvvvwacvzr_required = false;
 		}
 
 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@@ -54,99 +54,99 @@ function vvvvwab(target_vvvvwab)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvwabvzq_required)
+		if (!jform_vvvvwacvzr_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_vvvvwabvzq_required = true;
+			jform_vvvvwacvzr_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }
 
-// the vvvvwac function
-function vvvvwac(target_vvvvwac)
+// the vvvvwad function
+function vvvvwad(target_vvvvwad)
 {
 	// set the function logic
-	if (target_vvvvwac == 1)
+	if (target_vvvvwad == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvwacvzr_required)
+		if (jform_vvvvwadvzs_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvwacvzr_required = false;
+			jform_vvvvwadvzs_required = false;
 		}
 
 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwacvzs_required)
+		if (jform_vvvvwadvzt_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvwacvzs_required = false;
+			jform_vvvvwadvzt_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();
-		if (jform_vvvvwacvzt_required)
+		if (jform_vvvvwadvzu_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvwacvzt_required = false;
+			jform_vvvvwadvzu_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvwacvzr_required)
+		if (!jform_vvvvwadvzs_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvwacvzr_required = true;
+			jform_vvvvwadvzs_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwacvzs_required)
+		if (!jform_vvvvwadvzt_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwacvzs_required = true;
+			jform_vvvvwadvzt_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();
-		if (!jform_vvvvwacvzt_required)
+		if (!jform_vvvvwadvzu_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvwacvzt_required = true;
+			jform_vvvvwadvzu_required = true;
 		}
 	}
 }
 
-// the vvvvwad function
-function vvvvwad(target_vvvvwad,type_vvvvwad)
+// the vvvvwae function
+function vvvvwae(target_vvvvwae,type_vvvvwae)
 {
 	// set the function logic
-	if (target_vvvvwad == 1 && type_vvvvwad == 1)
+	if (target_vvvvwae == 1 && type_vvvvwae == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@@ -158,11 +158,11 @@ function vvvvwad(target_vvvvwad,type_vvvvwad)
 	}
 }
 
-// the vvvvwae function
-function vvvvwae(type_vvvvwae,target_vvvvwae)
+// the vvvvwaf function
+function vvvvwaf(type_vvvvwaf,target_vvvvwaf)
 {
 	// set the function logic
-	if (type_vvvvwae == 1 && target_vvvvwae == 1)
+	if (type_vvvvwaf == 1 && target_vvvvwaf == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
diff --git a/admin/models/forms/dynamic_get.js b/admin/models/forms/dynamic_get.js
index 69b78171f..859646798 100644
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
@@ -9,35 +9,32 @@
  */
 
 // Some Global Values
-jform_vvvvvzcvyw_required = false;
 jform_vvvvvzdvyx_required = false;
 jform_vvvvvzevyy_required = false;
 jform_vvvvvzfvyz_required = false;
 jform_vvvvvzgvza_required = false;
 jform_vvvvvzhvzb_required = false;
-jform_vvvvvzmvzc_required = false;
-jform_vvvvvzovzd_required = false;
+jform_vvvvvzivzc_required = false;
+jform_vvvvvznvzd_required = false;
 jform_vvvvvzpvze_required = false;
-jform_vvvvvzrvzf_required = false;
-jform_vvvvvzrvzg_required = false;
+jform_vvvvvzqvzf_required = false;
+jform_vvvvvzsvzg_required = false;
 jform_vvvvvzsvzh_required = false;
 jform_vvvvvztvzi_required = false;
 jform_vvvvvzuvzj_required = false;
-jform_vvvvvzwvzk_required = false;
-jform_vvvvvzwvzl_required = false;
-jform_vvvvvzwvzm_required = false;
+jform_vvvvvzvvzk_required = false;
+jform_vvvvvzxvzl_required = false;
+jform_vvvvvzxvzm_required = false;
 jform_vvvvvzxvzn_required = false;
 jform_vvvvvzyvzo_required = false;
 jform_vvvvvzzvzp_required = false;
+jform_vvvvwaavzq_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(gettype_vvvvvzc);
-
-	var main_source_vvvvvzd = jQuery("#jform_main_source").val();
-	vvvvvzd(main_source_vvvvvzd);
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(gettype_vvvvvzd);
 
 	var main_source_vvvvvze = jQuery("#jform_main_source").val();
 	vvvvvze(main_source_vvvvvze);
@@ -48,48 +45,48 @@ jQuery(document).ready(function()
 	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
 	vvvvvzg(main_source_vvvvvzg);
 
-	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzh(addcalculation_vvvvvzh);
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
+	vvvvvzh(main_source_vvvvvzh);
 
 	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
+	vvvvvzi(addcalculation_vvvvvzi);
 
 	var addcalculation_vvvvvzj = jQuery("#jform_addcalculation input[type='radio']:checked").val();
 	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
 	vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj);
 
-	var main_source_vvvvvzm = jQuery("#jform_main_source").val();
-	vvvvvzm(main_source_vvvvvzm);
+	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk);
 
 	var main_source_vvvvvzn = jQuery("#jform_main_source").val();
 	vvvvvzn(main_source_vvvvvzn);
 
-	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
+	var main_source_vvvvvzo = jQuery("#jform_main_source").val();
+	vvvvvzo(main_source_vvvvvzo);
 
-	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
+	vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp);
 
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(gettype_vvvvvzr);
+	var add_php_after_getitem_vvvvvzq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq);
 
-	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(gettype_vvvvvzs);
 
-	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt);
 
-	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+	vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu);
 
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(gettype_vvvvvzw);
+	var add_php_after_getitems_vvvvvzv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv);
 
 	var gettype_vvvvvzx = jQuery("#jform_gettype").val();
 	vvvvvzx(gettype_vvvvvzx);
@@ -98,114 +95,62 @@ jQuery(document).ready(function()
 	vvvvvzy(gettype_vvvvvzy);
 
 	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+	vvvvvzz(gettype_vvvvvzz);
+
+	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwaa = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa);
 });
 
-// the vvvvvzc function
-function vvvvvzc(gettype_vvvvvzc)
+// the vvvvvzd function
+function vvvvvzd(gettype_vvvvvzd)
 {
-	if (isSet(gettype_vvvvvzc) && gettype_vvvvvzc.constructor !== Array)
+	if (isSet(gettype_vvvvvzd) && gettype_vvvvvzd.constructor !== Array)
 	{
-		var temp_vvvvvzc = gettype_vvvvvzc;
-		var gettype_vvvvvzc = [];
-		gettype_vvvvvzc.push(temp_vvvvvzc);
+		var temp_vvvvvzd = gettype_vvvvvzd;
+		var gettype_vvvvvzd = [];
+		gettype_vvvvvzd.push(temp_vvvvvzd);
 	}
-	else if (!isSet(gettype_vvvvvzc))
+	else if (!isSet(gettype_vvvvvzd))
 	{
-		var gettype_vvvvvzc = [];
+		var gettype_vvvvvzd = [];
 	}
-	var gettype = gettype_vvvvvzc.some(gettype_vvvvvzc_SomeFunc);
+	var gettype = gettype_vvvvvzd.some(gettype_vvvvvzd_SomeFunc);
 
 
 	// set this function logic
 	if (gettype)
 	{
 		jQuery('#jform_getcustom').closest('.control-group').show();
-		if (jform_vvvvvzcvyw_required)
+		if (jform_vvvvvzdvyx_required)
 		{
 			updateFieldRequired('getcustom',0);
 			jQuery('#jform_getcustom').prop('required','required');
 			jQuery('#jform_getcustom').attr('aria-required',true);
 			jQuery('#jform_getcustom').addClass('required');
-			jform_vvvvvzcvyw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_getcustom').closest('.control-group').hide();
-		if (!jform_vvvvvzcvyw_required)
-		{
-			updateFieldRequired('getcustom',1);
-			jQuery('#jform_getcustom').removeAttr('required');
-			jQuery('#jform_getcustom').removeAttr('aria-required');
-			jQuery('#jform_getcustom').removeClass('required');
-			jform_vvvvvzcvyw_required = true;
-		}
-	}
-}
-
-// the vvvvvzc Some function
-function gettype_vvvvvzc_SomeFunc(gettype_vvvvvzc)
-{
-	// set the function logic
-	if (gettype_vvvvvzc == 3 || gettype_vvvvvzc == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzd function
-function vvvvvzd(main_source_vvvvvzd)
-{
-	if (isSet(main_source_vvvvvzd) && main_source_vvvvvzd.constructor !== Array)
-	{
-		var temp_vvvvvzd = main_source_vvvvvzd;
-		var main_source_vvvvvzd = [];
-		main_source_vvvvvzd.push(temp_vvvvvzd);
-	}
-	else if (!isSet(main_source_vvvvvzd))
-	{
-		var main_source_vvvvvzd = [];
-	}
-	var main_source = main_source_vvvvvzd.some(main_source_vvvvvzd_SomeFunc);
-
-
-	// set this function logic
-	if (main_source)
-	{
-		jQuery('#jform_view_table_main').closest('.control-group').show();
-		if (jform_vvvvvzdvyx_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_vvvvvzdvyx_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_view_table_main').closest('.control-group').hide();
+		jQuery('#jform_getcustom').closest('.control-group').hide();
 		if (!jform_vvvvvzdvyx_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');
+			updateFieldRequired('getcustom',1);
+			jQuery('#jform_getcustom').removeAttr('required');
+			jQuery('#jform_getcustom').removeAttr('aria-required');
+			jQuery('#jform_getcustom').removeClass('required');
 			jform_vvvvvzdvyx_required = true;
 		}
 	}
 }
 
 // the vvvvvzd Some function
-function main_source_vvvvvzd_SomeFunc(main_source_vvvvvzd)
+function gettype_vvvvvzd_SomeFunc(gettype_vvvvvzd)
 {
 	// set the function logic
-	if (main_source_vvvvvzd == 1)
+	if (gettype_vvvvvzd == 3 || gettype_vvvvvzd == 4)
 	{
 		return true;
 	}
@@ -231,26 +176,26 @@ function vvvvvze(main_source_vvvvvze)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_view_selection').closest('.control-group').show();
+		jQuery('#jform_view_table_main').closest('.control-group').show();
 		if (jform_vvvvvzevyy_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');
+			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_vvvvvzevyy_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_view_selection').closest('.control-group').hide();
+		jQuery('#jform_view_table_main').closest('.control-group').hide();
 		if (!jform_vvvvvzevyy_required)
 		{
-			updateFieldRequired('view_selection',1);
-			jQuery('#jform_view_selection').removeAttr('required');
-			jQuery('#jform_view_selection').removeAttr('aria-required');
-			jQuery('#jform_view_selection').removeClass('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_vvvvvzevyy_required = true;
 		}
 	}
@@ -286,26 +231,26 @@ function vvvvvzf(main_source_vvvvvzf)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_db_table_main').closest('.control-group').show();
+		jQuery('#jform_view_selection').closest('.control-group').show();
 		if (jform_vvvvvzfvyz_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');
+			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_vvvvvzfvyz_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_db_table_main').closest('.control-group').hide();
+		jQuery('#jform_view_selection').closest('.control-group').hide();
 		if (!jform_vvvvvzfvyz_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');
+			updateFieldRequired('view_selection',1);
+			jQuery('#jform_view_selection').removeAttr('required');
+			jQuery('#jform_view_selection').removeAttr('aria-required');
+			jQuery('#jform_view_selection').removeClass('required');
 			jform_vvvvvzfvyz_required = true;
 		}
 	}
@@ -315,7 +260,7 @@ function vvvvvzf(main_source_vvvvvzf)
 function main_source_vvvvvzf_SomeFunc(main_source_vvvvvzf)
 {
 	// set the function logic
-	if (main_source_vvvvvzf == 2)
+	if (main_source_vvvvvzf == 1)
 	{
 		return true;
 	}
@@ -341,26 +286,26 @@ function vvvvvzg(main_source_vvvvvzg)
 	// set this function logic
 	if (main_source)
 	{
-		jQuery('#jform_db_selection').closest('.control-group').show();
+		jQuery('#jform_db_table_main').closest('.control-group').show();
 		if (jform_vvvvvzgvza_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');
+			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_vvvvvzgvza_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_db_selection').closest('.control-group').hide();
+		jQuery('#jform_db_table_main').closest('.control-group').hide();
 		if (!jform_vvvvvzgvza_required)
 		{
-			updateFieldRequired('db_selection',1);
-			jQuery('#jform_db_selection').removeAttr('required');
-			jQuery('#jform_db_selection').removeAttr('aria-required');
-			jQuery('#jform_db_selection').removeClass('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_vvvvvzgvza_required = true;
 		}
 	}
@@ -378,95 +323,89 @@ function main_source_vvvvvzg_SomeFunc(main_source_vvvvvzg)
 }
 
 // the vvvvvzh function
-function vvvvvzh(addcalculation_vvvvvzh)
+function vvvvvzh(main_source_vvvvvzh)
 {
-	// set the function logic
-	if (addcalculation_vvvvvzh == 1)
+	if (isSet(main_source_vvvvvzh) && main_source_vvvvvzh.constructor !== Array)
 	{
-		jQuery('#jform_php_calculation-lbl').closest('.control-group').show();
+		var temp_vvvvvzh = main_source_vvvvvzh;
+		var main_source_vvvvvzh = [];
+		main_source_vvvvvzh.push(temp_vvvvvzh);
+	}
+	else if (!isSet(main_source_vvvvvzh))
+	{
+		var main_source_vvvvvzh = [];
+	}
+	var main_source = main_source_vvvvvzh.some(main_source_vvvvvzh_SomeFunc);
+
+
+	// set this function logic
+	if (main_source)
+	{
+		jQuery('#jform_db_selection').closest('.control-group').show();
 		if (jform_vvvvvzhvzb_required)
 		{
-			updateFieldRequired('php_calculation',0);
-			jQuery('#jform_php_calculation').prop('required','required');
-			jQuery('#jform_php_calculation').attr('aria-required',true);
-			jQuery('#jform_php_calculation').addClass('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_vvvvvzhvzb_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_calculation-lbl').closest('.control-group').hide();
+		jQuery('#jform_db_selection').closest('.control-group').hide();
 		if (!jform_vvvvvzhvzb_required)
 		{
-			updateFieldRequired('php_calculation',1);
-			jQuery('#jform_php_calculation').removeAttr('required');
-			jQuery('#jform_php_calculation').removeAttr('aria-required');
-			jQuery('#jform_php_calculation').removeClass('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_vvvvvzhvzb_required = true;
 		}
 	}
 }
 
-// the vvvvvzi function
-function vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi)
+// the vvvvvzh Some function
+function main_source_vvvvvzh_SomeFunc(main_source_vvvvvzh)
 {
-	if (isSet(addcalculation_vvvvvzi) && addcalculation_vvvvvzi.constructor !== Array)
+	// set the function logic
+	if (main_source_vvvvvzh == 2)
 	{
-		var temp_vvvvvzi = addcalculation_vvvvvzi;
-		var addcalculation_vvvvvzi = [];
-		addcalculation_vvvvvzi.push(temp_vvvvvzi);
-	}
-	else if (!isSet(addcalculation_vvvvvzi))
-	{
-		var addcalculation_vvvvvzi = [];
-	}
-	var addcalculation = addcalculation_vvvvvzi.some(addcalculation_vvvvvzi_SomeFunc);
-
-	if (isSet(gettype_vvvvvzi) && gettype_vvvvvzi.constructor !== Array)
-	{
-		var temp_vvvvvzi = gettype_vvvvvzi;
-		var gettype_vvvvvzi = [];
-		gettype_vvvvvzi.push(temp_vvvvvzi);
-	}
-	else if (!isSet(gettype_vvvvvzi))
-	{
-		var gettype_vvvvvzi = [];
-	}
-	var gettype = gettype_vvvvvzi.some(gettype_vvvvvzi_SomeFunc);
-
-
-	// set this function logic
-	if (addcalculation && gettype)
-	{
-		jQuery('.note_calculation_item').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('.note_calculation_item').closest('.control-group').hide();
+		return true;
 	}
+	return false;
 }
 
-// the vvvvvzi Some function
-function addcalculation_vvvvvzi_SomeFunc(addcalculation_vvvvvzi)
+// the vvvvvzi function
+function vvvvvzi(addcalculation_vvvvvzi)
 {
 	// set the function logic
 	if (addcalculation_vvvvvzi == 1)
 	{
-		return true;
-	}
-	return false;
-}
+		jQuery('#jform_php_calculation-lbl').closest('.control-group').show();
+		if (jform_vvvvvzivzc_required)
+		{
+			updateFieldRequired('php_calculation',0);
+			jQuery('#jform_php_calculation').prop('required','required');
+			jQuery('#jform_php_calculation').attr('aria-required',true);
+			jQuery('#jform_php_calculation').addClass('required');
+			jform_vvvvvzivzc_required = false;
+		}
 
-// the vvvvvzi Some function
-function gettype_vvvvvzi_SomeFunc(gettype_vvvvvzi)
-{
-	// set the function logic
-	if (gettype_vvvvvzi == 1 || gettype_vvvvvzi == 3)
-	{
-		return true;
 	}
-	return false;
+	else
+	{
+		jQuery('#jform_php_calculation-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvzivzc_required)
+		{
+			updateFieldRequired('php_calculation',1);
+			jQuery('#jform_php_calculation').removeAttr('required');
+			jQuery('#jform_php_calculation').removeAttr('aria-required');
+			jQuery('#jform_php_calculation').removeClass('required');
+			jform_vvvvvzivzc_required = true;
+		}
+	}
 }
 
 // the vvvvvzj function
@@ -500,11 +439,11 @@ function vvvvvzj(addcalculation_vvvvvzj,gettype_vvvvvzj)
 	// set this function logic
 	if (addcalculation && gettype)
 	{
-		jQuery('.note_calculation_items').closest('.control-group').show();
+		jQuery('.note_calculation_item').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_calculation_items').closest('.control-group').hide();
+		jQuery('.note_calculation_item').closest('.control-group').hide();
 	}
 }
 
@@ -523,62 +462,68 @@ function addcalculation_vvvvvzj_SomeFunc(addcalculation_vvvvvzj)
 function gettype_vvvvvzj_SomeFunc(gettype_vvvvvzj)
 {
 	// set the function logic
-	if (gettype_vvvvvzj == 2 || gettype_vvvvvzj == 4)
+	if (gettype_vvvvvzj == 1 || gettype_vvvvvzj == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvvzm function
-function vvvvvzm(main_source_vvvvvzm)
+// the vvvvvzk function
+function vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk)
 {
-	if (isSet(main_source_vvvvvzm) && main_source_vvvvvzm.constructor !== Array)
+	if (isSet(addcalculation_vvvvvzk) && addcalculation_vvvvvzk.constructor !== Array)
 	{
-		var temp_vvvvvzm = main_source_vvvvvzm;
-		var main_source_vvvvvzm = [];
-		main_source_vvvvvzm.push(temp_vvvvvzm);
+		var temp_vvvvvzk = addcalculation_vvvvvzk;
+		var addcalculation_vvvvvzk = [];
+		addcalculation_vvvvvzk.push(temp_vvvvvzk);
 	}
-	else if (!isSet(main_source_vvvvvzm))
+	else if (!isSet(addcalculation_vvvvvzk))
 	{
-		var main_source_vvvvvzm = [];
+		var addcalculation_vvvvvzk = [];
 	}
-	var main_source = main_source_vvvvvzm.some(main_source_vvvvvzm_SomeFunc);
+	var addcalculation = addcalculation_vvvvvzk.some(addcalculation_vvvvvzk_SomeFunc);
+
+	if (isSet(gettype_vvvvvzk) && gettype_vvvvvzk.constructor !== Array)
+	{
+		var temp_vvvvvzk = gettype_vvvvvzk;
+		var gettype_vvvvvzk = [];
+		gettype_vvvvvzk.push(temp_vvvvvzk);
+	}
+	else if (!isSet(gettype_vvvvvzk))
+	{
+		var gettype_vvvvvzk = [];
+	}
+	var gettype = gettype_vvvvvzk.some(gettype_vvvvvzk_SomeFunc);
 
 
 	// set this function logic
-	if (main_source)
+	if (addcalculation && gettype)
 	{
-		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
-		if (jform_vvvvvzmvzc_required)
-		{
-			updateFieldRequired('php_custom_get',0);
-			jQuery('#jform_php_custom_get').prop('required','required');
-			jQuery('#jform_php_custom_get').attr('aria-required',true);
-			jQuery('#jform_php_custom_get').addClass('required');
-			jform_vvvvvzmvzc_required = false;
-		}
-
+		jQuery('.note_calculation_items').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvzmvzc_required)
-		{
-			updateFieldRequired('php_custom_get',1);
-			jQuery('#jform_php_custom_get').removeAttr('required');
-			jQuery('#jform_php_custom_get').removeAttr('aria-required');
-			jQuery('#jform_php_custom_get').removeClass('required');
-			jform_vvvvvzmvzc_required = true;
-		}
+		jQuery('.note_calculation_items').closest('.control-group').hide();
 	}
 }
 
-// the vvvvvzm Some function
-function main_source_vvvvvzm_SomeFunc(main_source_vvvvvzm)
+// the vvvvvzk Some function
+function addcalculation_vvvvvzk_SomeFunc(addcalculation_vvvvvzk)
 {
 	// set the function logic
-	if (main_source_vvvvvzm == 3)
+	if (addcalculation_vvvvvzk == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzk Some function
+function gettype_vvvvvzk_SomeFunc(gettype_vvvvvzk)
+{
+	// set the function logic
+	if (gettype_vvvvvzk == 2 || gettype_vvvvvzk == 4)
 	{
 		return true;
 	}
@@ -601,6 +546,61 @@ function vvvvvzn(main_source_vvvvvzn)
 	var main_source = main_source_vvvvvzn.some(main_source_vvvvvzn_SomeFunc);
 
 
+	// set this function logic
+	if (main_source)
+	{
+		jQuery('#jform_php_custom_get-lbl').closest('.control-group').show();
+		if (jform_vvvvvznvzd_required)
+		{
+			updateFieldRequired('php_custom_get',0);
+			jQuery('#jform_php_custom_get').prop('required','required');
+			jQuery('#jform_php_custom_get').attr('aria-required',true);
+			jQuery('#jform_php_custom_get').addClass('required');
+			jform_vvvvvznvzd_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_php_custom_get-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvznvzd_required)
+		{
+			updateFieldRequired('php_custom_get',1);
+			jQuery('#jform_php_custom_get').removeAttr('required');
+			jQuery('#jform_php_custom_get').removeAttr('aria-required');
+			jQuery('#jform_php_custom_get').removeClass('required');
+			jform_vvvvvznvzd_required = true;
+		}
+	}
+}
+
+// the vvvvvzn Some function
+function main_source_vvvvvzn_SomeFunc(main_source_vvvvvzn)
+{
+	// set the function logic
+	if (main_source_vvvvvzn == 3)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzo function
+function vvvvvzo(main_source_vvvvvzo)
+{
+	if (isSet(main_source_vvvvvzo) && main_source_vvvvvzo.constructor !== Array)
+	{
+		var temp_vvvvvzo = main_source_vvvvvzo;
+		var main_source_vvvvvzo = [];
+		main_source_vvvvvzo.push(temp_vvvvvzo);
+	}
+	else if (!isSet(main_source_vvvvvzo))
+	{
+		var main_source_vvvvvzo = [];
+	}
+	var main_source = main_source_vvvvvzo.some(main_source_vvvvvzo_SomeFunc);
+
+
 	// set this function logic
 	if (main_source)
 	{
@@ -622,89 +622,11 @@ function vvvvvzn(main_source_vvvvvzn)
 	}
 }
 
-// the vvvvvzn Some function
-function main_source_vvvvvzn_SomeFunc(main_source_vvvvvzn)
-{
-	// set the function logic
-	if (main_source_vvvvvzn == 1 || main_source_vvvvvzn == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzo function
-function vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo)
-{
-	if (isSet(add_php_before_getitem_vvvvvzo) && add_php_before_getitem_vvvvvzo.constructor !== Array)
-	{
-		var temp_vvvvvzo = add_php_before_getitem_vvvvvzo;
-		var add_php_before_getitem_vvvvvzo = [];
-		add_php_before_getitem_vvvvvzo.push(temp_vvvvvzo);
-	}
-	else if (!isSet(add_php_before_getitem_vvvvvzo))
-	{
-		var add_php_before_getitem_vvvvvzo = [];
-	}
-	var add_php_before_getitem = add_php_before_getitem_vvvvvzo.some(add_php_before_getitem_vvvvvzo_SomeFunc);
-
-	if (isSet(gettype_vvvvvzo) && gettype_vvvvvzo.constructor !== Array)
-	{
-		var temp_vvvvvzo = gettype_vvvvvzo;
-		var gettype_vvvvvzo = [];
-		gettype_vvvvvzo.push(temp_vvvvvzo);
-	}
-	else if (!isSet(gettype_vvvvvzo))
-	{
-		var gettype_vvvvvzo = [];
-	}
-	var gettype = gettype_vvvvvzo.some(gettype_vvvvvzo_SomeFunc);
-
-
-	// set this function logic
-	if (add_php_before_getitem && gettype)
-	{
-		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
-		if (jform_vvvvvzovzd_required)
-		{
-			updateFieldRequired('php_before_getitem',0);
-			jQuery('#jform_php_before_getitem').prop('required','required');
-			jQuery('#jform_php_before_getitem').attr('aria-required',true);
-			jQuery('#jform_php_before_getitem').addClass('required');
-			jform_vvvvvzovzd_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvzovzd_required)
-		{
-			updateFieldRequired('php_before_getitem',1);
-			jQuery('#jform_php_before_getitem').removeAttr('required');
-			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitem').removeClass('required');
-			jform_vvvvvzovzd_required = true;
-		}
-	}
-}
-
 // the vvvvvzo Some function
-function add_php_before_getitem_vvvvvzo_SomeFunc(add_php_before_getitem_vvvvvzo)
+function main_source_vvvvvzo_SomeFunc(main_source_vvvvvzo)
 {
 	// set the function logic
-	if (add_php_before_getitem_vvvvvzo == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzo Some function
-function gettype_vvvvvzo_SomeFunc(gettype_vvvvvzo)
-{
-	// set the function logic
-	if (gettype_vvvvvzo == 1 || gettype_vvvvvzo == 3)
+	if (main_source_vvvvvzo == 1 || main_source_vvvvvzo == 2)
 	{
 		return true;
 	}
@@ -712,19 +634,19 @@ function gettype_vvvvvzo_SomeFunc(gettype_vvvvvzo)
 }
 
 // the vvvvvzp function
-function vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp)
+function vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp)
 {
-	if (isSet(add_php_after_getitem_vvvvvzp) && add_php_after_getitem_vvvvvzp.constructor !== Array)
+	if (isSet(add_php_before_getitem_vvvvvzp) && add_php_before_getitem_vvvvvzp.constructor !== Array)
 	{
-		var temp_vvvvvzp = add_php_after_getitem_vvvvvzp;
-		var add_php_after_getitem_vvvvvzp = [];
-		add_php_after_getitem_vvvvvzp.push(temp_vvvvvzp);
+		var temp_vvvvvzp = add_php_before_getitem_vvvvvzp;
+		var add_php_before_getitem_vvvvvzp = [];
+		add_php_before_getitem_vvvvvzp.push(temp_vvvvvzp);
 	}
-	else if (!isSet(add_php_after_getitem_vvvvvzp))
+	else if (!isSet(add_php_before_getitem_vvvvvzp))
 	{
-		var add_php_after_getitem_vvvvvzp = [];
+		var add_php_before_getitem_vvvvvzp = [];
 	}
-	var add_php_after_getitem = add_php_after_getitem_vvvvvzp.some(add_php_after_getitem_vvvvvzp_SomeFunc);
+	var add_php_before_getitem = add_php_before_getitem_vvvvvzp.some(add_php_before_getitem_vvvvvzp_SomeFunc);
 
 	if (isSet(gettype_vvvvvzp) && gettype_vvvvvzp.constructor !== Array)
 	{
@@ -740,38 +662,38 @@ function vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp)
 
 
 	// set this function logic
-	if (add_php_after_getitem && gettype)
+	if (add_php_before_getitem && gettype)
 	{
-		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
+		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').show();
 		if (jform_vvvvvzpvze_required)
 		{
-			updateFieldRequired('php_after_getitem',0);
-			jQuery('#jform_php_after_getitem').prop('required','required');
-			jQuery('#jform_php_after_getitem').attr('aria-required',true);
-			jQuery('#jform_php_after_getitem').addClass('required');
+			updateFieldRequired('php_before_getitem',0);
+			jQuery('#jform_php_before_getitem').prop('required','required');
+			jQuery('#jform_php_before_getitem').attr('aria-required',true);
+			jQuery('#jform_php_before_getitem').addClass('required');
 			jform_vvvvvzpvze_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_before_getitem-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvzpvze_required)
 		{
-			updateFieldRequired('php_after_getitem',1);
-			jQuery('#jform_php_after_getitem').removeAttr('required');
-			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitem').removeClass('required');
+			updateFieldRequired('php_before_getitem',1);
+			jQuery('#jform_php_before_getitem').removeAttr('required');
+			jQuery('#jform_php_before_getitem').removeAttr('aria-required');
+			jQuery('#jform_php_before_getitem').removeClass('required');
 			jform_vvvvvzpvze_required = true;
 		}
 	}
 }
 
 // the vvvvvzp Some function
-function add_php_after_getitem_vvvvvzp_SomeFunc(add_php_after_getitem_vvvvvzp)
+function add_php_before_getitem_vvvvvzp_SomeFunc(add_php_before_getitem_vvvvvzp)
 {
 	// set the function logic
-	if (add_php_after_getitem_vvvvvzp == 1)
+	if (add_php_before_getitem_vvvvvzp == 1)
 	{
 		return true;
 	}
@@ -789,74 +711,78 @@ function gettype_vvvvvzp_SomeFunc(gettype_vvvvvzp)
 	return false;
 }
 
-// the vvvvvzr function
-function vvvvvzr(gettype_vvvvvzr)
+// the vvvvvzq function
+function vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq)
 {
-	if (isSet(gettype_vvvvvzr) && gettype_vvvvvzr.constructor !== Array)
+	if (isSet(add_php_after_getitem_vvvvvzq) && add_php_after_getitem_vvvvvzq.constructor !== Array)
 	{
-		var temp_vvvvvzr = gettype_vvvvvzr;
-		var gettype_vvvvvzr = [];
-		gettype_vvvvvzr.push(temp_vvvvvzr);
+		var temp_vvvvvzq = add_php_after_getitem_vvvvvzq;
+		var add_php_after_getitem_vvvvvzq = [];
+		add_php_after_getitem_vvvvvzq.push(temp_vvvvvzq);
 	}
-	else if (!isSet(gettype_vvvvvzr))
+	else if (!isSet(add_php_after_getitem_vvvvvzq))
 	{
-		var gettype_vvvvvzr = [];
+		var add_php_after_getitem_vvvvvzq = [];
 	}
-	var gettype = gettype_vvvvvzr.some(gettype_vvvvvzr_SomeFunc);
+	var add_php_after_getitem = add_php_after_getitem_vvvvvzq.some(add_php_after_getitem_vvvvvzq_SomeFunc);
+
+	if (isSet(gettype_vvvvvzq) && gettype_vvvvvzq.constructor !== Array)
+	{
+		var temp_vvvvvzq = gettype_vvvvvzq;
+		var gettype_vvvvvzq = [];
+		gettype_vvvvvzq.push(temp_vvvvvzq);
+	}
+	else if (!isSet(gettype_vvvvvzq))
+	{
+		var gettype_vvvvvzq = [];
+	}
+	var gettype = gettype_vvvvvzq.some(gettype_vvvvvzq_SomeFunc);
 
 
 	// set this function logic
-	if (gettype)
+	if (add_php_after_getitem && gettype)
 	{
-		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
-		if (jform_vvvvvzrvzf_required)
+		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').show();
+		if (jform_vvvvvzqvzf_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_vvvvvzrvzf_required = false;
-		}
-
-		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
-		if (jform_vvvvvzrvzg_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_vvvvvzrvzg_required = false;
+			updateFieldRequired('php_after_getitem',0);
+			jQuery('#jform_php_after_getitem').prop('required','required');
+			jQuery('#jform_php_after_getitem').attr('aria-required',true);
+			jQuery('#jform_php_after_getitem').addClass('required');
+			jform_vvvvvzqvzf_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzf_required)
+		jQuery('#jform_php_after_getitem-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvzqvzf_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_vvvvvzrvzf_required = true;
-		}
-		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
-		if (!jform_vvvvvzrvzg_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_vvvvvzrvzg_required = true;
+			updateFieldRequired('php_after_getitem',1);
+			jQuery('#jform_php_after_getitem').removeAttr('required');
+			jQuery('#jform_php_after_getitem').removeAttr('aria-required');
+			jQuery('#jform_php_after_getitem').removeClass('required');
+			jform_vvvvvzqvzf_required = true;
 		}
 	}
 }
 
-// the vvvvvzr Some function
-function gettype_vvvvvzr_SomeFunc(gettype_vvvvvzr)
+// the vvvvvzq Some function
+function add_php_after_getitem_vvvvvzq_SomeFunc(add_php_after_getitem_vvvvvzq)
 {
 	// set the function logic
-	if (gettype_vvvvvzr == 1 || gettype_vvvvvzr == 3)
+	if (add_php_after_getitem_vvvvvzq == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzq Some function
+function gettype_vvvvvzq_SomeFunc(gettype_vvvvvzq)
+{
+	// set the function logic
+	if (gettype_vvvvvzq == 1 || gettype_vvvvvzq == 3)
 	{
 		return true;
 	}
@@ -864,20 +790,8 @@ function gettype_vvvvvzr_SomeFunc(gettype_vvvvvzr)
 }
 
 // the vvvvvzs function
-function vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs)
+function vvvvvzs(gettype_vvvvvzs)
 {
-	if (isSet(add_php_getlistquery_vvvvvzs) && add_php_getlistquery_vvvvvzs.constructor !== Array)
-	{
-		var temp_vvvvvzs = add_php_getlistquery_vvvvvzs;
-		var add_php_getlistquery_vvvvvzs = [];
-		add_php_getlistquery_vvvvvzs.push(temp_vvvvvzs);
-	}
-	else if (!isSet(add_php_getlistquery_vvvvvzs))
-	{
-		var add_php_getlistquery_vvvvvzs = [];
-	}
-	var add_php_getlistquery = add_php_getlistquery_vvvvvzs.some(add_php_getlistquery_vvvvvzs_SomeFunc);
-
 	if (isSet(gettype_vvvvvzs) && gettype_vvvvvzs.constructor !== Array)
 	{
 		var temp_vvvvvzs = gettype_vvvvvzs;
@@ -892,49 +806,57 @@ function vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs)
 
 
 	// set this function logic
-	if (add_php_getlistquery && gettype)
+	if (gettype)
 	{
-		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
+		jQuery('#jform_add_php_after_getitem').closest('.control-group').show();
+		if (jform_vvvvvzsvzg_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_vvvvvzsvzg_required = false;
+		}
+
+		jQuery('#jform_add_php_before_getitem').closest('.control-group').show();
 		if (jform_vvvvvzsvzh_required)
 		{
-			updateFieldRequired('php_getlistquery',0);
-			jQuery('#jform_php_getlistquery').prop('required','required');
-			jQuery('#jform_php_getlistquery').attr('aria-required',true);
-			jQuery('#jform_php_getlistquery').addClass('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_vvvvvzsvzh_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
+		jQuery('#jform_add_php_after_getitem').closest('.control-group').hide();
+		if (!jform_vvvvvzsvzg_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_vvvvvzsvzg_required = true;
+		}
+		jQuery('#jform_add_php_before_getitem').closest('.control-group').hide();
 		if (!jform_vvvvvzsvzh_required)
 		{
-			updateFieldRequired('php_getlistquery',1);
-			jQuery('#jform_php_getlistquery').removeAttr('required');
-			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
-			jQuery('#jform_php_getlistquery').removeClass('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_vvvvvzsvzh_required = true;
 		}
 	}
 }
 
-// the vvvvvzs Some function
-function add_php_getlistquery_vvvvvzs_SomeFunc(add_php_getlistquery_vvvvvzs)
-{
-	// set the function logic
-	if (add_php_getlistquery_vvvvvzs == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzs Some function
 function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs)
 {
 	// set the function logic
-	if (gettype_vvvvvzs == 2 || gettype_vvvvvzs == 4)
+	if (gettype_vvvvvzs == 1 || gettype_vvvvvzs == 3)
 	{
 		return true;
 	}
@@ -942,19 +864,19 @@ function gettype_vvvvvzs_SomeFunc(gettype_vvvvvzs)
 }
 
 // the vvvvvzt function
-function vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt)
+function vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt)
 {
-	if (isSet(add_php_before_getitems_vvvvvzt) && add_php_before_getitems_vvvvvzt.constructor !== Array)
+	if (isSet(add_php_getlistquery_vvvvvzt) && add_php_getlistquery_vvvvvzt.constructor !== Array)
 	{
-		var temp_vvvvvzt = add_php_before_getitems_vvvvvzt;
-		var add_php_before_getitems_vvvvvzt = [];
-		add_php_before_getitems_vvvvvzt.push(temp_vvvvvzt);
+		var temp_vvvvvzt = add_php_getlistquery_vvvvvzt;
+		var add_php_getlistquery_vvvvvzt = [];
+		add_php_getlistquery_vvvvvzt.push(temp_vvvvvzt);
 	}
-	else if (!isSet(add_php_before_getitems_vvvvvzt))
+	else if (!isSet(add_php_getlistquery_vvvvvzt))
 	{
-		var add_php_before_getitems_vvvvvzt = [];
+		var add_php_getlistquery_vvvvvzt = [];
 	}
-	var add_php_before_getitems = add_php_before_getitems_vvvvvzt.some(add_php_before_getitems_vvvvvzt_SomeFunc);
+	var add_php_getlistquery = add_php_getlistquery_vvvvvzt.some(add_php_getlistquery_vvvvvzt_SomeFunc);
 
 	if (isSet(gettype_vvvvvzt) && gettype_vvvvvzt.constructor !== Array)
 	{
@@ -970,38 +892,38 @@ function vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt)
 
 
 	// set this function logic
-	if (add_php_before_getitems && gettype)
+	if (add_php_getlistquery && gettype)
 	{
-		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
+		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').show();
 		if (jform_vvvvvztvzi_required)
 		{
-			updateFieldRequired('php_before_getitems',0);
-			jQuery('#jform_php_before_getitems').prop('required','required');
-			jQuery('#jform_php_before_getitems').attr('aria-required',true);
-			jQuery('#jform_php_before_getitems').addClass('required');
+			updateFieldRequired('php_getlistquery',0);
+			jQuery('#jform_php_getlistquery').prop('required','required');
+			jQuery('#jform_php_getlistquery').attr('aria-required',true);
+			jQuery('#jform_php_getlistquery').addClass('required');
 			jform_vvvvvztvzi_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_getlistquery-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvztvzi_required)
 		{
-			updateFieldRequired('php_before_getitems',1);
-			jQuery('#jform_php_before_getitems').removeAttr('required');
-			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_before_getitems').removeClass('required');
+			updateFieldRequired('php_getlistquery',1);
+			jQuery('#jform_php_getlistquery').removeAttr('required');
+			jQuery('#jform_php_getlistquery').removeAttr('aria-required');
+			jQuery('#jform_php_getlistquery').removeClass('required');
 			jform_vvvvvztvzi_required = true;
 		}
 	}
 }
 
 // the vvvvvzt Some function
-function add_php_before_getitems_vvvvvzt_SomeFunc(add_php_before_getitems_vvvvvzt)
+function add_php_getlistquery_vvvvvzt_SomeFunc(add_php_getlistquery_vvvvvzt)
 {
 	// set the function logic
-	if (add_php_before_getitems_vvvvvzt == 1)
+	if (add_php_getlistquery_vvvvvzt == 1)
 	{
 		return true;
 	}
@@ -1020,19 +942,19 @@ function gettype_vvvvvzt_SomeFunc(gettype_vvvvvzt)
 }
 
 // the vvvvvzu function
-function vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu)
+function vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu)
 {
-	if (isSet(add_php_after_getitems_vvvvvzu) && add_php_after_getitems_vvvvvzu.constructor !== Array)
+	if (isSet(add_php_before_getitems_vvvvvzu) && add_php_before_getitems_vvvvvzu.constructor !== Array)
 	{
-		var temp_vvvvvzu = add_php_after_getitems_vvvvvzu;
-		var add_php_after_getitems_vvvvvzu = [];
-		add_php_after_getitems_vvvvvzu.push(temp_vvvvvzu);
+		var temp_vvvvvzu = add_php_before_getitems_vvvvvzu;
+		var add_php_before_getitems_vvvvvzu = [];
+		add_php_before_getitems_vvvvvzu.push(temp_vvvvvzu);
 	}
-	else if (!isSet(add_php_after_getitems_vvvvvzu))
+	else if (!isSet(add_php_before_getitems_vvvvvzu))
 	{
-		var add_php_after_getitems_vvvvvzu = [];
+		var add_php_before_getitems_vvvvvzu = [];
 	}
-	var add_php_after_getitems = add_php_after_getitems_vvvvvzu.some(add_php_after_getitems_vvvvvzu_SomeFunc);
+	var add_php_before_getitems = add_php_before_getitems_vvvvvzu.some(add_php_before_getitems_vvvvvzu_SomeFunc);
 
 	if (isSet(gettype_vvvvvzu) && gettype_vvvvvzu.constructor !== Array)
 	{
@@ -1048,38 +970,38 @@ function vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu)
 
 
 	// set this function logic
-	if (add_php_after_getitems && gettype)
+	if (add_php_before_getitems && gettype)
 	{
-		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
+		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').show();
 		if (jform_vvvvvzuvzj_required)
 		{
-			updateFieldRequired('php_after_getitems',0);
-			jQuery('#jform_php_after_getitems').prop('required','required');
-			jQuery('#jform_php_after_getitems').attr('aria-required',true);
-			jQuery('#jform_php_after_getitems').addClass('required');
+			updateFieldRequired('php_before_getitems',0);
+			jQuery('#jform_php_before_getitems').prop('required','required');
+			jQuery('#jform_php_before_getitems').attr('aria-required',true);
+			jQuery('#jform_php_before_getitems').addClass('required');
 			jform_vvvvvzuvzj_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_before_getitems-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvzuvzj_required)
 		{
-			updateFieldRequired('php_after_getitems',1);
-			jQuery('#jform_php_after_getitems').removeAttr('required');
-			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
-			jQuery('#jform_php_after_getitems').removeClass('required');
+			updateFieldRequired('php_before_getitems',1);
+			jQuery('#jform_php_before_getitems').removeAttr('required');
+			jQuery('#jform_php_before_getitems').removeAttr('aria-required');
+			jQuery('#jform_php_before_getitems').removeClass('required');
 			jform_vvvvvzuvzj_required = true;
 		}
 	}
 }
 
 // the vvvvvzu Some function
-function add_php_after_getitems_vvvvvzu_SomeFunc(add_php_after_getitems_vvvvvzu)
+function add_php_before_getitems_vvvvvzu_SomeFunc(add_php_before_getitems_vvvvvzu)
 {
 	// set the function logic
-	if (add_php_after_getitems_vvvvvzu == 1)
+	if (add_php_before_getitems_vvvvvzu == 1)
 	{
 		return true;
 	}
@@ -1097,93 +1019,78 @@ function gettype_vvvvvzu_SomeFunc(gettype_vvvvvzu)
 	return false;
 }
 
-// the vvvvvzw function
-function vvvvvzw(gettype_vvvvvzw)
+// the vvvvvzv function
+function vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv)
 {
-	if (isSet(gettype_vvvvvzw) && gettype_vvvvvzw.constructor !== Array)
+	if (isSet(add_php_after_getitems_vvvvvzv) && add_php_after_getitems_vvvvvzv.constructor !== Array)
 	{
-		var temp_vvvvvzw = gettype_vvvvvzw;
-		var gettype_vvvvvzw = [];
-		gettype_vvvvvzw.push(temp_vvvvvzw);
+		var temp_vvvvvzv = add_php_after_getitems_vvvvvzv;
+		var add_php_after_getitems_vvvvvzv = [];
+		add_php_after_getitems_vvvvvzv.push(temp_vvvvvzv);
 	}
-	else if (!isSet(gettype_vvvvvzw))
+	else if (!isSet(add_php_after_getitems_vvvvvzv))
 	{
-		var gettype_vvvvvzw = [];
+		var add_php_after_getitems_vvvvvzv = [];
 	}
-	var gettype = gettype_vvvvvzw.some(gettype_vvvvvzw_SomeFunc);
+	var add_php_after_getitems = add_php_after_getitems_vvvvvzv.some(add_php_after_getitems_vvvvvzv_SomeFunc);
+
+	if (isSet(gettype_vvvvvzv) && gettype_vvvvvzv.constructor !== Array)
+	{
+		var temp_vvvvvzv = gettype_vvvvvzv;
+		var gettype_vvvvvzv = [];
+		gettype_vvvvvzv.push(temp_vvvvvzv);
+	}
+	else if (!isSet(gettype_vvvvvzv))
+	{
+		var gettype_vvvvvzv = [];
+	}
+	var gettype = gettype_vvvvvzv.some(gettype_vvvvvzv_SomeFunc);
 
 
 	// set this function logic
-	if (gettype)
+	if (add_php_after_getitems && gettype)
 	{
-		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
-		if (jform_vvvvvzwvzk_required)
+		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').show();
+		if (jform_vvvvvzvvzk_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_vvvvvzwvzk_required = false;
-		}
-
-		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
-		if (jform_vvvvvzwvzl_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_vvvvvzwvzl_required = false;
-		}
-
-		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
-		if (jform_vvvvvzwvzm_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_vvvvvzwvzm_required = false;
+			updateFieldRequired('php_after_getitems',0);
+			jQuery('#jform_php_after_getitems').prop('required','required');
+			jQuery('#jform_php_after_getitems').attr('aria-required',true);
+			jQuery('#jform_php_after_getitems').addClass('required');
+			jform_vvvvvzvvzk_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzwvzk_required)
+		jQuery('#jform_php_after_getitems-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvzvvzk_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_vvvvvzwvzk_required = true;
-		}
-		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
-		if (!jform_vvvvvzwvzl_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_vvvvvzwvzl_required = true;
-		}
-		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
-		if (!jform_vvvvvzwvzm_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_vvvvvzwvzm_required = true;
+			updateFieldRequired('php_after_getitems',1);
+			jQuery('#jform_php_after_getitems').removeAttr('required');
+			jQuery('#jform_php_after_getitems').removeAttr('aria-required');
+			jQuery('#jform_php_after_getitems').removeClass('required');
+			jform_vvvvvzvvzk_required = true;
 		}
 	}
 }
 
-// the vvvvvzw Some function
-function gettype_vvvvvzw_SomeFunc(gettype_vvvvvzw)
+// the vvvvvzv Some function
+function add_php_after_getitems_vvvvvzv_SomeFunc(add_php_after_getitems_vvvvvzv)
 {
 	// set the function logic
-	if (gettype_vvvvvzw == 2 || gettype_vvvvvzw == 4)
+	if (add_php_after_getitems_vvvvvzv == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvvzv Some function
+function gettype_vvvvvzv_SomeFunc(gettype_vvvvvzv)
+{
+	// set the function logic
+	if (gettype_vvvvvzv == 2 || gettype_vvvvvzv == 4)
 	{
 		return true;
 	}
@@ -1209,26 +1116,64 @@ function vvvvvzx(gettype_vvvvvzx)
 	// set this function logic
 	if (gettype)
 	{
-		jQuery('#jform_pagination').closest('.control-group').show();
+		jQuery('#jform_add_php_after_getitems').closest('.control-group').show();
+		if (jform_vvvvvzxvzl_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_vvvvvzxvzl_required = false;
+		}
+
+		jQuery('#jform_add_php_before_getitems').closest('.control-group').show();
+		if (jform_vvvvvzxvzm_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_vvvvvzxvzm_required = false;
+		}
+
+		jQuery('#jform_add_php_getlistquery').closest('.control-group').show();
 		if (jform_vvvvvzxvzn_required)
 		{
-			updateFieldRequired('pagination',0);
-			jQuery('#jform_pagination').prop('required','required');
-			jQuery('#jform_pagination').attr('aria-required',true);
-			jQuery('#jform_pagination').addClass('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_vvvvvzxvzn_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_pagination').closest('.control-group').hide();
+		jQuery('#jform_add_php_after_getitems').closest('.control-group').hide();
+		if (!jform_vvvvvzxvzl_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_vvvvvzxvzl_required = true;
+		}
+		jQuery('#jform_add_php_before_getitems').closest('.control-group').hide();
+		if (!jform_vvvvvzxvzm_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_vvvvvzxvzm_required = true;
+		}
+		jQuery('#jform_add_php_getlistquery').closest('.control-group').hide();
 		if (!jform_vvvvvzxvzn_required)
 		{
-			updateFieldRequired('pagination',1);
-			jQuery('#jform_pagination').removeAttr('required');
-			jQuery('#jform_pagination').removeAttr('aria-required');
-			jQuery('#jform_pagination').removeClass('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_vvvvvzxvzn_required = true;
 		}
 	}
@@ -1238,7 +1183,7 @@ function vvvvvzx(gettype_vvvvvzx)
 function gettype_vvvvvzx_SomeFunc(gettype_vvvvvzx)
 {
 	// set the function logic
-	if (gettype_vvvvvzx == 2)
+	if (gettype_vvvvvzx == 2 || gettype_vvvvvzx == 4)
 	{
 		return true;
 	}
@@ -1264,26 +1209,26 @@ function vvvvvzy(gettype_vvvvvzy)
 	// set this function logic
 	if (gettype)
 	{
-		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
+		jQuery('#jform_pagination').closest('.control-group').show();
 		if (jform_vvvvvzyvzo_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');
+			updateFieldRequired('pagination',0);
+			jQuery('#jform_pagination').prop('required','required');
+			jQuery('#jform_pagination').attr('aria-required',true);
+			jQuery('#jform_pagination').addClass('required');
 			jform_vvvvvzyvzo_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
+		jQuery('#jform_pagination').closest('.control-group').hide();
 		if (!jform_vvvvvzyvzo_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');
+			updateFieldRequired('pagination',1);
+			jQuery('#jform_pagination').removeAttr('required');
+			jQuery('#jform_pagination').removeAttr('aria-required');
+			jQuery('#jform_pagination').removeClass('required');
 			jform_vvvvvzyvzo_required = true;
 		}
 	}
@@ -1293,7 +1238,7 @@ function vvvvvzy(gettype_vvvvvzy)
 function gettype_vvvvvzy_SomeFunc(gettype_vvvvvzy)
 {
 	// set the function logic
-	if (gettype_vvvvvzy == 1 || gettype_vvvvvzy == 2)
+	if (gettype_vvvvvzy == 2)
 	{
 		return true;
 	}
@@ -1301,7 +1246,7 @@ function gettype_vvvvvzy_SomeFunc(gettype_vvvvvzy)
 }
 
 // the vvvvvzz function
-function vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz)
+function vvvvvzz(gettype_vvvvvzz)
 {
 	if (isSet(gettype_vvvvvzz) && gettype_vvvvvzz.constructor !== Array)
 	{
@@ -1315,42 +1260,30 @@ function vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz)
 	}
 	var gettype = gettype_vvvvvzz.some(gettype_vvvvvzz_SomeFunc);
 
-	if (isSet(add_php_router_parse_vvvvvzz) && add_php_router_parse_vvvvvzz.constructor !== Array)
-	{
-		var temp_vvvvvzz = add_php_router_parse_vvvvvzz;
-		var add_php_router_parse_vvvvvzz = [];
-		add_php_router_parse_vvvvvzz.push(temp_vvvvvzz);
-	}
-	else if (!isSet(add_php_router_parse_vvvvvzz))
-	{
-		var add_php_router_parse_vvvvvzz = [];
-	}
-	var add_php_router_parse = add_php_router_parse_vvvvvzz.some(add_php_router_parse_vvvvvzz_SomeFunc);
-
 
 	// set this function logic
-	if (gettype && add_php_router_parse)
+	if (gettype)
 	{
-		jQuery('#jform_php_router_parse').closest('.control-group').show();
+		jQuery('#jform_add_php_router_parse').closest('.control-group').show();
 		if (jform_vvvvvzzvzp_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');
+			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_vvvvvzzvzp_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_router_parse').closest('.control-group').hide();
+		jQuery('#jform_add_php_router_parse').closest('.control-group').hide();
 		if (!jform_vvvvvzzvzp_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');
+			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_vvvvvzzvzp_required = true;
 		}
 	}
@@ -1367,11 +1300,78 @@ function gettype_vvvvvzz_SomeFunc(gettype_vvvvvzz)
 	return false;
 }
 
-// the vvvvvzz Some function
-function add_php_router_parse_vvvvvzz_SomeFunc(add_php_router_parse_vvvvvzz)
+// the vvvvwaa function
+function vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa)
+{
+	if (isSet(gettype_vvvvwaa) && gettype_vvvvwaa.constructor !== Array)
+	{
+		var temp_vvvvwaa = gettype_vvvvwaa;
+		var gettype_vvvvwaa = [];
+		gettype_vvvvwaa.push(temp_vvvvwaa);
+	}
+	else if (!isSet(gettype_vvvvwaa))
+	{
+		var gettype_vvvvwaa = [];
+	}
+	var gettype = gettype_vvvvwaa.some(gettype_vvvvwaa_SomeFunc);
+
+	if (isSet(add_php_router_parse_vvvvwaa) && add_php_router_parse_vvvvwaa.constructor !== Array)
+	{
+		var temp_vvvvwaa = add_php_router_parse_vvvvwaa;
+		var add_php_router_parse_vvvvwaa = [];
+		add_php_router_parse_vvvvwaa.push(temp_vvvvwaa);
+	}
+	else if (!isSet(add_php_router_parse_vvvvwaa))
+	{
+		var add_php_router_parse_vvvvwaa = [];
+	}
+	var add_php_router_parse = add_php_router_parse_vvvvwaa.some(add_php_router_parse_vvvvwaa_SomeFunc);
+
+
+	// set this function logic
+	if (gettype && add_php_router_parse)
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').show();
+		if (jform_vvvvwaavzq_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_vvvvwaavzq_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_php_router_parse').closest('.control-group').hide();
+		if (!jform_vvvvwaavzq_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_vvvvwaavzq_required = true;
+		}
+	}
+}
+
+// the vvvvwaa Some function
+function gettype_vvvvwaa_SomeFunc(gettype_vvvvwaa)
 {
 	// set the function logic
-	if (add_php_router_parse_vvvvvzz == 1)
+	if (gettype_vvvvwaa == 1 || gettype_vvvvwaa == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaa Some function
+function add_php_router_parse_vvvvwaa_SomeFunc(add_php_router_parse_vvvvwaa)
+{
+	// set the function logic
+	if (add_php_router_parse_vvvvwaa == 1)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/field.js b/admin/models/forms/field.js
index c67386d6d..87069d8c3 100644
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@@ -9,151 +9,96 @@
  */
 
 // Some Global Values
-jform_vvvvwanvzw_required = false;
 jform_vvvvwaovzx_required = false;
 jform_vvvvwapvzy_required = false;
 jform_vvvvwaqvzz_required = false;
-jform_vvvvwatwaa_required = false;
+jform_vvvvwarwaa_required = false;
 jform_vvvvwauwab_required = false;
 jform_vvvvwavwac_required = false;
 jform_vvvvwawwad_required = false;
+jform_vvvvwaxwae_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwan = jQuery("#jform_datalenght").val();
-	vvvvwan(datalenght_vvvvwan);
+	var datalenght_vvvvwao = jQuery("#jform_datalenght").val();
+	vvvvwao(datalenght_vvvvwao);
 
-	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
-	vvvvwao(datadefault_vvvvwao);
-
-	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(datatype_vvvvwap);
+	var datadefault_vvvvwap = jQuery("#jform_datadefault").val();
+	vvvvwap(datadefault_vvvvwap);
 
 	var datatype_vvvvwaq = jQuery("#jform_datatype").val();
 	vvvvwaq(datatype_vvvvwaq);
 
-	var store_vvvvwar = jQuery("#jform_store").val();
 	var datatype_vvvvwar = jQuery("#jform_datatype").val();
-	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+	vvvvwar(datatype_vvvvwar);
 
-	var add_css_view_vvvvwat = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwat(add_css_view_vvvvwat);
+	var store_vvvvwas = jQuery("#jform_store").val();
+	var datatype_vvvvwas = jQuery("#jform_datatype").val();
+	vvvvwas(store_vvvvwas,datatype_vvvvwas);
 
-	var add_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwau(add_css_views_vvvvwau);
+	var add_css_view_vvvvwau = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwau(add_css_view_vvvvwau);
 
-	var add_javascript_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwav(add_javascript_view_footer_vvvvwav);
+	var add_css_views_vvvvwav = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwav(add_css_views_vvvvwav);
 
-	var add_javascript_views_footer_vvvvwaw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwaw(add_javascript_views_footer_vvvvwaw);
+	var add_javascript_view_footer_vvvvwaw = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwaw(add_javascript_view_footer_vvvvwaw);
+
+	var add_javascript_views_footer_vvvvwax = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwax(add_javascript_views_footer_vvvvwax);
 });
 
-// the vvvvwan function
-function vvvvwan(datalenght_vvvvwan)
+// the vvvvwao function
+function vvvvwao(datalenght_vvvvwao)
 {
-	if (isSet(datalenght_vvvvwan) && datalenght_vvvvwan.constructor !== Array)
+	if (isSet(datalenght_vvvvwao) && datalenght_vvvvwao.constructor !== Array)
 	{
-		var temp_vvvvwan = datalenght_vvvvwan;
-		var datalenght_vvvvwan = [];
-		datalenght_vvvvwan.push(temp_vvvvwan);
+		var temp_vvvvwao = datalenght_vvvvwao;
+		var datalenght_vvvvwao = [];
+		datalenght_vvvvwao.push(temp_vvvvwao);
 	}
-	else if (!isSet(datalenght_vvvvwan))
+	else if (!isSet(datalenght_vvvvwao))
 	{
-		var datalenght_vvvvwan = [];
+		var datalenght_vvvvwao = [];
 	}
-	var datalenght = datalenght_vvvvwan.some(datalenght_vvvvwan_SomeFunc);
+	var datalenght = datalenght_vvvvwao.some(datalenght_vvvvwao_SomeFunc);
 
 
 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwanvzw_required)
+		if (jform_vvvvwaovzx_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_vvvvwanvzw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwanvzw_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_vvvvwanvzw_required = true;
-		}
-	}
-}
-
-// the vvvvwan Some function
-function datalenght_vvvvwan_SomeFunc(datalenght_vvvvwan)
-{
-	// set the function logic
-	if (datalenght_vvvvwan == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwao function
-function vvvvwao(datadefault_vvvvwao)
-{
-	if (isSet(datadefault_vvvvwao) && datadefault_vvvvwao.constructor !== Array)
-	{
-		var temp_vvvvwao = datadefault_vvvvwao;
-		var datadefault_vvvvwao = [];
-		datadefault_vvvvwao.push(temp_vvvvwao);
-	}
-	else if (!isSet(datadefault_vvvvwao))
-	{
-		var datadefault_vvvvwao = [];
-	}
-	var datadefault = datadefault_vvvvwao.some(datadefault_vvvvwao_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwaovzx_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_vvvvwaovzx_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		if (!jform_vvvvwaovzx_required)
 		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('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_vvvvwaovzx_required = true;
 		}
 	}
 }
 
 // the vvvvwao Some function
-function datadefault_vvvvwao_SomeFunc(datadefault_vvvvwao)
+function datalenght_vvvvwao_SomeFunc(datalenght_vvvvwao)
 {
 	// set the function logic
-	if (datadefault_vvvvwao == 'Other')
+	if (datalenght_vvvvwao == 'Other')
 	{
 		return true;
 	}
@@ -161,58 +106,54 @@ function datadefault_vvvvwao_SomeFunc(datadefault_vvvvwao)
 }
 
 // the vvvvwap function
-function vvvvwap(datatype_vvvvwap)
+function vvvvwap(datadefault_vvvvwap)
 {
-	if (isSet(datatype_vvvvwap) && datatype_vvvvwap.constructor !== Array)
+	if (isSet(datadefault_vvvvwap) && datadefault_vvvvwap.constructor !== Array)
 	{
-		var temp_vvvvwap = datatype_vvvvwap;
-		var datatype_vvvvwap = [];
-		datatype_vvvvwap.push(temp_vvvvwap);
+		var temp_vvvvwap = datadefault_vvvvwap;
+		var datadefault_vvvvwap = [];
+		datadefault_vvvvwap.push(temp_vvvvwap);
 	}
-	else if (!isSet(datatype_vvvvwap))
+	else if (!isSet(datadefault_vvvvwap))
 	{
-		var datatype_vvvvwap = [];
+		var datadefault_vvvvwap = [];
 	}
-	var datatype = datatype_vvvvwap.some(datatype_vvvvwap_SomeFunc);
+	var datadefault = datadefault_vvvvwap.some(datadefault_vvvvwap_SomeFunc);
 
 
 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		if (jform_vvvvwapvzy_required)
 		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('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_vvvvwapvzy_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		if (!jform_vvvvwapvzy_required)
 		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('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_vvvvwapvzy_required = true;
 		}
 	}
 }
 
 // the vvvvwap Some function
-function datatype_vvvvwap_SomeFunc(datatype_vvvvwap)
+function datadefault_vvvvwap_SomeFunc(datadefault_vvvvwap)
 {
 	// set the function logic
-	if (datatype_vvvvwap == 'CHAR' || datatype_vvvvwap == 'VARCHAR' || datatype_vvvvwap == 'DATETIME' || datatype_vvvvwap == 'DATE' || datatype_vvvvwap == 'TIME' || datatype_vvvvwap == 'INT' || datatype_vvvvwap == 'TINYINT' || datatype_vvvvwap == 'BIGINT' || datatype_vvvvwap == 'FLOAT' || datatype_vvvvwap == 'DECIMAL' || datatype_vvvvwap == 'DOUBLE')
+	if (datadefault_vvvvwap == 'Other')
 	{
 		return true;
 	}
@@ -238,26 +179,30 @@ function vvvvwaq(datatype_vvvvwaq)
 	// set this function logic
 	if (datatype)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
 		if (jform_vvvvwaqvzz_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwaqvzz_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
 		if (!jform_vvvvwaqvzz_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
 			jform_vvvvwaqvzz_required = true;
 		}
 	}
@@ -267,7 +212,7 @@ function vvvvwaq(datatype_vvvvwaq)
 function datatype_vvvvwaq_SomeFunc(datatype_vvvvwaq)
 {
 	// set the function logic
-	if (datatype_vvvvwaq == 'CHAR' || datatype_vvvvwaq == 'VARCHAR' || datatype_vvvvwaq == 'TEXT' || datatype_vvvvwaq == 'MEDIUMTEXT' || datatype_vvvvwaq == 'LONGTEXT')
+	if (datatype_vvvvwaq == 'CHAR' || datatype_vvvvwaq == 'VARCHAR' || datatype_vvvvwaq == 'DATETIME' || datatype_vvvvwaq == 'DATE' || datatype_vvvvwaq == 'TIME' || datatype_vvvvwaq == 'INT' || datatype_vvvvwaq == 'TINYINT' || datatype_vvvvwaq == 'BIGINT' || datatype_vvvvwaq == 'FLOAT' || datatype_vvvvwaq == 'DECIMAL' || datatype_vvvvwaq == 'DOUBLE')
 	{
 		return true;
 	}
@@ -275,20 +220,8 @@ function datatype_vvvvwaq_SomeFunc(datatype_vvvvwaq)
 }
 
 // the vvvvwar function
-function vvvvwar(store_vvvvwar,datatype_vvvvwar)
+function vvvvwar(datatype_vvvvwar)
 {
-	if (isSet(store_vvvvwar) && store_vvvvwar.constructor !== Array)
-	{
-		var temp_vvvvwar = store_vvvvwar;
-		var store_vvvvwar = [];
-		store_vvvvwar.push(temp_vvvvwar);
-	}
-	else if (!isSet(store_vvvvwar))
-	{
-		var store_vvvvwar = [];
-	}
-	var store = store_vvvvwar.some(store_vvvvwar_SomeFunc);
-
 	if (isSet(datatype_vvvvwar) && datatype_vvvvwar.constructor !== Array)
 	{
 		var temp_vvvvwar = datatype_vvvvwar;
@@ -303,27 +236,33 @@ function vvvvwar(store_vvvvwar,datatype_vvvvwar)
 
 
 	// set this function logic
-	if (store && datatype)
+	if (datatype)
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwarwaa_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwarwaa_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwarwaa_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwarwaa_required = true;
+		}
 	}
 }
 
-// the vvvvwar Some function
-function store_vvvvwar_SomeFunc(store_vvvvwar)
-{
-	// set the function logic
-	if (store_vvvvwar == 4)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwar Some function
 function datatype_vvvvwar_SomeFunc(datatype_vvvvwar)
 {
@@ -335,126 +274,187 @@ function datatype_vvvvwar_SomeFunc(datatype_vvvvwar)
 	return false;
 }
 
-// the vvvvwat function
-function vvvvwat(add_css_view_vvvvwat)
+// the vvvvwas function
+function vvvvwas(store_vvvvwas,datatype_vvvvwas)
+{
+	if (isSet(store_vvvvwas) && store_vvvvwas.constructor !== Array)
+	{
+		var temp_vvvvwas = store_vvvvwas;
+		var store_vvvvwas = [];
+		store_vvvvwas.push(temp_vvvvwas);
+	}
+	else if (!isSet(store_vvvvwas))
+	{
+		var store_vvvvwas = [];
+	}
+	var store = store_vvvvwas.some(store_vvvvwas_SomeFunc);
+
+	if (isSet(datatype_vvvvwas) && datatype_vvvvwas.constructor !== Array)
+	{
+		var temp_vvvvwas = datatype_vvvvwas;
+		var datatype_vvvvwas = [];
+		datatype_vvvvwas.push(temp_vvvvwas);
+	}
+	else if (!isSet(datatype_vvvvwas))
+	{
+		var datatype_vvvvwas = [];
+	}
+	var datatype = datatype_vvvvwas.some(datatype_vvvvwas_SomeFunc);
+
+
+	// set this function logic
+	if (store && datatype)
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_whmcs_encryption').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwas Some function
+function store_vvvvwas_SomeFunc(store_vvvvwas)
 {
 	// set the function logic
-	if (add_css_view_vvvvwat == 1)
+	if (store_vvvvwas == 4)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwas Some function
+function datatype_vvvvwas_SomeFunc(datatype_vvvvwas)
+{
+	// set the function logic
+	if (datatype_vvvvwas == 'CHAR' || datatype_vvvvwas == 'VARCHAR' || datatype_vvvvwas == 'TEXT' || datatype_vvvvwas == 'MEDIUMTEXT' || datatype_vvvvwas == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwau function
+function vvvvwau(add_css_view_vvvvwau)
+{
+	// set the function logic
+	if (add_css_view_vvvvwau == 1)
 	{
 		jQuery('#jform_css_view-lbl').closest('.control-group').show();
-		if (jform_vvvvwatwaa_required)
+		if (jform_vvvvwauwab_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwatwaa_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvwatwaa_required)
-		{
-			updateFieldRequired('css_view',1);
-			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwatwaa_required = true;
-		}
-	}
-}
-
-// the vvvvwau function
-function vvvvwau(add_css_views_vvvvwau)
-{
-	// set the function logic
-	if (add_css_views_vvvvwau == 1)
-	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').show();
-		if (jform_vvvvwauwab_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwauwab_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwauwab_required)
 		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
+			updateFieldRequired('css_view',1);
+			jQuery('#jform_css_view').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeClass('required');
 			jform_vvvvwauwab_required = true;
 		}
 	}
 }
 
 // the vvvvwav function
-function vvvvwav(add_javascript_view_footer_vvvvwav)
+function vvvvwav(add_css_views_vvvvwav)
 {
 	// set the function logic
-	if (add_javascript_view_footer_vvvvwav == 1)
+	if (add_css_views_vvvvwav == 1)
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
+		jQuery('#jform_css_views-lbl').closest('.control-group').show();
 		if (jform_vvvvwavwac_required)
 		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
+			updateFieldRequired('css_views',0);
+			jQuery('#jform_css_views').prop('required','required');
+			jQuery('#jform_css_views').attr('aria-required',true);
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwavwac_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_views-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwavwac_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
 			jform_vvvvwavwac_required = true;
 		}
 	}
 }
 
 // the vvvvwaw function
-function vvvvwaw(add_javascript_views_footer_vvvvwaw)
+function vvvvwaw(add_javascript_view_footer_vvvvwaw)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwaw == 1)
+	if (add_javascript_view_footer_vvvvwaw == 1)
 	{
-		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').show();
 		if (jform_vvvvwawwad_required)
 		{
-			updateFieldRequired('javascript_views_footer',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
 			jform_vvvvwawwad_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_view_footer-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwawwad_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwawwad_required = true;
+		}
+	}
+}
+
+// the vvvvwax function
+function vvvvwax(add_javascript_views_footer_vvvvwax)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwax == 1)
+	{
+		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').show();
+		if (jform_vvvvwaxwae_required)
+		{
+			updateFieldRequired('javascript_views_footer',0);
+			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_views_footer').addClass('required');
+			jform_vvvvwaxwae_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwaxwae_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwawwad_required = true;
+			jform_vvvvwaxwae_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index b16049f49..c8dfa715f 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -9,24 +9,21 @@
  */
 
 // Some Global Values
-jform_vvvvwbhwap_required = false;
 jform_vvvvwbiwaq_required = false;
 jform_vvvvwbjwar_required = false;
 jform_vvvvwbkwas_required = false;
 jform_vvvvwblwat_required = false;
 jform_vvvvwbmwau_required = false;
+jform_vvvvwbnwav_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbh(location_vvvvwbh);
-
 	var location_vvvvwbi = jQuery("#jform_location input[type='radio']:checked").val();
 	vvvvwbi(location_vvvvwbi);
 
-	var type_vvvvwbj = jQuery("#jform_type").val();
-	vvvvwbj(type_vvvvwbj);
+	var location_vvvvwbj = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbj(location_vvvvwbj);
 
 	var type_vvvvwbk = jQuery("#jform_type").val();
 	vvvvwbk(type_vvvvwbk);
@@ -34,127 +31,75 @@ jQuery(document).ready(function()
 	var type_vvvvwbl = jQuery("#jform_type").val();
 	vvvvwbl(type_vvvvwbl);
 
-	var target_vvvvwbm = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbm(target_vvvvwbm);
+	var type_vvvvwbm = jQuery("#jform_type").val();
+	vvvvwbm(type_vvvvwbm);
+
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(target_vvvvwbn);
 });
 
-// the vvvvwbh function
-function vvvvwbh(location_vvvvwbh)
-{
-	// set the function logic
-	if (location_vvvvwbh == 1)
-	{
-		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwbhwap_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_vvvvwbhwap_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwbhwap_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_vvvvwbhwap_required = true;
-		}
-	}
-}
-
 // the vvvvwbi function
 function vvvvwbi(location_vvvvwbi)
 {
 	// set the function logic
-	if (location_vvvvwbi == 2)
+	if (location_vvvvwbi == 1)
 	{
-		jQuery('#jform_site_view').closest('.control-group').show();
+		jQuery('#jform_admin_view').closest('.control-group').show();
 		if (jform_vvvvwbiwaq_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');
+			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_vvvvwbiwaq_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
+		jQuery('#jform_admin_view').closest('.control-group').hide();
 		if (!jform_vvvvwbiwaq_required)
 		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('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_vvvvwbiwaq_required = true;
 		}
 	}
 }
 
 // the vvvvwbj function
-function vvvvwbj(type_vvvvwbj)
+function vvvvwbj(location_vvvvwbj)
 {
-	if (isSet(type_vvvvwbj) && type_vvvvwbj.constructor !== Array)
+	// set the function logic
+	if (location_vvvvwbj == 2)
 	{
-		var temp_vvvvwbj = type_vvvvwbj;
-		var type_vvvvwbj = [];
-		type_vvvvwbj.push(temp_vvvvwbj);
-	}
-	else if (!isSet(type_vvvvwbj))
-	{
-		var type_vvvvwbj = [];
-	}
-	var type = type_vvvvwbj.some(type_vvvvwbj_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
+		jQuery('#jform_site_view').closest('.control-group').show();
 		if (jform_vvvvwbjwar_required)
 		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('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_vvvvwbjwar_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_url').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwbjwar_required)
 		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('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_vvvvwbjwar_required = true;
 		}
 	}
 }
 
-// the vvvvwbj Some function
-function type_vvvvwbj_SomeFunc(type_vvvvwbj)
-{
-	// set the function logic
-	if (type_vvvvwbj == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwbk function
 function vvvvwbk(type_vvvvwbk)
 {
@@ -174,26 +119,26 @@ function vvvvwbk(type_vvvvwbk)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwbkwas_required)
 		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			updateFieldRequired('url',0);
+			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwbkwas_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwbkwas_required)
 		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			updateFieldRequired('url',1);
+			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwbkwas_required = true;
 		}
 	}
@@ -203,7 +148,7 @@ function vvvvwbk(type_vvvvwbk)
 function type_vvvvwbk_SomeFunc(type_vvvvwbk)
 {
 	// set the function logic
-	if (type_vvvvwbk == 1)
+	if (type_vvvvwbk == 3)
 	{
 		return true;
 	}
@@ -229,26 +174,26 @@ function vvvvwbl(type_vvvvwbl)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwblwat_required)
 		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwblwat_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
 		if (!jform_vvvvwblwat_required)
 		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
 			jform_vvvvwblwat_required = true;
 		}
 	}
@@ -258,7 +203,7 @@ function vvvvwbl(type_vvvvwbl)
 function type_vvvvwbl_SomeFunc(type_vvvvwbl)
 {
 	// set the function logic
-	if (type_vvvvwbl == 2)
+	if (type_vvvvwbl == 1)
 	{
 		return true;
 	}
@@ -266,32 +211,87 @@ function type_vvvvwbl_SomeFunc(type_vvvvwbl)
 }
 
 // the vvvvwbm function
-function vvvvwbm(target_vvvvwbm)
+function vvvvwbm(type_vvvvwbm)
 {
-	// set the function logic
-	if (target_vvvvwbm == 1)
+	if (isSet(type_vvvvwbm) && type_vvvvwbm.constructor !== Array)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwbm = type_vvvvwbm;
+		var type_vvvvwbm = [];
+		type_vvvvwbm.push(temp_vvvvwbm);
+	}
+	else if (!isSet(type_vvvvwbm))
+	{
+		var type_vvvvwbm = [];
+	}
+	var type = type_vvvvwbm.some(type_vvvvwbm_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
 		if (jform_vvvvwbmwau_required)
 		{
-			updateFieldRequired('groups',0);
-			jQuery('#jform_groups').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
 			jform_vvvvwbmwau_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
 		if (!jform_vvvvwbmwau_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwbmwau_required = true;
+		}
+	}
+}
+
+// the vvvvwbm Some function
+function type_vvvvwbm_SomeFunc(type_vvvvwbm)
+{
+	// set the function logic
+	if (type_vvvvwbm == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwbn function
+function vvvvwbn(target_vvvvwbn)
+{
+	// set the function logic
+	if (target_vvvvwbn == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwbnwav_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwbnwav_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwbnwav_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwbmwau_required = true;
+			jform_vvvvwbnwav_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/layout.js b/admin/models/forms/layout.js
index 742b9c030..2170f0385 100644
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@@ -9,42 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvvzbvyv_required = false;
+jform_vvvvvzcvyw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzb(add_php_view_vvvvvzb);
+	var add_php_view_vvvvvzc = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzc(add_php_view_vvvvvzc);
 });
 
-// the vvvvvzb function
-function vvvvvzb(add_php_view_vvvvvzb)
+// the vvvvvzc function
+function vvvvvzc(add_php_view_vvvvvzc)
 {
 	// set the function logic
-	if (add_php_view_vvvvvzb == 1)
+	if (add_php_view_vvvvvzc == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvzbvyv_required)
+		if (jform_vvvvvzcvyw_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzbvyv_required = false;
+			jform_vvvvvzcvyw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvzbvyv_required)
+		if (!jform_vvvvvzcvyw_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzbvyv_required = true;
+			jform_vvvvvzcvyw_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/library.js b/admin/models/forms/library.js
index 6ddaf0c87..6205c4ff4 100644
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@@ -9,15 +9,12 @@
  */
 
 // Some Global Values
-jform_vvvvwagvzu_required = false;
-jform_vvvvwamvzv_required = false;
+jform_vvvvwahvzv_required = false;
+jform_vvvvwanvzw_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvwaf = jQuery("#jform_how").val();
-	vvvvwaf(how_vvvvwaf);
-
 	var how_vvvvwag = jQuery("#jform_how").val();
 	vvvvwag(how_vvvvwag);
 
@@ -36,48 +33,13 @@ jQuery(document).ready(function()
 	var how_vvvvwal = jQuery("#jform_how").val();
 	vvvvwal(how_vvvvwal);
 
-	var type_vvvvwam = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwam(type_vvvvwam);
+	var how_vvvvwam = jQuery("#jform_how").val();
+	vvvvwam(how_vvvvwam);
+
+	var type_vvvvwan = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwan(type_vvvvwan);
 });
 
-// the vvvvwaf function
-function vvvvwaf(how_vvvvwaf)
-{
-	if (isSet(how_vvvvwaf) && how_vvvvwaf.constructor !== Array)
-	{
-		var temp_vvvvwaf = how_vvvvwaf;
-		var how_vvvvwaf = [];
-		how_vvvvwaf.push(temp_vvvvwaf);
-	}
-	else if (!isSet(how_vvvvwaf))
-	{
-		var how_vvvvwaf = [];
-	}
-	var how = how_vvvvwaf.some(how_vvvvwaf_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvwaf Some function
-function how_vvvvwaf_SomeFunc(how_vvvvwaf)
-{
-	// set the function logic
-	if (how_vvvvwaf == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwag function
 function vvvvwag(how_vvvvwag)
 {
@@ -97,28 +59,11 @@ function vvvvwag(how_vvvvwag)
 	// set this function logic
 	if (how)
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvwagvzu_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_vvvvwagvzu_required = false;
-		}
-
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvwagvzu_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_vvvvwagvzu_required = true;
-		}
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }
 
@@ -126,7 +71,7 @@ function vvvvwag(how_vvvvwag)
 function how_vvvvwag_SomeFunc(how_vvvvwag)
 {
 	// set the function logic
-	if (how_vvvvwag == 3)
+	if (how_vvvvwag == 2)
 	{
 		return true;
 	}
@@ -152,11 +97,28 @@ function vvvvwah(how_vvvvwah)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvwahvzv_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_vvvvwahvzv_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvwahvzv_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_vvvvwahvzv_required = true;
+		}
 	}
 }
 
@@ -164,7 +126,7 @@ function vvvvwah(how_vvvvwah)
 function how_vvvvwah_SomeFunc(how_vvvvwah)
 {
 	// set the function logic
-	if (how_vvvvwah == 2 || how_vvvvwah == 3)
+	if (how_vvvvwah == 3)
 	{
 		return true;
 	}
@@ -190,11 +152,11 @@ function vvvvwai(how_vvvvwai)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }
 
@@ -202,7 +164,7 @@ function vvvvwai(how_vvvvwai)
 function how_vvvvwai_SomeFunc(how_vvvvwai)
 {
 	// set the function logic
-	if (how_vvvvwai == 1 || how_vvvvwai == 2 || how_vvvvwai == 3)
+	if (how_vvvvwai == 2 || how_vvvvwai == 3)
 	{
 		return true;
 	}
@@ -228,15 +190,11 @@ function vvvvwaj(how_vvvvwaj)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
 	}
 }
 
@@ -244,7 +202,7 @@ function vvvvwaj(how_vvvvwaj)
 function how_vvvvwaj_SomeFunc(how_vvvvwaj)
 {
 	// set the function logic
-	if (how_vvvvwaj == 0)
+	if (how_vvvvwaj == 1 || how_vvvvwaj == 2 || how_vvvvwaj == 3)
 	{
 		return true;
 	}
@@ -270,13 +228,15 @@ function vvvvwak(how_vvvvwak)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
 	}
 }
 
@@ -284,7 +244,7 @@ function vvvvwak(how_vvvvwak)
 function how_vvvvwak_SomeFunc(how_vvvvwak)
 {
 	// set the function logic
-	if (how_vvvvwak == 1)
+	if (how_vvvvwak == 0)
 	{
 		return true;
 	}
@@ -307,6 +267,46 @@ function vvvvwal(how_vvvvwal)
 	var how = how_vvvvwal.some(how_vvvvwal_SomeFunc);
 
 
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwal Some function
+function how_vvvvwal_SomeFunc(how_vvvvwal)
+{
+	// set the function logic
+	if (how_vvvvwal == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwam function
+function vvvvwam(how_vvvvwam)
+{
+	if (isSet(how_vvvvwam) && how_vvvvwam.constructor !== Array)
+	{
+		var temp_vvvvwam = how_vvvvwam;
+		var how_vvvvwam = [];
+		how_vvvvwam.push(temp_vvvvwam);
+	}
+	else if (!isSet(how_vvvvwam))
+	{
+		var how_vvvvwam = [];
+	}
+	var how = how_vvvvwam.some(how_vvvvwam_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@@ -322,44 +322,44 @@ function vvvvwal(how_vvvvwal)
 	}
 }
 
-// the vvvvwal Some function
-function how_vvvvwal_SomeFunc(how_vvvvwal)
+// the vvvvwam Some function
+function how_vvvvwam_SomeFunc(how_vvvvwam)
 {
 	// set the function logic
-	if (how_vvvvwal == 4)
+	if (how_vvvvwam == 4)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwam function
-function vvvvwam(type_vvvvwam)
+// the vvvvwan function
+function vvvvwan(type_vvvvwan)
 {
 	// set the function logic
-	if (type_vvvvwam == 2)
+	if (type_vvvvwan == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwamvzv_required)
+		if (jform_vvvvwanvzw_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwamvzv_required = false;
+			jform_vvvvwanvzw_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwamvzv_required)
+		if (!jform_vvvvwanvzw_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwamvzv_required = true;
+			jform_vvvvwanvzw_required = true;
 		}
 	}
 }
diff --git a/admin/models/forms/library_config.xml b/admin/models/forms/library_config.xml
index 8d8b0d305..40c27d567 100644
--- a/admin/models/forms/library_config.xml
+++ b/admin/models/forms/library_config.xml
@@ -113,7 +113,7 @@
 					name="field"
 					label="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_LABEL"
 					description="COM_COMPONENTBUILDER_LIBRARY_CONFIG_FIELD_DESCRIPTION"
-					class="list_class"
+					class="list_class fieldFull"
 					multiple="false"
 					required="false"
 					button="false"
diff --git a/admin/models/forms/server.js b/admin/models/forms/server.js
index 26f36f9d2..2cd4b537c 100644
--- a/admin/models/forms/server.js
+++ b/admin/models/forms/server.js
@@ -9,175 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvwaxwaf_required = false;
-jform_vvvvwaxwag_required = false;
-jform_vvvvwaxwah_required = false;
-jform_vvvvwaxwai_required = false;
-jform_vvvvwaxwaj_required = false;
+jform_vvvvwaywag_required = false;
+jform_vvvvwaywah_required = false;
+jform_vvvvwaywai_required = false;
+jform_vvvvwaywaj_required = false;
 jform_vvvvwaywak_required = false;
 jform_vvvvwazwal_required = false;
-jform_vvvvwbbwam_required = false;
-jform_vvvvwbdwan_required = false;
+jform_vvvvwbawam_required = false;
+jform_vvvvwbcwan_required = false;
+jform_vvvvwbewao_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	vvvvwax(protocol_vvvvwax);
-
 	var protocol_vvvvway = jQuery("#jform_protocol").val();
 	vvvvway(protocol_vvvvway);
 
 	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	vvvvwaz(protocol_vvvvwaz);
 
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
 
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
 
-	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
-	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+
+	var protocol_vvvvwbg = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbg = jQuery("#jform_authentication").val();
+	vvvvwbg(protocol_vvvvwbg,authentication_vvvvwbg);
 });
 
-// the vvvvwax function
-function vvvvwax(protocol_vvvvwax)
-{
-	if (isSet(protocol_vvvvwax) && protocol_vvvvwax.constructor !== Array)
-	{
-		var temp_vvvvwax = protocol_vvvvwax;
-		var protocol_vvvvwax = [];
-		protocol_vvvvwax.push(temp_vvvvwax);
-	}
-	else if (!isSet(protocol_vvvvwax))
-	{
-		var protocol_vvvvwax = [];
-	}
-	var protocol = protocol_vvvvwax.some(protocol_vvvvwax_SomeFunc);
-
-
-	// set this function logic
-	if (protocol)
-	{
-		jQuery('#jform_authentication').closest('.control-group').show();
-		if (jform_vvvvwaxwaf_required)
-		{
-			updateFieldRequired('authentication',0);
-			jQuery('#jform_authentication').prop('required','required');
-			jQuery('#jform_authentication').attr('aria-required',true);
-			jQuery('#jform_authentication').addClass('required');
-			jform_vvvvwaxwaf_required = false;
-		}
-
-		jQuery('#jform_host').closest('.control-group').show();
-		if (jform_vvvvwaxwag_required)
-		{
-			updateFieldRequired('host',0);
-			jQuery('#jform_host').prop('required','required');
-			jQuery('#jform_host').attr('aria-required',true);
-			jQuery('#jform_host').addClass('required');
-			jform_vvvvwaxwag_required = false;
-		}
-
-		jQuery('#jform_port').closest('.control-group').show();
-		if (jform_vvvvwaxwah_required)
-		{
-			updateFieldRequired('port',0);
-			jQuery('#jform_port').prop('required','required');
-			jQuery('#jform_port').attr('aria-required',true);
-			jQuery('#jform_port').addClass('required');
-			jform_vvvvwaxwah_required = false;
-		}
-
-		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvwaxwai_required)
-		{
-			updateFieldRequired('path',0);
-			jQuery('#jform_path').prop('required','required');
-			jQuery('#jform_path').attr('aria-required',true);
-			jQuery('#jform_path').addClass('required');
-			jform_vvvvwaxwai_required = false;
-		}
-
-		jQuery('.note_ssh_security').closest('.control-group').show();
-		jQuery('#jform_username').closest('.control-group').show();
-		if (jform_vvvvwaxwaj_required)
-		{
-			updateFieldRequired('username',0);
-			jQuery('#jform_username').prop('required','required');
-			jQuery('#jform_username').attr('aria-required',true);
-			jQuery('#jform_username').addClass('required');
-			jform_vvvvwaxwaj_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_authentication').closest('.control-group').hide();
-		if (!jform_vvvvwaxwaf_required)
-		{
-			updateFieldRequired('authentication',1);
-			jQuery('#jform_authentication').removeAttr('required');
-			jQuery('#jform_authentication').removeAttr('aria-required');
-			jQuery('#jform_authentication').removeClass('required');
-			jform_vvvvwaxwaf_required = true;
-		}
-		jQuery('#jform_host').closest('.control-group').hide();
-		if (!jform_vvvvwaxwag_required)
-		{
-			updateFieldRequired('host',1);
-			jQuery('#jform_host').removeAttr('required');
-			jQuery('#jform_host').removeAttr('aria-required');
-			jQuery('#jform_host').removeClass('required');
-			jform_vvvvwaxwag_required = true;
-		}
-		jQuery('#jform_port').closest('.control-group').hide();
-		if (!jform_vvvvwaxwah_required)
-		{
-			updateFieldRequired('port',1);
-			jQuery('#jform_port').removeAttr('required');
-			jQuery('#jform_port').removeAttr('aria-required');
-			jQuery('#jform_port').removeClass('required');
-			jform_vvvvwaxwah_required = true;
-		}
-		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvwaxwai_required)
-		{
-			updateFieldRequired('path',1);
-			jQuery('#jform_path').removeAttr('required');
-			jQuery('#jform_path').removeAttr('aria-required');
-			jQuery('#jform_path').removeClass('required');
-			jform_vvvvwaxwai_required = true;
-		}
-		jQuery('.note_ssh_security').closest('.control-group').hide();
-		jQuery('#jform_username').closest('.control-group').hide();
-		if (!jform_vvvvwaxwaj_required)
-		{
-			updateFieldRequired('username',1);
-			jQuery('#jform_username').removeAttr('required');
-			jQuery('#jform_username').removeAttr('aria-required');
-			jQuery('#jform_username').removeClass('required');
-			jform_vvvvwaxwaj_required = true;
-		}
-	}
-}
-
-// the vvvvwax Some function
-function protocol_vvvvwax_SomeFunc(protocol_vvvvwax)
-{
-	// set the function logic
-	if (protocol_vvvvwax == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvway function
 function vvvvway(protocol_vvvvway)
 {
@@ -197,28 +64,104 @@ function vvvvway(protocol_vvvvway)
 	// set this function logic
 	if (protocol)
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').show();
-		jQuery('#jform_signature').closest('.control-group').show();
+		jQuery('#jform_authentication').closest('.control-group').show();
+		if (jform_vvvvwaywag_required)
+		{
+			updateFieldRequired('authentication',0);
+			jQuery('#jform_authentication').prop('required','required');
+			jQuery('#jform_authentication').attr('aria-required',true);
+			jQuery('#jform_authentication').addClass('required');
+			jform_vvvvwaywag_required = false;
+		}
+
+		jQuery('#jform_host').closest('.control-group').show();
+		if (jform_vvvvwaywah_required)
+		{
+			updateFieldRequired('host',0);
+			jQuery('#jform_host').prop('required','required');
+			jQuery('#jform_host').attr('aria-required',true);
+			jQuery('#jform_host').addClass('required');
+			jform_vvvvwaywah_required = false;
+		}
+
+		jQuery('#jform_port').closest('.control-group').show();
+		if (jform_vvvvwaywai_required)
+		{
+			updateFieldRequired('port',0);
+			jQuery('#jform_port').prop('required','required');
+			jQuery('#jform_port').attr('aria-required',true);
+			jQuery('#jform_port').addClass('required');
+			jform_vvvvwaywai_required = false;
+		}
+
+		jQuery('#jform_path').closest('.control-group').show();
+		if (jform_vvvvwaywaj_required)
+		{
+			updateFieldRequired('path',0);
+			jQuery('#jform_path').prop('required','required');
+			jQuery('#jform_path').attr('aria-required',true);
+			jQuery('#jform_path').addClass('required');
+			jform_vvvvwaywaj_required = false;
+		}
+
+		jQuery('.note_ssh_security').closest('.control-group').show();
+		jQuery('#jform_username').closest('.control-group').show();
 		if (jform_vvvvwaywak_required)
 		{
-			updateFieldRequired('signature',0);
-			jQuery('#jform_signature').prop('required','required');
-			jQuery('#jform_signature').attr('aria-required',true);
-			jQuery('#jform_signature').addClass('required');
+			updateFieldRequired('username',0);
+			jQuery('#jform_username').prop('required','required');
+			jQuery('#jform_username').attr('aria-required',true);
+			jQuery('#jform_username').addClass('required');
 			jform_vvvvwaywak_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('.note_ftp_signature').closest('.control-group').hide();
-		jQuery('#jform_signature').closest('.control-group').hide();
+		jQuery('#jform_authentication').closest('.control-group').hide();
+		if (!jform_vvvvwaywag_required)
+		{
+			updateFieldRequired('authentication',1);
+			jQuery('#jform_authentication').removeAttr('required');
+			jQuery('#jform_authentication').removeAttr('aria-required');
+			jQuery('#jform_authentication').removeClass('required');
+			jform_vvvvwaywag_required = true;
+		}
+		jQuery('#jform_host').closest('.control-group').hide();
+		if (!jform_vvvvwaywah_required)
+		{
+			updateFieldRequired('host',1);
+			jQuery('#jform_host').removeAttr('required');
+			jQuery('#jform_host').removeAttr('aria-required');
+			jQuery('#jform_host').removeClass('required');
+			jform_vvvvwaywah_required = true;
+		}
+		jQuery('#jform_port').closest('.control-group').hide();
+		if (!jform_vvvvwaywai_required)
+		{
+			updateFieldRequired('port',1);
+			jQuery('#jform_port').removeAttr('required');
+			jQuery('#jform_port').removeAttr('aria-required');
+			jQuery('#jform_port').removeClass('required');
+			jform_vvvvwaywai_required = true;
+		}
+		jQuery('#jform_path').closest('.control-group').hide();
+		if (!jform_vvvvwaywaj_required)
+		{
+			updateFieldRequired('path',1);
+			jQuery('#jform_path').removeAttr('required');
+			jQuery('#jform_path').removeAttr('aria-required');
+			jQuery('#jform_path').removeClass('required');
+			jform_vvvvwaywaj_required = true;
+		}
+		jQuery('.note_ssh_security').closest('.control-group').hide();
+		jQuery('#jform_username').closest('.control-group').hide();
 		if (!jform_vvvvwaywak_required)
 		{
-			updateFieldRequired('signature',1);
-			jQuery('#jform_signature').removeAttr('required');
-			jQuery('#jform_signature').removeAttr('aria-required');
-			jQuery('#jform_signature').removeClass('required');
+			updateFieldRequired('username',1);
+			jQuery('#jform_username').removeAttr('required');
+			jQuery('#jform_username').removeAttr('aria-required');
+			jQuery('#jform_username').removeClass('required');
 			jform_vvvvwaywak_required = true;
 		}
 	}
@@ -228,7 +171,7 @@ function vvvvway(protocol_vvvvway)
 function protocol_vvvvway_SomeFunc(protocol_vvvvway)
 {
 	// set the function logic
-	if (protocol_vvvvway == 1)
+	if (protocol_vvvvway == 2)
 	{
 		return true;
 	}
@@ -236,7 +179,7 @@ function protocol_vvvvway_SomeFunc(protocol_vvvvway)
 }
 
 // the vvvvwaz function
-function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
+function vvvvwaz(protocol_vvvvwaz)
 {
 	if (isSet(protocol_vvvvwaz) && protocol_vvvvwaz.constructor !== Array)
 	{
@@ -250,42 +193,32 @@ function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
 	}
 	var protocol = protocol_vvvvwaz.some(protocol_vvvvwaz_SomeFunc);
 
-	if (isSet(authentication_vvvvwaz) && authentication_vvvvwaz.constructor !== Array)
-	{
-		var temp_vvvvwaz = authentication_vvvvwaz;
-		var authentication_vvvvwaz = [];
-		authentication_vvvvwaz.push(temp_vvvvwaz);
-	}
-	else if (!isSet(authentication_vvvvwaz))
-	{
-		var authentication_vvvvwaz = [];
-	}
-	var authentication = authentication_vvvvwaz.some(authentication_vvvvwaz_SomeFunc);
-
 
 	// set this function logic
-	if (protocol && authentication)
+	if (protocol)
 	{
-		jQuery('#jform_password').closest('.control-group').show();
+		jQuery('.note_ftp_signature').closest('.control-group').show();
+		jQuery('#jform_signature').closest('.control-group').show();
 		if (jform_vvvvwazwal_required)
 		{
-			updateFieldRequired('password',0);
-			jQuery('#jform_password').prop('required','required');
-			jQuery('#jform_password').attr('aria-required',true);
-			jQuery('#jform_password').addClass('required');
+			updateFieldRequired('signature',0);
+			jQuery('#jform_signature').prop('required','required');
+			jQuery('#jform_signature').attr('aria-required',true);
+			jQuery('#jform_signature').addClass('required');
 			jform_vvvvwazwal_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_password').closest('.control-group').hide();
+		jQuery('.note_ftp_signature').closest('.control-group').hide();
+		jQuery('#jform_signature').closest('.control-group').hide();
 		if (!jform_vvvvwazwal_required)
 		{
-			updateFieldRequired('password',1);
-			jQuery('#jform_password').removeAttr('required');
-			jQuery('#jform_password').removeAttr('aria-required');
-			jQuery('#jform_password').removeClass('required');
+			updateFieldRequired('signature',1);
+			jQuery('#jform_signature').removeAttr('required');
+			jQuery('#jform_signature').removeAttr('aria-required');
+			jQuery('#jform_signature').removeClass('required');
 			jform_vvvvwazwal_required = true;
 		}
 	}
@@ -295,206 +228,273 @@ function vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz)
 function protocol_vvvvwaz_SomeFunc(protocol_vvvvwaz)
 {
 	// set the function logic
-	if (protocol_vvvvwaz == 2)
+	if (protocol_vvvvwaz == 1)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwaz Some function
-function authentication_vvvvwaz_SomeFunc(authentication_vvvvwaz)
+// the vvvvwba function
+function vvvvwba(protocol_vvvvwba,authentication_vvvvwba)
+{
+	if (isSet(protocol_vvvvwba) && protocol_vvvvwba.constructor !== Array)
+	{
+		var temp_vvvvwba = protocol_vvvvwba;
+		var protocol_vvvvwba = [];
+		protocol_vvvvwba.push(temp_vvvvwba);
+	}
+	else if (!isSet(protocol_vvvvwba))
+	{
+		var protocol_vvvvwba = [];
+	}
+	var protocol = protocol_vvvvwba.some(protocol_vvvvwba_SomeFunc);
+
+	if (isSet(authentication_vvvvwba) && authentication_vvvvwba.constructor !== Array)
+	{
+		var temp_vvvvwba = authentication_vvvvwba;
+		var authentication_vvvvwba = [];
+		authentication_vvvvwba.push(temp_vvvvwba);
+	}
+	else if (!isSet(authentication_vvvvwba))
+	{
+		var authentication_vvvvwba = [];
+	}
+	var authentication = authentication_vvvvwba.some(authentication_vvvvwba_SomeFunc);
+
+
+	// set this function logic
+	if (protocol && authentication)
+	{
+		jQuery('#jform_password').closest('.control-group').show();
+		if (jform_vvvvwbawam_required)
+		{
+			updateFieldRequired('password',0);
+			jQuery('#jform_password').prop('required','required');
+			jQuery('#jform_password').attr('aria-required',true);
+			jQuery('#jform_password').addClass('required');
+			jform_vvvvwbawam_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_password').closest('.control-group').hide();
+		if (!jform_vvvvwbawam_required)
+		{
+			updateFieldRequired('password',1);
+			jQuery('#jform_password').removeAttr('required');
+			jQuery('#jform_password').removeAttr('aria-required');
+			jQuery('#jform_password').removeClass('required');
+			jform_vvvvwbawam_required = true;
+		}
+	}
+}
+
+// the vvvvwba Some function
+function protocol_vvvvwba_SomeFunc(protocol_vvvvwba)
 {
 	// set the function logic
-	if (authentication_vvvvwaz == 1 || authentication_vvvvwaz == 3 || authentication_vvvvwaz == 5)
+	if (protocol_vvvvwba == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbb function
-function vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb)
+// the vvvvwba Some function
+function authentication_vvvvwba_SomeFunc(authentication_vvvvwba)
 {
-	if (isSet(protocol_vvvvwbb) && protocol_vvvvwbb.constructor !== Array)
+	// set the function logic
+	if (authentication_vvvvwba == 1 || authentication_vvvvwba == 3 || authentication_vvvvwba == 5)
 	{
-		var temp_vvvvwbb = protocol_vvvvwbb;
-		var protocol_vvvvwbb = [];
-		protocol_vvvvwbb.push(temp_vvvvwbb);
+		return true;
 	}
-	else if (!isSet(protocol_vvvvwbb))
-	{
-		var protocol_vvvvwbb = [];
-	}
-	var protocol = protocol_vvvvwbb.some(protocol_vvvvwbb_SomeFunc);
+	return false;
+}
 
-	if (isSet(authentication_vvvvwbb) && authentication_vvvvwbb.constructor !== Array)
+// the vvvvwbc function
+function vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc)
+{
+	if (isSet(protocol_vvvvwbc) && protocol_vvvvwbc.constructor !== Array)
 	{
-		var temp_vvvvwbb = authentication_vvvvwbb;
-		var authentication_vvvvwbb = [];
-		authentication_vvvvwbb.push(temp_vvvvwbb);
+		var temp_vvvvwbc = protocol_vvvvwbc;
+		var protocol_vvvvwbc = [];
+		protocol_vvvvwbc.push(temp_vvvvwbc);
 	}
-	else if (!isSet(authentication_vvvvwbb))
+	else if (!isSet(protocol_vvvvwbc))
 	{
-		var authentication_vvvvwbb = [];
+		var protocol_vvvvwbc = [];
 	}
-	var authentication = authentication_vvvvwbb.some(authentication_vvvvwbb_SomeFunc);
+	var protocol = protocol_vvvvwbc.some(protocol_vvvvwbc_SomeFunc);
+
+	if (isSet(authentication_vvvvwbc) && authentication_vvvvwbc.constructor !== Array)
+	{
+		var temp_vvvvwbc = authentication_vvvvwbc;
+		var authentication_vvvvwbc = [];
+		authentication_vvvvwbc.push(temp_vvvvwbc);
+	}
+	else if (!isSet(authentication_vvvvwbc))
+	{
+		var authentication_vvvvwbc = [];
+	}
+	var authentication = authentication_vvvvwbc.some(authentication_vvvvwbc_SomeFunc);
 
 
 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private').closest('.control-group').show();
-		if (jform_vvvvwbbwam_required)
+		if (jform_vvvvwbcwan_required)
 		{
 			updateFieldRequired('private',0);
 			jQuery('#jform_private').prop('required','required');
 			jQuery('#jform_private').attr('aria-required',true);
 			jQuery('#jform_private').addClass('required');
-			jform_vvvvwbbwam_required = false;
+			jform_vvvvwbcwan_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_private').closest('.control-group').hide();
-		if (!jform_vvvvwbbwam_required)
+		if (!jform_vvvvwbcwan_required)
 		{
 			updateFieldRequired('private',1);
 			jQuery('#jform_private').removeAttr('required');
 			jQuery('#jform_private').removeAttr('aria-required');
 			jQuery('#jform_private').removeClass('required');
-			jform_vvvvwbbwam_required = true;
+			jform_vvvvwbcwan_required = true;
 		}
 	}
 }
 
-// the vvvvwbb Some function
-function protocol_vvvvwbb_SomeFunc(protocol_vvvvwbb)
+// the vvvvwbc Some function
+function protocol_vvvvwbc_SomeFunc(protocol_vvvvwbc)
 {
 	// set the function logic
-	if (protocol_vvvvwbb == 2)
+	if (protocol_vvvvwbc == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbb Some function
-function authentication_vvvvwbb_SomeFunc(authentication_vvvvwbb)
+// the vvvvwbc Some function
+function authentication_vvvvwbc_SomeFunc(authentication_vvvvwbc)
 {
 	// set the function logic
-	if (authentication_vvvvwbb == 2 || authentication_vvvvwbb == 3)
+	if (authentication_vvvvwbc == 2 || authentication_vvvvwbc == 3)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbd function
-function vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd)
+// the vvvvwbe function
+function vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe)
 {
-	if (isSet(protocol_vvvvwbd) && protocol_vvvvwbd.constructor !== Array)
+	if (isSet(protocol_vvvvwbe) && protocol_vvvvwbe.constructor !== Array)
 	{
-		var temp_vvvvwbd = protocol_vvvvwbd;
-		var protocol_vvvvwbd = [];
-		protocol_vvvvwbd.push(temp_vvvvwbd);
+		var temp_vvvvwbe = protocol_vvvvwbe;
+		var protocol_vvvvwbe = [];
+		protocol_vvvvwbe.push(temp_vvvvwbe);
 	}
-	else if (!isSet(protocol_vvvvwbd))
+	else if (!isSet(protocol_vvvvwbe))
 	{
-		var protocol_vvvvwbd = [];
+		var protocol_vvvvwbe = [];
 	}
-	var protocol = protocol_vvvvwbd.some(protocol_vvvvwbd_SomeFunc);
+	var protocol = protocol_vvvvwbe.some(protocol_vvvvwbe_SomeFunc);
 
-	if (isSet(authentication_vvvvwbd) && authentication_vvvvwbd.constructor !== Array)
+	if (isSet(authentication_vvvvwbe) && authentication_vvvvwbe.constructor !== Array)
 	{
-		var temp_vvvvwbd = authentication_vvvvwbd;
-		var authentication_vvvvwbd = [];
-		authentication_vvvvwbd.push(temp_vvvvwbd);
+		var temp_vvvvwbe = authentication_vvvvwbe;
+		var authentication_vvvvwbe = [];
+		authentication_vvvvwbe.push(temp_vvvvwbe);
 	}
-	else if (!isSet(authentication_vvvvwbd))
+	else if (!isSet(authentication_vvvvwbe))
 	{
-		var authentication_vvvvwbd = [];
+		var authentication_vvvvwbe = [];
 	}
-	var authentication = authentication_vvvvwbd.some(authentication_vvvvwbd_SomeFunc);
+	var authentication = authentication_vvvvwbe.some(authentication_vvvvwbe_SomeFunc);
 
 
 	// set this function logic
 	if (protocol && authentication)
 	{
 		jQuery('#jform_private_key').closest('.control-group').show();
-		if (jform_vvvvwbdwan_required)
+		if (jform_vvvvwbewao_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_vvvvwbdwan_required = false;
+			jform_vvvvwbewao_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_private_key').closest('.control-group').hide();
-		if (!jform_vvvvwbdwan_required)
+		if (!jform_vvvvwbewao_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_vvvvwbdwan_required = true;
+			jform_vvvvwbewao_required = true;
 		}
 	}
 }
 
-// the vvvvwbd Some function
-function protocol_vvvvwbd_SomeFunc(protocol_vvvvwbd)
+// the vvvvwbe Some function
+function protocol_vvvvwbe_SomeFunc(protocol_vvvvwbe)
 {
 	// set the function logic
-	if (protocol_vvvvwbd == 2)
+	if (protocol_vvvvwbe == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbd Some function
-function authentication_vvvvwbd_SomeFunc(authentication_vvvvwbd)
+// the vvvvwbe Some function
+function authentication_vvvvwbe_SomeFunc(authentication_vvvvwbe)
 {
 	// set the function logic
-	if (authentication_vvvvwbd == 4 || authentication_vvvvwbd == 5)
+	if (authentication_vvvvwbe == 4 || authentication_vvvvwbe == 5)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbf function
-function vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf)
+// the vvvvwbg function
+function vvvvwbg(protocol_vvvvwbg,authentication_vvvvwbg)
 {
-	if (isSet(protocol_vvvvwbf) && protocol_vvvvwbf.constructor !== Array)
+	if (isSet(protocol_vvvvwbg) && protocol_vvvvwbg.constructor !== Array)
 	{
-		var temp_vvvvwbf = protocol_vvvvwbf;
-		var protocol_vvvvwbf = [];
-		protocol_vvvvwbf.push(temp_vvvvwbf);
+		var temp_vvvvwbg = protocol_vvvvwbg;
+		var protocol_vvvvwbg = [];
+		protocol_vvvvwbg.push(temp_vvvvwbg);
 	}
-	else if (!isSet(protocol_vvvvwbf))
+	else if (!isSet(protocol_vvvvwbg))
 	{
-		var protocol_vvvvwbf = [];
+		var protocol_vvvvwbg = [];
 	}
-	var protocol = protocol_vvvvwbf.some(protocol_vvvvwbf_SomeFunc);
+	var protocol = protocol_vvvvwbg.some(protocol_vvvvwbg_SomeFunc);
 
-	if (isSet(authentication_vvvvwbf) && authentication_vvvvwbf.constructor !== Array)
+	if (isSet(authentication_vvvvwbg) && authentication_vvvvwbg.constructor !== Array)
 	{
-		var temp_vvvvwbf = authentication_vvvvwbf;
-		var authentication_vvvvwbf = [];
-		authentication_vvvvwbf.push(temp_vvvvwbf);
+		var temp_vvvvwbg = authentication_vvvvwbg;
+		var authentication_vvvvwbg = [];
+		authentication_vvvvwbg.push(temp_vvvvwbg);
 	}
-	else if (!isSet(authentication_vvvvwbf))
+	else if (!isSet(authentication_vvvvwbg))
 	{
-		var authentication_vvvvwbf = [];
+		var authentication_vvvvwbg = [];
 	}
-	var authentication = authentication_vvvvwbf.some(authentication_vvvvwbf_SomeFunc);
+	var authentication = authentication_vvvvwbg.some(authentication_vvvvwbg_SomeFunc);
 
 
 	// set this function logic
@@ -508,22 +508,22 @@ function vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf)
 	}
 }
 
-// the vvvvwbf Some function
-function protocol_vvvvwbf_SomeFunc(protocol_vvvvwbf)
+// the vvvvwbg Some function
+function protocol_vvvvwbg_SomeFunc(protocol_vvvvwbg)
 {
 	// set the function logic
-	if (protocol_vvvvwbf == 2)
+	if (protocol_vvvvwbg == 2)
 	{
 		return true;
 	}
 	return false;
 }
 
-// the vvvvwbf Some function
-function authentication_vvvvwbf_SomeFunc(authentication_vvvvwbf)
+// the vvvvwbg Some function
+function authentication_vvvvwbg_SomeFunc(authentication_vvvvwbg)
 {
 	// set the function logic
-	if (authentication_vvvvwbf == 2 || authentication_vvvvwbf == 3 || authentication_vvvvwbf == 4 || authentication_vvvvwbf == 5)
+	if (authentication_vvvvwbg == 2 || authentication_vvvvwbg == 3 || authentication_vvvvwbg == 4 || authentication_vvvvwbg == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/site_view.js b/admin/models/forms/site_view.js
index b149a1300..79bcc57b3 100644
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@@ -9,7 +9,6 @@
  */
 
 // Some Global Values
-jform_vvvvvypvyj_required = false;
 jform_vvvvvyqvyk_required = false;
 jform_vvvvvyrvyl_required = false;
 jform_vvvvvysvym_required = false;
@@ -19,308 +18,309 @@ jform_vvvvvyvvyp_required = false;
 jform_vvvvvywvyq_required = false;
 jform_vvvvvyxvyr_required = false;
 jform_vvvvvyyvys_required = false;
-jform_vvvvvyyvyt_required = false;
+jform_vvvvvyzvyt_required = false;
+jform_vvvvvyzvyu_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyp(add_php_view_vvvvvyp);
+	var add_php_view_vvvvvyq = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyq(add_php_view_vvvvvyq);
 
-	var add_php_jview_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyq(add_php_jview_display_vvvvvyq);
+	var add_php_jview_display_vvvvvyr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyr(add_php_jview_display_vvvvvyr);
 
-	var add_php_jview_vvvvvyr = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyr(add_php_jview_vvvvvyr);
+	var add_php_jview_vvvvvys = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvys(add_php_jview_vvvvvys);
 
-	var add_php_document_vvvvvys = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvys(add_php_document_vvvvvys);
+	var add_php_document_vvvvvyt = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyt(add_php_document_vvvvvyt);
 
-	var add_css_document_vvvvvyt = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyt(add_css_document_vvvvvyt);
+	var add_css_document_vvvvvyu = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyu(add_css_document_vvvvvyu);
 
-	var add_javascript_file_vvvvvyu = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyu(add_javascript_file_vvvvvyu);
+	var add_javascript_file_vvvvvyv = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyv(add_javascript_file_vvvvvyv);
 
-	var add_js_document_vvvvvyv = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyv(add_js_document_vvvvvyv);
+	var add_js_document_vvvvvyw = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyw(add_js_document_vvvvvyw);
 
-	var add_css_vvvvvyw = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyw(add_css_vvvvvyw);
+	var add_css_vvvvvyx = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyx(add_css_vvvvvyx);
 
-	var add_php_ajax_vvvvvyx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyx(add_php_ajax_vvvvvyx);
+	var add_php_ajax_vvvvvyy = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyy(add_php_ajax_vvvvvyy);
 
-	var add_custom_button_vvvvvyy = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyy(add_custom_button_vvvvvyy);
+	var add_custom_button_vvvvvyz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyz(add_custom_button_vvvvvyz);
 
-	var button_position_vvvvvyz = jQuery("#jform_button_position").val();
-	vvvvvyz(button_position_vvvvvyz);
+	var button_position_vvvvvza = jQuery("#jform_button_position").val();
+	vvvvvza(button_position_vvvvvza);
 });
 
-// the vvvvvyp function
-function vvvvvyp(add_php_view_vvvvvyp)
+// the vvvvvyq function
+function vvvvvyq(add_php_view_vvvvvyq)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyp == 1)
+	if (add_php_view_vvvvvyq == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvypvyj_required)
+		if (jform_vvvvvyqvyk_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvypvyj_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvypvyj_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvypvyj_required = true;
-		}
-	}
-}
-
-// the vvvvvyq function
-function vvvvvyq(add_php_jview_display_vvvvvyq)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyq == 1)
-	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
-		if (jform_vvvvvyqvyk_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyqvyk_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyqvyk_required)
 		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
+			updateFieldRequired('php_view',1);
+			jQuery('#jform_php_view').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvyqvyk_required = true;
 		}
 	}
 }
 
 // the vvvvvyr function
-function vvvvvyr(add_php_jview_vvvvvyr)
+function vvvvvyr(add_php_jview_display_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyr == 1)
+	if (add_php_jview_display_vvvvvyr == 1)
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').show();
 		if (jform_vvvvvyrvyl_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvyrvyl_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyrvyl_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvyrvyl_required = true;
 		}
 	}
 }
 
 // the vvvvvys function
-function vvvvvys(add_php_document_vvvvvys)
+function vvvvvys(add_php_jview_vvvvvys)
 {
 	// set the function logic
-	if (add_php_document_vvvvvys == 1)
+	if (add_php_jview_vvvvvys == 1)
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').show();
 		if (jform_vvvvvysvym_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvysvym_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_jview-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvysvym_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvysvym_required = true;
 		}
 	}
 }
 
 // the vvvvvyt function
-function vvvvvyt(add_css_document_vvvvvyt)
+function vvvvvyt(add_php_document_vvvvvyt)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyt == 1)
+	if (add_php_document_vvvvvyt == 1)
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').show();
+		jQuery('#jform_php_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvytvyn_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvytvyn_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvytvyn_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvytvyn_required = true;
 		}
 	}
 }
 
 // the vvvvvyu function
-function vvvvvyu(add_javascript_file_vvvvvyu)
+function vvvvvyu(add_css_document_vvvvvyu)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyu == 1)
+	if (add_css_document_vvvvvyu == 1)
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
+		jQuery('#jform_css_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvyuvyo_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvyuvyo_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
+		jQuery('#jform_css_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyuvyo_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvyuvyo_required = true;
 		}
 	}
 }
 
 // the vvvvvyv function
-function vvvvvyv(add_js_document_vvvvvyv)
+function vvvvvyv(add_javascript_file_vvvvvyv)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyv == 1)
+	if (add_javascript_file_vvvvvyv == 1)
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').show();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').show();
 		if (jform_vvvvvyvvyp_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyvvyp_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
+		jQuery('#jform_javascript_file-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvyvvyp_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyvvyp_required = true;
 		}
 	}
 }
 
 // the vvvvvyw function
-function vvvvvyw(add_css_vvvvvyw)
+function vvvvvyw(add_js_document_vvvvvyw)
 {
 	// set the function logic
-	if (add_css_vvvvvyw == 1)
+	if (add_js_document_vvvvvyw == 1)
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').show();
+		jQuery('#jform_js_document-lbl').closest('.control-group').show();
 		if (jform_vvvvvywvyq_required)
 		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
 			jform_vvvvvywvyq_required = false;
 		}
 
 	}
 	else
 	{
-		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		jQuery('#jform_js_document-lbl').closest('.control-group').hide();
 		if (!jform_vvvvvywvyq_required)
 		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
 			jform_vvvvvywvyq_required = true;
 		}
 	}
 }
 
 // the vvvvvyx function
-function vvvvvyx(add_php_ajax_vvvvvyx)
+function vvvvvyx(add_css_vvvvvyx)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyx == 1)
+	if (add_css_vvvvvyx == 1)
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').show();
+		if (jform_vvvvvyxvyr_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvyxvyr_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css-lbl').closest('.control-group').hide();
+		if (!jform_vvvvvyxvyr_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvyxvyr_required = true;
+		}
+	}
+}
+
+// the vvvvvyy function
+function vvvvvyy(add_php_ajax_vvvvvyy)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyy == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').show();
-		if (jform_vvvvvyxvyr_required)
+		if (jform_vvvvvyyvys_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyxvyr_required = false;
+			jform_vvvvvyyvys_required = false;
 		}
 
 	}
@@ -328,42 +328,42 @@ function vvvvvyx(add_php_ajax_vvvvvyx)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyxvyr_required)
+		if (!jform_vvvvvyyvys_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyxvyr_required = true;
+			jform_vvvvvyyvys_required = true;
 		}
 	}
 }
 
-// the vvvvvyy function
-function vvvvvyy(add_custom_button_vvvvvyy)
+// the vvvvvyz function
+function vvvvvyz(add_custom_button_vvvvvyz)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyy == 1)
+	if (add_custom_button_vvvvvyz == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').show();
-		if (jform_vvvvvyyvys_required)
+		if (jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyyvys_required = false;
+			jform_vvvvvyzvyt_required = false;
 		}
 
 		jQuery('#jform_php_model-lbl').closest('.control-group').show();
-		if (jform_vvvvvyyvyt_required)
+		if (jform_vvvvvyzvyu_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyyvyt_required = false;
+			jform_vvvvvyzvyu_required = false;
 		}
 
 	}
@@ -371,40 +371,40 @@ function vvvvvyy(add_custom_button_vvvvvyy)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyyvys_required)
+		if (!jform_vvvvvyzvyt_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyyvys_required = true;
+			jform_vvvvvyzvyt_required = true;
 		}
 		jQuery('#jform_php_model-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvyyvyt_required)
+		if (!jform_vvvvvyzvyu_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyyvyt_required = true;
+			jform_vvvvvyzvyu_required = true;
 		}
 	}
 }
 
-// the vvvvvyz function
-function vvvvvyz(button_position_vvvvvyz)
+// the vvvvvza function
+function vvvvvza(button_position_vvvvvza)
 {
-	if (isSet(button_position_vvvvvyz) && button_position_vvvvvyz.constructor !== Array)
+	if (isSet(button_position_vvvvvza) && button_position_vvvvvza.constructor !== Array)
 	{
-		var temp_vvvvvyz = button_position_vvvvvyz;
-		var button_position_vvvvvyz = [];
-		button_position_vvvvvyz.push(temp_vvvvvyz);
+		var temp_vvvvvza = button_position_vvvvvza;
+		var button_position_vvvvvza = [];
+		button_position_vvvvvza.push(temp_vvvvvza);
 	}
-	else if (!isSet(button_position_vvvvvyz))
+	else if (!isSet(button_position_vvvvvza))
 	{
-		var button_position_vvvvvyz = [];
+		var button_position_vvvvvza = [];
 	}
-	var button_position = button_position_vvvvvyz.some(button_position_vvvvvyz_SomeFunc);
+	var button_position = button_position_vvvvvza.some(button_position_vvvvvza_SomeFunc);
 
 
 	// set this function logic
@@ -418,11 +418,11 @@ function vvvvvyz(button_position_vvvvvyz)
 	}
 }
 
-// the vvvvvyz Some function
-function button_position_vvvvvyz_SomeFunc(button_position_vvvvvyz)
+// the vvvvvza Some function
+function button_position_vvvvvza_SomeFunc(button_position_vvvvvza)
 {
 	// set the function logic
-	if (button_position_vvvvvyz == 5)
+	if (button_position_vvvvvza == 5)
 	{
 		return true;
 	}
diff --git a/admin/models/forms/template.js b/admin/models/forms/template.js
index c65a3a57e..e008d32b4 100644
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@@ -9,42 +9,42 @@
  */
 
 // Some Global Values
-jform_vvvvvzavyu_required = false;
+jform_vvvvvzbvyv_required = false;
 
 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvza(add_php_view_vvvvvza);
+	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzb(add_php_view_vvvvvzb);
 });
 
-// the vvvvvza function
-function vvvvvza(add_php_view_vvvvvza)
+// the vvvvvzb function
+function vvvvvzb(add_php_view_vvvvvzb)
 {
 	// set the function logic
-	if (add_php_view_vvvvvza == 1)
+	if (add_php_view_vvvvvzb == 1)
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').show();
-		if (jform_vvvvvzavyu_required)
+		if (jform_vvvvvzbvyv_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvzavyu_required = false;
+			jform_vvvvvzbvyv_required = false;
 		}
 
 	}
 	else
 	{
 		jQuery('#jform_php_view-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvzavyu_required)
+		if (!jform_vvvvvzbvyv_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvzavyu_required = true;
+			jform_vvvvvzbvyv_required = true;
 		}
 	}
 }
diff --git a/admin/models/server.php b/admin/models/server.php
index 323020402..3d4fcef55 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -156,7 +156,7 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 *
 	 * @return mixed  An array of data items on success, false on failure.
 	 */
-	public function getWaolinked_components()
+	public function getWaplinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index a82eb302d..275462c8f 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -146,6 +146,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`add_php_after_delete` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_after_publish` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0,
+	`add_php_allowadd` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_allowedit` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_batchcopy` TINYINT(1) NOT NULL DEFAULT 0,
 	`add_php_batchmove` TINYINT(1) NOT NULL DEFAULT 0,
@@ -185,6 +186,7 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	`php_after_delete` MEDIUMTEXT NOT NULL,
 	`php_after_publish` MEDIUMTEXT NOT NULL,
 	`php_ajaxmethod` MEDIUMTEXT NOT NULL,
+	`php_allowadd` MEDIUMTEXT NOT NULL,
 	`php_allowedit` MEDIUMTEXT NOT NULL,
 	`php_batchcopy` MEDIUMTEXT NOT NULL,
 	`php_batchmove` MEDIUMTEXT NOT NULL,
@@ -234,25 +236,26 @@ CREATE TABLE IF NOT EXISTS `#__componentbuilder_admin_view` (
 	KEY `idx_state` (`published`),
 	KEY `idx_name_single` (`name_single`),
 	KEY `idx_name_list` (`name_list`),
-	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
-	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
 	KEY `idx_add_php_postsavehook` (`add_php_postsavehook`),
 	KEY `idx_add_php_before_save` (`add_php_before_save`),
+	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
+	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_type` (`type`),
 	KEY `idx_add_fadein` (`add_fadein`),
-	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
-	KEY `idx_add_php_document` (`add_php_document`),
-	KEY `idx_add_php_getitems` (`add_php_getitems`),
-	KEY `idx_add_custom_import` (`add_custom_import`),
-	KEY `idx_add_php_getlistquery` (`add_php_getlistquery`),
-	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
-	KEY `idx_add_php_getform` (`add_php_getform`),
-	KEY `idx_add_php_save` (`add_php_save`),
-	KEY `idx_add_php_allowedit` (`add_php_allowedit`),
 	KEY `idx_add_php_batchmove` (`add_php_batchmove`),
 	KEY `idx_add_php_after_publish` (`add_php_after_publish`),
-	KEY `idx_add_php_after_delete` (`add_php_after_delete`),
 	KEY `idx_add_sql` (`add_sql`),
+	KEY `idx_add_php_getform` (`add_php_getform`),
+	KEY `idx_add_php_save` (`add_php_save`),
+	KEY `idx_add_php_allowadd` (`add_php_allowadd`),
+	KEY `idx_add_php_batchcopy` (`add_php_batchcopy`),
+	KEY `idx_add_php_before_publish` (`add_php_before_publish`),
+	KEY `idx_add_php_before_delete` (`add_php_before_delete`),
+	KEY `idx_add_php_document` (`add_php_document`),
+	KEY `idx_add_custom_import` (`add_custom_import`),
+	KEY `idx_add_php_getitems` (`add_php_getitems`),
+	KEY `idx_add_php_getitems_after_all` (`add_php_getitems_after_all`),
 	KEY `idx_add_css_view` (`add_css_view`),
 	KEY `idx_add_css_views` (`add_css_views`),
 	KEY `idx_add_javascript_view_file` (`add_javascript_view_file`),
diff --git a/admin/sql/updates/mysql/2.8.5.sql b/admin/sql/updates/mysql/2.8.5.sql
new file mode 100644
index 000000000..08f6fa90a
--- /dev/null
+++ b/admin/sql/updates/mysql/2.8.5.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `#__componentbuilder_admin_view` ADD `add_php_allowadd` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_php_ajax`;
+
+ALTER TABLE `#__componentbuilder_admin_view` ADD `php_allowadd` MEDIUMTEXT NOT NULL AFTER `php_ajaxmethod`;
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index 7d070a386..0ffe6bf08 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -430,221 +430,221 @@ jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e)
 
 });
 
-// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxp function
+// #jform_add_php_allowadd listeners for add_php_allowadd_vvvvvxp function
+jQuery('#jform_add_php_allowadd').on('keyup',function()
+{
+	var add_php_allowadd_vvvvvxp = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
+	vvvvvxp(add_php_allowadd_vvvvvxp);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_allowadd',function (e)
+{
+	e.preventDefault();
+	var add_php_allowadd_vvvvvxp = jQuery("#jform_add_php_allowadd input[type='radio']:checked").val();
+	vvvvvxp(add_php_allowadd_vvvvvxp);
+
+});
+
+// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxq function
 jQuery('#jform_add_php_allowedit').on('keyup',function()
 {
-	var add_php_allowedit_vvvvvxp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxp(add_php_allowedit_vvvvvxp);
+	var add_php_allowedit_vvvvvxq = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxq(add_php_allowedit_vvvvvxq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 {
 	e.preventDefault();
-	var add_php_allowedit_vvvvvxp = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxp(add_php_allowedit_vvvvvxp);
+	var add_php_allowedit_vvvvvxq = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxq(add_php_allowedit_vvvvvxq);
 
 });
 
-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxq function
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxr function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxq = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxq(add_php_batchcopy_vvvvvxq);
+	var add_php_batchcopy_vvvvvxr = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxr(add_php_batchcopy_vvvvvxr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxq = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxq(add_php_batchcopy_vvvvvxq);
+	var add_php_batchcopy_vvvvvxr = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxr(add_php_batchcopy_vvvvvxr);
 
 });
 
-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxr function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxs function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxr = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxr(add_php_batchmove_vvvvvxr);
+	var add_php_batchmove_vvvvvxs = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxs(add_php_batchmove_vvvvvxs);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxr = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxr(add_php_batchmove_vvvvvxr);
+	var add_php_batchmove_vvvvvxs = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxs(add_php_batchmove_vvvvvxs);
 
 });
 
-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxs function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxt function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxs = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxs(add_php_before_publish_vvvvvxs);
+	var add_php_before_publish_vvvvvxt = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxt(add_php_before_publish_vvvvvxt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxs = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxs(add_php_before_publish_vvvvvxs);
+	var add_php_before_publish_vvvvvxt = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxt(add_php_before_publish_vvvvvxt);
 
 });
 
-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxt function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxu function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxt = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxt(add_php_after_publish_vvvvvxt);
+	var add_php_after_publish_vvvvvxu = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxu(add_php_after_publish_vvvvvxu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxt = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxt(add_php_after_publish_vvvvvxt);
+	var add_php_after_publish_vvvvvxu = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxu(add_php_after_publish_vvvvvxu);
 
 });
 
-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxu function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxv function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxu = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxu(add_php_before_delete_vvvvvxu);
+	var add_php_before_delete_vvvvvxv = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxv(add_php_before_delete_vvvvvxv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxu = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxu(add_php_before_delete_vvvvvxu);
+	var add_php_before_delete_vvvvvxv = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxv(add_php_before_delete_vvvvvxv);
 
 });
 
-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxv function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxw function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxv = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxv(add_php_after_delete_vvvvvxv);
+	var add_php_after_delete_vvvvvxw = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxw(add_php_after_delete_vvvvvxw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxv = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxv(add_php_after_delete_vvvvvxv);
+	var add_php_after_delete_vvvvvxw = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxw(add_php_after_delete_vvvvvxw);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvxw function
+// #jform_add_php_document listeners for add_php_document_vvvvvxx function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxw(add_php_document_vvvvvxw);
+	var add_php_document_vvvvvxx = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxx(add_php_document_vvvvvxx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxw = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxw(add_php_document_vvvvvxw);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvxx function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(add_sql_vvvvvxx);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvxx = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxx(add_sql_vvvvvxx);
-
-});
-
-// #jform_source listeners for source_vvvvvxy function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	var add_php_document_vvvvvxx = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxx(add_php_document_vvvvvxx);
 
 });
 
 // #jform_add_sql listeners for add_sql_vvvvvxy function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	vvvvvxy(add_sql_vvvvvxy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxy = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxy = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxy(source_vvvvvxy,add_sql_vvvvvxy);
+	vvvvvxy(add_sql_vvvvvxy);
 
 });
 
-// #jform_source listeners for source_vvvvvya function
+// #jform_source listeners for source_vvvvvxz function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
 
 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
 
 });
 
-// #jform_add_sql listeners for add_sql_vvvvvya function
+// #jform_add_sql listeners for add_sql_vvvvvxz function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvya = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvya = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvya(source_vvvvvya,add_sql_vvvvvya);
+	var source_vvvvvxz = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxz = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxz(source_vvvvvxz,add_sql_vvvvvxz);
 
 });
 
-// #jform_add_custom_import listeners for add_custom_import_vvvvvyc function
-jQuery('#jform_add_custom_import').on('keyup',function()
+// #jform_source listeners for source_vvvvvyb function
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvyc = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyc(add_custom_import_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvyc = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvyc(add_custom_import_vvvvvyc);
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvyb function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvyb = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvyb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvyb(source_vvvvvyb,add_sql_vvvvvyb);
 
 });
 
@@ -663,18 +663,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvye function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvye function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvye = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvye(add_custom_import_vvvvvye);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvye = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvye(add_custom_import_vvvvvye);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyf function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvye(add_custom_button_vvvvvye);
+	var add_custom_button_vvvvvyf = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyf(add_custom_button_vvvvvyf);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvye = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvye(add_custom_button_vvvvvye);
+	var add_custom_button_vvvvvyf = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyf(add_custom_button_vvvvvyf);
 
 });
 
diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php
index 8877fd401..1096eb64a 100644
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@@ -159,153 +159,153 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyf function
+// #jform_add_php_view listeners for add_php_view_vvvvvyg function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyf(add_php_view_vvvvvyf);
+	var add_php_view_vvvvvyg = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyg(add_php_view_vvvvvyg);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyf = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyf(add_php_view_vvvvvyf);
+	var add_php_view_vvvvvyg = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyg(add_php_view_vvvvvyg);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyg function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyh function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyg(add_php_jview_display_vvvvvyg);
+	var add_php_jview_display_vvvvvyh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyh(add_php_jview_display_vvvvvyh);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyg = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyg(add_php_jview_display_vvvvvyg);
+	var add_php_jview_display_vvvvvyh = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyh(add_php_jview_display_vvvvvyh);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyh function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyi function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyh = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyh(add_php_jview_vvvvvyh);
+	var add_php_jview_vvvvvyi = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyi(add_php_jview_vvvvvyi);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyh = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyh(add_php_jview_vvvvvyh);
+	var add_php_jview_vvvvvyi = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyi(add_php_jview_vvvvvyi);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvyi function
+// #jform_add_php_document listeners for add_php_document_vvvvvyj function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyi = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyi(add_php_document_vvvvvyi);
+	var add_php_document_vvvvvyj = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyj(add_php_document_vvvvvyj);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyi = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyi(add_php_document_vvvvvyi);
+	var add_php_document_vvvvvyj = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyj(add_php_document_vvvvvyj);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyj function
+// #jform_add_css_document listeners for add_css_document_vvvvvyk function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyj = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyj(add_css_document_vvvvvyj);
+	var add_css_document_vvvvvyk = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyk(add_css_document_vvvvvyk);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyj = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyj(add_css_document_vvvvvyj);
+	var add_css_document_vvvvvyk = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyk(add_css_document_vvvvvyk);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyk function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyl function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyk = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyk(add_javascript_file_vvvvvyk);
+	var add_javascript_file_vvvvvyl = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyl(add_javascript_file_vvvvvyl);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyk = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyk(add_javascript_file_vvvvvyk);
+	var add_javascript_file_vvvvvyl = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyl(add_javascript_file_vvvvvyl);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyl function
+// #jform_add_js_document listeners for add_js_document_vvvvvym function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyl(add_js_document_vvvvvyl);
+	var add_js_document_vvvvvym = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvym(add_js_document_vvvvvym);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyl = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyl(add_js_document_vvvvvyl);
+	var add_js_document_vvvvvym = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvym(add_js_document_vvvvvym);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvym function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyn function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvym = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvym(add_custom_button_vvvvvym);
+	var add_custom_button_vvvvvyn = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyn(add_custom_button_vvvvvyn);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvym = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvym(add_custom_button_vvvvvym);
+	var add_custom_button_vvvvvyn = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyn(add_custom_button_vvvvvyn);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyn function
+// #jform_add_css listeners for add_css_vvvvvyo function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyn(add_css_vvvvvyn);
+	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyo(add_css_vvvvvyo);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyn = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyn(add_css_vvvvvyn);
+	var add_css_vvvvvyo = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyo(add_css_vvvvvyo);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyo function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyp function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyo(add_php_ajax_vvvvvyo);
+	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyp(add_php_ajax_vvvvvyp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyo = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyo(add_php_ajax_vvvvvyo);
+	var add_php_ajax_vvvvvyp = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyp(add_php_ajax_vvvvvyp);
 
 });
 
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index d5d71d3f0..06fd2c1d1 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -113,21 +113,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_target listeners for target_vvvvwab function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwab = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwab(target_vvvvwab);
-
-});
-
 // #jform_target listeners for target_vvvvwac function
 jQuery('#jform_target').on('keyup',function()
 {
@@ -147,67 +132,82 @@ jQuery('#adminForm').on('change', '#jform_target',function (e)
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwad(target_vvvvwad,type_vvvvwad);
+	vvvvwad(target_vvvvwad);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwad(target_vvvvwad,type_vvvvwad);
-
-});
-
-// #jform_type listeners for type_vvvvwad function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwad(target_vvvvwad,type_vvvvwad);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvwad = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwad(target_vvvvwad,type_vvvvwad);
-
-});
-
-// #jform_type listeners for type_vvvvwae function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwae(type_vvvvwae,target_vvvvwae);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwae(type_vvvvwae,target_vvvvwae);
+	vvvvwad(target_vvvvwad);
 
 });
 
 // #jform_target listeners for target_vvvvwae function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwae(type_vvvvwae,target_vvvvwae);
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwae(target_vvvvwae,type_vvvvwae);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwae(type_vvvvwae,target_vvvvwae);
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwae(target_vvvvwae,type_vvvvwae);
+
+});
+
+// #jform_type listeners for type_vvvvwae function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwae(target_vvvvwae,type_vvvvwae);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvwae = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvwae = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwae(target_vvvvwae,type_vvvvwae);
+
+});
+
+// #jform_type listeners for type_vvvvwaf function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaf(type_vvvvwaf,target_vvvvwaf);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaf(type_vvvvwaf,target_vvvvwaf);
+
+});
+
+// #jform_target listeners for target_vvvvwaf function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaf(type_vvvvwaf,target_vvvvwaf);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvwaf = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwaf(type_vvvvwaf,target_vvvvwaf);
 
 });
 
diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php
index fc63ec752..f4e7dda23 100644
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@@ -153,33 +153,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_gettype listeners for gettype_vvvvvzc function
+// #jform_gettype listeners for gettype_vvvvvzd function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(gettype_vvvvvzc);
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(gettype_vvvvvzd);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(gettype_vvvvvzc);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvzd function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvzd = jQuery("#jform_main_source").val();
-	vvvvvzd(main_source_vvvvvzd);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvzd = jQuery("#jform_main_source").val();
-	vvvvvzd(main_source_vvvvvzd);
+	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
+	vvvvvzd(gettype_vvvvvzd);
 
 });
 
@@ -228,18 +213,18 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_addcalculation listeners for addcalculation_vvvvvzh function
-jQuery('#jform_addcalculation').on('keyup',function()
+// #jform_main_source listeners for main_source_vvvvvzh function
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzh(addcalculation_vvvvvzh);
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
+	vvvvvzh(main_source_vvvvvzh);
 
 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzh = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzh(addcalculation_vvvvvzh);
+	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
+	vvvvvzh(main_source_vvvvvzh);
 
 });
 
@@ -247,33 +232,14 @@ jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
+	vvvvvzi(addcalculation_vvvvvzi);
 
 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzi function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzi = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(addcalculation_vvvvvzi,gettype_vvvvvzi);
+	vvvvvzi(addcalculation_vvvvvzi);
 
 });
 
@@ -311,18 +277,37 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 
 });
 
-// #jform_main_source listeners for main_source_vvvvvzm function
-jQuery('#jform_main_source').on('keyup',function()
+// #jform_addcalculation listeners for addcalculation_vvvvvzk function
+jQuery('#jform_addcalculation').on('keyup',function()
 {
-	var main_source_vvvvvzm = jQuery("#jform_main_source").val();
-	vvvvvzm(main_source_vvvvvzm);
+	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk);
 
 });
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzm = jQuery("#jform_main_source").val();
-	vvvvvzm(main_source_vvvvvzm);
+	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzk function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzk = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(addcalculation_vvvvvzk,gettype_vvvvvzk);
 
 });
 
@@ -341,203 +326,203 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 
 });
 
-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzo function
+// #jform_main_source listeners for main_source_vvvvvzo function
+jQuery('#jform_main_source').on('keyup',function()
+{
+	var main_source_vvvvvzo = jQuery("#jform_main_source").val();
+	vvvvvzo(main_source_vvvvvzo);
+
+});
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
+{
+	e.preventDefault();
+	var main_source_vvvvvzo = jQuery("#jform_main_source").val();
+	vvvvvzo(main_source_vvvvvzo);
+
+});
+
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzp function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
+	var add_php_before_getitem_vvvvvzp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzo function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitem_vvvvvzo = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_before_getitem_vvvvvzo,gettype_vvvvvzo);
-
-});
-
-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzp function
-jQuery('#jform_add_php_after_getitem').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
+	vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzp function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
+	vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzp = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var add_php_before_getitem_vvvvvzp = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
-	vvvvvzp(add_php_after_getitem_vvvvvzp,gettype_vvvvvzp);
+	vvvvvzp(add_php_before_getitem_vvvvvzp,gettype_vvvvvzp);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzr function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzq function
+jQuery('#jform_add_php_after_getitem').on('keyup',function()
+{
+	var add_php_after_getitem_vvvvvzq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitem_vvvvvzq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzq function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(gettype_vvvvvzr);
+	var add_php_after_getitem_vvvvvzq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(gettype_vvvvvzr);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzs function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
+	var add_php_after_getitem_vvvvvzq = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitem_vvvvvzq,gettype_vvvvvzq);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzs function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(gettype_vvvvvzs);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvzs = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
-	vvvvvzs(add_php_getlistquery_vvvvvzs,gettype_vvvvvzs);
+	vvvvvzs(gettype_vvvvvzs);
 
 });
 
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzt function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzt function
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzt function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzt = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzt = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
-	vvvvvzt(add_php_before_getitems_vvvvvzt,gettype_vvvvvzt);
+	vvvvvzt(add_php_getlistquery_vvvvvzt,gettype_vvvvvzt);
 
 });
 
-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzu function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzu function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+	vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu);
 
 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+	vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu);
 
 });
 
 // #jform_gettype listeners for gettype_vvvvvzu function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+	vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzu = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_before_getitems_vvvvvzu = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzu = jQuery("#jform_gettype").val();
-	vvvvvzu(add_php_after_getitems_vvvvvzu,gettype_vvvvvzu);
+	vvvvvzu(add_php_before_getitems_vvvvvzu,gettype_vvvvvzu);
 
 });
 
-// #jform_gettype listeners for gettype_vvvvvzw function
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzv function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzv function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(gettype_vvvvvzw);
+	var add_php_after_getitems_vvvvvzv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzw = jQuery("#jform_gettype").val();
-	vvvvvzw(gettype_vvvvvzw);
+	var add_php_after_getitems_vvvvvzv = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzv = jQuery("#jform_gettype").val();
+	vvvvvzv(add_php_after_getitems_vvvvvzv,gettype_vvvvvzv);
 
 });
 
@@ -575,33 +560,48 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_gettype').on('keyup',function()
 {
 	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+	vvvvvzz(gettype_vvvvvzz);
 
 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
 	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+	vvvvvzz(gettype_vvvvvzz);
 
 });
 
-// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvvzz function
+// #jform_gettype listeners for gettype_vvvvwaa function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwaa = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwaa = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa);
+
+});
+
+// #jform_add_php_router_parse listeners for add_php_router_parse_vvvvwaa function
 jQuery('#jform_add_php_router_parse').on('keyup',function()
 {
-	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwaa = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_router_parse',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzz = jQuery("#jform_gettype").val();
-	var add_php_router_parse_vvvvvzz = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
-	vvvvvzz(gettype_vvvvvzz,add_php_router_parse_vvvvvzz);
+	var gettype_vvvvwaa = jQuery("#jform_gettype").val();
+	var add_php_router_parse_vvvvwaa = jQuery("#jform_add_php_router_parse input[type='radio']:checked").val();
+	vvvvwaa(gettype_vvvvwaa,add_php_router_parse_vvvvwaa);
 
 });
 
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index 4d900aab5..01a3c1a15 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -144,48 +144,33 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_datalenght listeners for datalenght_vvvvwan function
+// #jform_datalenght listeners for datalenght_vvvvwao function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwan = jQuery("#jform_datalenght").val();
-	vvvvwan(datalenght_vvvvwan);
+	var datalenght_vvvvwao = jQuery("#jform_datalenght").val();
+	vvvvwao(datalenght_vvvvwao);
 
 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwan = jQuery("#jform_datalenght").val();
-	vvvvwan(datalenght_vvvvwan);
+	var datalenght_vvvvwao = jQuery("#jform_datalenght").val();
+	vvvvwao(datalenght_vvvvwao);
 
 });
 
-// #jform_datadefault listeners for datadefault_vvvvwao function
+// #jform_datadefault listeners for datadefault_vvvvwap function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
-	vvvvwao(datadefault_vvvvwao);
+	var datadefault_vvvvwap = jQuery("#jform_datadefault").val();
+	vvvvwap(datadefault_vvvvwap);
 
 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwao = jQuery("#jform_datadefault").val();
-	vvvvwao(datadefault_vvvvwao);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwap function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(datatype_vvvvwap);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwap = jQuery("#jform_datatype").val();
-	vvvvwap(datatype_vvvvwap);
+	var datadefault_vvvvwap = jQuery("#jform_datadefault").val();
+	vvvvwap(datadefault_vvvvwap);
 
 });
 
@@ -204,97 +189,112 @@ jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 
 });
 
-// #jform_store listeners for store_vvvvwar function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwar = jQuery("#jform_store").val();
-	var datatype_vvvvwar = jQuery("#jform_datatype").val();
-	vvvvwar(store_vvvvwar,datatype_vvvvwar);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwar = jQuery("#jform_store").val();
-	var datatype_vvvvwar = jQuery("#jform_datatype").val();
-	vvvvwar(store_vvvvwar,datatype_vvvvwar);
-
-});
-
 // #jform_datatype listeners for datatype_vvvvwar function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwar = jQuery("#jform_store").val();
 	var datatype_vvvvwar = jQuery("#jform_datatype").val();
-	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+	vvvvwar(datatype_vvvvwar);
 
 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwar = jQuery("#jform_store").val();
 	var datatype_vvvvwar = jQuery("#jform_datatype").val();
-	vvvvwar(store_vvvvwar,datatype_vvvvwar);
+	vvvvwar(datatype_vvvvwar);
 
 });
 
-// #jform_add_css_view listeners for add_css_view_vvvvwat function
+// #jform_store listeners for store_vvvvwas function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwas = jQuery("#jform_store").val();
+	var datatype_vvvvwas = jQuery("#jform_datatype").val();
+	vvvvwas(store_vvvvwas,datatype_vvvvwas);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwas = jQuery("#jform_store").val();
+	var datatype_vvvvwas = jQuery("#jform_datatype").val();
+	vvvvwas(store_vvvvwas,datatype_vvvvwas);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwas function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwas = jQuery("#jform_store").val();
+	var datatype_vvvvwas = jQuery("#jform_datatype").val();
+	vvvvwas(store_vvvvwas,datatype_vvvvwas);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwas = jQuery("#jform_store").val();
+	var datatype_vvvvwas = jQuery("#jform_datatype").val();
+	vvvvwas(store_vvvvwas,datatype_vvvvwas);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwau function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwat = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwat(add_css_view_vvvvwat);
+	var add_css_view_vvvvwau = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwau(add_css_view_vvvvwau);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwat = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwat(add_css_view_vvvvwat);
+	var add_css_view_vvvvwau = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwau(add_css_view_vvvvwau);
 
 });
 
-// #jform_add_css_views listeners for add_css_views_vvvvwau function
+// #jform_add_css_views listeners for add_css_views_vvvvwav function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwau(add_css_views_vvvvwau);
+	var add_css_views_vvvvwav = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwav(add_css_views_vvvvwav);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwau = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwau(add_css_views_vvvvwau);
+	var add_css_views_vvvvwav = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwav(add_css_views_vvvvwav);
 
 });
 
-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwav function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwaw function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwav(add_javascript_view_footer_vvvvwav);
+	var add_javascript_view_footer_vvvvwaw = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwaw(add_javascript_view_footer_vvvvwaw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwav = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwav(add_javascript_view_footer_vvvvwav);
+	var add_javascript_view_footer_vvvvwaw = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwaw(add_javascript_view_footer_vvvvwaw);
 
 });
 
-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwaw function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwax function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwaw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwaw(add_javascript_views_footer_vvvvwaw);
+	var add_javascript_views_footer_vvvvwax = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwax(add_javascript_views_footer_vvvvwax);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwaw = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwaw(add_javascript_views_footer_vvvvwaw);
+	var add_javascript_views_footer_vvvvwax = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwax(add_javascript_views_footer_vvvvwax);
 
 });
 
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index 566d5e186..d32096c3e 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -55,7 +55,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->waefields = $this->get('Waefields');
+		$this->waffields = $this->get('Waffields');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index 564fa305d..62ac59edc 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -113,21 +113,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_location listeners for location_vvvvwbh function
-jQuery('#jform_location').on('keyup',function()
-{
-	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbh(location_vvvvwbh);
-
-});
-jQuery('#adminForm').on('change', '#jform_location',function (e)
-{
-	e.preventDefault();
-	var location_vvvvwbh = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwbh(location_vvvvwbh);
-
-});
-
 // #jform_location listeners for location_vvvvwbi function
 jQuery('#jform_location').on('keyup',function()
 {
@@ -143,18 +128,18 @@ jQuery('#adminForm').on('change', '#jform_location',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwbj function
-jQuery('#jform_type').on('keyup',function()
+// #jform_location listeners for location_vvvvwbj function
+jQuery('#jform_location').on('keyup',function()
 {
-	var type_vvvvwbj = jQuery("#jform_type").val();
-	vvvvwbj(type_vvvvwbj);
+	var location_vvvvwbj = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbj(location_vvvvwbj);
 
 });
-jQuery('#adminForm').on('change', '#jform_type',function (e)
+jQuery('#adminForm').on('change', '#jform_location',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwbj = jQuery("#jform_type").val();
-	vvvvwbj(type_vvvvwbj);
+	var location_vvvvwbj = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwbj(location_vvvvwbj);
 
 });
 
@@ -188,18 +173,33 @@ jQuery('#adminForm').on('change', '#jform_type',function (e)
 
 });
 
-// #jform_target listeners for target_vvvvwbm function
+// #jform_type listeners for type_vvvvwbm function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvwbm = jQuery("#jform_type").val();
+	vvvvwbm(type_vvvvwbm);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvwbm = jQuery("#jform_type").val();
+	vvvvwbm(type_vvvvwbm);
+
+});
+
+// #jform_target listeners for target_vvvvwbn function
 jQuery('#jform_target').on('keyup',function()
 {
-	var target_vvvvwbm = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbm(target_vvvvwbm);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(target_vvvvwbn);
 
 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var target_vvvvwbm = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwbm(target_vvvvwbm);
+	var target_vvvvwbn = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwbn(target_vvvvwbn);
 
 });
 
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index ba62adc16..35ffd456c 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -125,18 +125,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvzb function
+// #jform_add_php_view listeners for add_php_view_vvvvvzc function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzb(add_php_view_vvvvvzb);
+	var add_php_view_vvvvvzc = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzc(add_php_view_vvvvvzc);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvzb(add_php_view_vvvvvzb);
+	var add_php_view_vvvvvzc = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzc(add_php_view_vvvvvzc);
 
 });
 
diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php
index 413f92d2b..91d66906c 100644
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@@ -143,21 +143,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_how listeners for how_vvvvwaf function
-jQuery('#jform_how').on('keyup',function()
-{
-	var how_vvvvwaf = jQuery("#jform_how").val();
-	vvvvwaf(how_vvvvwaf);
-
-});
-jQuery('#adminForm').on('change', '#jform_how',function (e)
-{
-	e.preventDefault();
-	var how_vvvvwaf = jQuery("#jform_how").val();
-	vvvvwaf(how_vvvvwaf);
-
-});
-
 // #jform_how listeners for how_vvvvwag function
 jQuery('#jform_how').on('keyup',function()
 {
@@ -248,18 +233,33 @@ jQuery('#adminForm').on('change', '#jform_how',function (e)
 
 });
 
-// #jform_type listeners for type_vvvvwam function
+// #jform_how listeners for how_vvvvwam function
+jQuery('#jform_how').on('keyup',function()
+{
+	var how_vvvvwam = jQuery("#jform_how").val();
+	vvvvwam(how_vvvvwam);
+
+});
+jQuery('#adminForm').on('change', '#jform_how',function (e)
+{
+	e.preventDefault();
+	var how_vvvvwam = jQuery("#jform_how").val();
+	vvvvwam(how_vvvvwam);
+
+});
+
+// #jform_type listeners for type_vvvvwan function
 jQuery('#jform_type').on('keyup',function()
 {
-	var type_vvvvwam = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwam(type_vvvvwam);
+	var type_vvvvwan = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwan(type_vvvvwan);
 
 });
 jQuery('#adminForm').on('change', '#jform_type',function (e)
 {
 	e.preventDefault();
-	var type_vvvvwam = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwam(type_vvvvwam);
+	var type_vvvvwan = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwan(type_vvvvwan);
 
 });
 
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index f70b1fcec..869103c4c 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -122,21 +122,6 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_protocol listeners for protocol_vvvvwax function
-jQuery('#jform_protocol').on('keyup',function()
-{
-	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	vvvvwax(protocol_vvvvwax);
-
-});
-jQuery('#adminForm').on('change', '#jform_protocol',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwax = jQuery("#jform_protocol").val();
-	vvvvwax(protocol_vvvvwax);
-
-});
-
 // #jform_protocol listeners for protocol_vvvvway function
 jQuery('#jform_protocol').on('keyup',function()
 {
@@ -156,135 +141,150 @@ jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 jQuery('#jform_protocol').on('keyup',function()
 {
 	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	vvvvwaz(protocol_vvvvwaz);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
 	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
+	vvvvwaz(protocol_vvvvwaz);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwaz function
-jQuery('#jform_authentication').on('keyup',function()
-{
-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
-
-});
-jQuery('#adminForm').on('change', '#jform_authentication',function (e)
-{
-	e.preventDefault();
-	var protocol_vvvvwaz = jQuery("#jform_protocol").val();
-	var authentication_vvvvwaz = jQuery("#jform_authentication").val();
-	vvvvwaz(protocol_vvvvwaz,authentication_vvvvwaz);
-
-});
-
-// #jform_protocol listeners for protocol_vvvvwbb function
+// #jform_protocol listeners for protocol_vvvvwba function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbb function
+// #jform_authentication listeners for authentication_vvvvwba function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbb = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbb = jQuery("#jform_authentication").val();
-	vvvvwbb(protocol_vvvvwbb,authentication_vvvvwbb);
+	var protocol_vvvvwba = jQuery("#jform_protocol").val();
+	var authentication_vvvvwba = jQuery("#jform_authentication").val();
+	vvvvwba(protocol_vvvvwba,authentication_vvvvwba);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbd function
+// #jform_protocol listeners for protocol_vvvvwbc function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbd function
+// #jform_authentication listeners for authentication_vvvvwbc function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbd = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbd = jQuery("#jform_authentication").val();
-	vvvvwbd(protocol_vvvvwbd,authentication_vvvvwbd);
+	var protocol_vvvvwbc = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbc = jQuery("#jform_authentication").val();
+	vvvvwbc(protocol_vvvvwbc,authentication_vvvvwbc);
 
 });
 
-// #jform_protocol listeners for protocol_vvvvwbf function
+// #jform_protocol listeners for protocol_vvvvwbe function
 jQuery('#jform_protocol').on('keyup',function()
 {
-	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
-	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
 
 });
 jQuery('#adminForm').on('change', '#jform_protocol',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
-	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
 
 });
 
-// #jform_authentication listeners for authentication_vvvvwbf function
+// #jform_authentication listeners for authentication_vvvvwbe function
 jQuery('#jform_authentication').on('keyup',function()
 {
-	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
-	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
 
 });
 jQuery('#adminForm').on('change', '#jform_authentication',function (e)
 {
 	e.preventDefault();
-	var protocol_vvvvwbf = jQuery("#jform_protocol").val();
-	var authentication_vvvvwbf = jQuery("#jform_authentication").val();
-	vvvvwbf(protocol_vvvvwbf,authentication_vvvvwbf);
+	var protocol_vvvvwbe = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbe = jQuery("#jform_authentication").val();
+	vvvvwbe(protocol_vvvvwbe,authentication_vvvvwbe);
+
+});
+
+// #jform_protocol listeners for protocol_vvvvwbg function
+jQuery('#jform_protocol').on('keyup',function()
+{
+	var protocol_vvvvwbg = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbg = jQuery("#jform_authentication").val();
+	vvvvwbg(protocol_vvvvwbg,authentication_vvvvwbg);
+
+});
+jQuery('#adminForm').on('change', '#jform_protocol',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbg = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbg = jQuery("#jform_authentication").val();
+	vvvvwbg(protocol_vvvvwbg,authentication_vvvvwbg);
+
+});
+
+// #jform_authentication listeners for authentication_vvvvwbg function
+jQuery('#jform_authentication').on('keyup',function()
+{
+	var protocol_vvvvwbg = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbg = jQuery("#jform_authentication").val();
+	vvvvwbg(protocol_vvvvwbg,authentication_vvvvwbg);
+
+});
+jQuery('#adminForm').on('change', '#jform_authentication',function (e)
+{
+	e.preventDefault();
+	var protocol_vvvvwbg = jQuery("#jform_protocol").val();
+	var authentication_vvvvwbg = jQuery("#jform_authentication").val();
+	vvvvwbg(protocol_vvvvwbg,authentication_vvvvwbg);
 
 });
 
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index 3c5b4c149..785053103 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -55,7 +55,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 		}
 
 		// Get Linked view data
-		$this->waolinked_components = $this->get('Waolinked_components');
+		$this->waplinked_components = $this->get('Waplinked_components');
 
 		// Set the toolbar
 		$this->addToolBar();
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index da811287c..09e3d3f75 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -162,168 +162,168 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvyp function
+// #jform_add_php_view listeners for add_php_view_vvvvvyq function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyp(add_php_view_vvvvvyp);
+	var add_php_view_vvvvvyq = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyq(add_php_view_vvvvvyq);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvyp = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyp(add_php_view_vvvvvyp);
+	var add_php_view_vvvvvyq = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyq(add_php_view_vvvvvyq);
 
 });
 
-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyq function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyr function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyq(add_php_jview_display_vvvvvyq);
+	var add_php_jview_display_vvvvvyr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyr(add_php_jview_display_vvvvvyr);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyq = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyq(add_php_jview_display_vvvvvyq);
+	var add_php_jview_display_vvvvvyr = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyr(add_php_jview_display_vvvvvyr);
 
 });
 
-// #jform_add_php_jview listeners for add_php_jview_vvvvvyr function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvys function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyr = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyr(add_php_jview_vvvvvyr);
+	var add_php_jview_vvvvvys = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvys(add_php_jview_vvvvvys);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyr = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyr(add_php_jview_vvvvvyr);
+	var add_php_jview_vvvvvys = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvys(add_php_jview_vvvvvys);
 
 });
 
-// #jform_add_php_document listeners for add_php_document_vvvvvys function
+// #jform_add_php_document listeners for add_php_document_vvvvvyt function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvys = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvys(add_php_document_vvvvvys);
+	var add_php_document_vvvvvyt = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyt(add_php_document_vvvvvyt);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvys = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvys(add_php_document_vvvvvys);
+	var add_php_document_vvvvvyt = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyt(add_php_document_vvvvvyt);
 
 });
 
-// #jform_add_css_document listeners for add_css_document_vvvvvyt function
+// #jform_add_css_document listeners for add_css_document_vvvvvyu function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvyt = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyt(add_css_document_vvvvvyt);
+	var add_css_document_vvvvvyu = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyu(add_css_document_vvvvvyu);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvyt = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyt(add_css_document_vvvvvyt);
+	var add_css_document_vvvvvyu = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyu(add_css_document_vvvvvyu);
 
 });
 
-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyu function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyv function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyu = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyu(add_javascript_file_vvvvvyu);
+	var add_javascript_file_vvvvvyv = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyv(add_javascript_file_vvvvvyv);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyu = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyu(add_javascript_file_vvvvvyu);
+	var add_javascript_file_vvvvvyv = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyv(add_javascript_file_vvvvvyv);
 
 });
 
-// #jform_add_js_document listeners for add_js_document_vvvvvyv function
+// #jform_add_js_document listeners for add_js_document_vvvvvyw function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyv = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyv(add_js_document_vvvvvyv);
+	var add_js_document_vvvvvyw = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyw(add_js_document_vvvvvyw);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyv = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyv(add_js_document_vvvvvyv);
+	var add_js_document_vvvvvyw = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyw(add_js_document_vvvvvyw);
 
 });
 
-// #jform_add_css listeners for add_css_vvvvvyw function
+// #jform_add_css listeners for add_css_vvvvvyx function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyw = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyw(add_css_vvvvvyw);
+	var add_css_vvvvvyx = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyx(add_css_vvvvvyx);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyw = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyw(add_css_vvvvvyw);
+	var add_css_vvvvvyx = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyx(add_css_vvvvvyx);
 
 });
 
-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyx function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyy function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvyx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyx(add_php_ajax_vvvvvyx);
+	var add_php_ajax_vvvvvyy = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyy(add_php_ajax_vvvvvyy);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvyx = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyx(add_php_ajax_vvvvvyx);
+	var add_php_ajax_vvvvvyy = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyy(add_php_ajax_vvvvvyy);
 
 });
 
-// #jform_add_custom_button listeners for add_custom_button_vvvvvyy function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyz function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyy = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyy(add_custom_button_vvvvvyy);
+	var add_custom_button_vvvvvyz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyz(add_custom_button_vvvvvyz);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyy = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyy(add_custom_button_vvvvvyy);
+	var add_custom_button_vvvvvyz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyz(add_custom_button_vvvvvyz);
 
 });
 
-// #jform_button_position listeners for button_position_vvvvvyz function
+// #jform_button_position listeners for button_position_vvvvvza function
 jQuery('#jform_button_position').on('keyup',function()
 {
-	var button_position_vvvvvyz = jQuery("#jform_button_position").val();
-	vvvvvyz(button_position_vvvvvyz);
+	var button_position_vvvvvza = jQuery("#jform_button_position").val();
+	vvvvvza(button_position_vvvvvza);
 
 });
 jQuery('#adminForm').on('change', '#jform_button_position',function (e)
 {
 	e.preventDefault();
-	var button_position_vvvvvyz = jQuery("#jform_button_position").val();
-	vvvvvyz(button_position_vvvvvyz);
+	var button_position_vvvvvza = jQuery("#jform_button_position").val();
+	vvvvvza(button_position_vvvvvza);
 
 });
 
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index 0c3b4da79..0345f55cb 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -125,18 +125,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 
 <script type="text/javascript">
 
-// #jform_add_php_view listeners for add_php_view_vvvvvza function
+// #jform_add_php_view listeners for add_php_view_vvvvvzb function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvza(add_php_view_vvvvvza);
+	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzb(add_php_view_vvvvvzb);
 
 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvza = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvza(add_php_view_vvvvvza);
+	var add_php_view_vvvvvzb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvzb(add_php_view_vvvvvzb);
 
 });
 
diff --git a/componentbuilder.xml b/componentbuilder.xml
index deae1084b..e9359f27b 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>7th August, 2018</creationDate>
+	<creationDate>14th August, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
 	<copyright>Copyright (C) 2015 - 2018 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>2.8.5</version>
+	<version>2.8.6</version>
 	<description><![CDATA[
-		<h1>Component Builder (v.2.8.5)</h1>
+		<h1>Component Builder (v.2.8.6)</h1>
 		<div style="clear: both;"></div>
 		<p>The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time.
 
diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml
index 5a043e195..753f98a20 100644
--- a/componentbuilder_update_server.xml
+++ b/componentbuilder_update_server.xml
@@ -441,4 +441,21 @@
 		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
 		<targetplatform name="joomla" version="3.*"/>
 	</update>
+	<update>
+		<name>Component Builder</name>
+		<description>Builds Complex Joomla Components</description>
+		<element>com_componentbuilder</element>
+		<type>component</type>
+		<version>2.8.6</version>
+		<infourl title="Component Builder!">http://www.joomlacomponentbuilder.com</infourl>
+		<downloads>
+			<downloadurl type="full" format="zip">http://domain.com/demo.zip</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Llewellyn van der Merwe</maintainer>
+		<maintainerurl>http://www.joomlacomponentbuilder.com</maintainerurl>
+		<targetplatform name="joomla" version="3.*"/>
+	</update>
 </updates>
\ No newline at end of file
diff --git a/script.php b/script.php
index a222eb457..37c1968e5 100644
--- a/script.php
+++ b/script.php
@@ -3378,9 +3378,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitem","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_before_publish":"add_php_before_publish","add_php_batchcopy":"add_php_batchcopy","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","icon_add":"icon_add","php_import_headers":"php_import_headers","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_before_delete":"add_php_before_delete","not_required":"not_required","add_php_document":"add_php_document","add_php_getitems":"add_php_getitems","add_custom_import":"add_custom_import","add_php_getlistquery":"add_php_getlistquery","icon":"icon","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_getform":"add_php_getform","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","source":"source","php_model":"php_model","sql":"sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","php_import_display":"php_import_display","add_php_ajax":"add_php_ajax","php_import":"php_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","php_import_ext":"php_import_ext","add_php_getitem":"add_php_getitem"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_allowedit":"add_php_allowedit","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","add_php_getlistquery":"add_php_getlistquery","php_import_save":"php_import_save","add_php_after_delete":"add_php_after_delete","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_batchmove":"add_php_batchmove","not_required":"not_required","add_php_after_publish":"add_php_after_publish","add_sql":"add_sql","html_import_view":"html_import_view","icon_add":"icon_add","add_php_getform":"add_php_getform","add_php_save":"add_php_save","add_php_allowadd":"add_php_allowadd","add_php_batchcopy":"add_php_batchcopy","alias_builder_type":"alias_builder_type","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder":"alias_builder","add_custom_import":"add_custom_import","add_php_getitems":"add_php_getitems","php_import_headers":"php_import_headers","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowadd":"php_allowadd","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext","php_getitem":"php_getitem"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_publish","add_php_batchcopy","add_php_postsavehook","add_php_before_save","type","add_fadein","add_php_before_delete","add_php_document","add_php_getitems","add_custom_import","add_php_getlistquery","add_php_getitems_after_all","add_php_getform","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_allowedit","add_php_postsavehook","add_php_before_save","add_php_getlistquery","add_php_after_delete","type","add_fadein","add_php_batchmove","add_php_after_publish","add_sql","add_php_getform","add_php_save","add_php_allowadd","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_php_getitems","add_php_getitems_after_all","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Set the object into the content types table.
 			$admin_view_Inserted = $db->insertObject('#__content_types', $admin_view);
@@ -3829,9 +3829,9 @@ class com_componentbuilderInstallerScript
 			$admin_view->type_title = 'Componentbuilder Admin_view';
 			$admin_view->type_alias = 'com_componentbuilder.admin_view';
 			$admin_view->table = '{"special": {"dbtable": "#__componentbuilder_admin_view","key": "id","type": "Admin_view","prefix": "componentbuilderTable","config": "array()"},"common": {"dbtable": "#__ucm_content","key": "ucm_id","type": "Corecontent","prefix": "JTable","config": "array()"}}';
-			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitem","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_before_publish":"add_php_before_publish","add_php_batchcopy":"add_php_batchcopy","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","icon_add":"icon_add","php_import_headers":"php_import_headers","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_before_delete":"add_php_before_delete","not_required":"not_required","add_php_document":"add_php_document","add_php_getitems":"add_php_getitems","add_custom_import":"add_custom_import","add_php_getlistquery":"add_php_getlistquery","icon":"icon","add_php_getitems_after_all":"add_php_getitems_after_all","add_php_getform":"add_php_getform","add_php_save":"add_php_save","add_php_allowedit":"add_php_allowedit","add_php_batchmove":"add_php_batchmove","add_php_after_publish":"add_php_after_publish","add_php_after_delete":"add_php_after_delete","alias_builder_type":"alias_builder_type","add_sql":"add_sql","html_import_view":"html_import_view","alias_builder":"alias_builder","php_import_save":"php_import_save","php_getitem":"php_getitem","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowedit":"php_allowedit","javascript_view_footer":"javascript_view_footer","php_batchcopy":"php_batchcopy","add_javascript_views_file":"add_javascript_views_file","php_batchmove":"php_batchmove","javascript_views_file":"javascript_views_file","php_before_publish":"php_before_publish","add_javascript_views_footer":"add_javascript_views_footer","php_after_publish":"php_after_publish","javascript_views_footer":"javascript_views_footer","php_before_delete":"php_before_delete","add_custom_button":"add_custom_button","php_after_delete":"php_after_delete","php_document":"php_document","php_controller":"php_controller","source":"source","php_model":"php_model","sql":"sql","php_controller_list":"php_controller_list","php_model_list":"php_model_list","php_import_display":"php_import_display","add_php_ajax":"add_php_ajax","php_import":"php_import","php_ajaxmethod":"php_ajaxmethod","php_import_setdata":"php_import_setdata","php_import_ext":"php_import_ext","add_php_getitem":"add_php_getitem"}}';
+			$admin_view->field_mappings = '{"common": {"core_content_item_id": "id","core_title": "null","core_state": "published","core_alias": "null","core_created_time": "created","core_modified_time": "modified","core_body": "php_getitems","core_hits": "hits","core_publish_up": "null","core_publish_down": "null","core_access": "access","core_params": "params","core_featured": "null","core_metadata": "null","core_language": "null","core_images": "null","core_urls": "null","core_version": "version","core_ordering": "ordering","core_metakey": "null","core_metadesc": "null","core_catid": "null","core_xreference": "null","asset_id": "asset_id"},"special": {"system_name":"system_name","name_single":"name_single","name_list":"name_list","short_description":"short_description","add_php_allowedit":"add_php_allowedit","add_php_postsavehook":"add_php_postsavehook","add_php_before_save":"add_php_before_save","add_php_getlistquery":"add_php_getlistquery","php_import_save":"php_import_save","add_php_after_delete":"add_php_after_delete","type":"type","add_fadein":"add_fadein","description":"description","icon_category":"icon_category","add_php_batchmove":"add_php_batchmove","not_required":"not_required","add_php_after_publish":"add_php_after_publish","add_sql":"add_sql","html_import_view":"html_import_view","icon_add":"icon_add","add_php_getform":"add_php_getform","add_php_save":"add_php_save","add_php_allowadd":"add_php_allowadd","add_php_batchcopy":"add_php_batchcopy","alias_builder_type":"alias_builder_type","add_php_before_publish":"add_php_before_publish","add_php_before_delete":"add_php_before_delete","add_php_document":"add_php_document","alias_builder":"alias_builder","add_custom_import":"add_custom_import","add_php_getitems":"add_php_getitems","php_import_headers":"php_import_headers","add_php_getitems_after_all":"add_php_getitems_after_all","icon":"icon","php_getitems":"php_getitems","add_css_view":"add_css_view","php_getitems_after_all":"php_getitems_after_all","css_view":"css_view","php_getlistquery":"php_getlistquery","add_css_views":"add_css_views","php_getform":"php_getform","css_views":"css_views","php_before_save":"php_before_save","add_javascript_view_file":"add_javascript_view_file","php_save":"php_save","javascript_view_file":"javascript_view_file","php_postsavehook":"php_postsavehook","add_javascript_view_footer":"add_javascript_view_footer","php_allowadd":"php_allowadd","javascript_view_footer":"javascript_view_footer","php_allowedit":"php_allowedit","add_javascript_views_file":"add_javascript_views_file","php_batchcopy":"php_batchcopy","javascript_views_file":"javascript_views_file","php_batchmove":"php_batchmove","add_javascript_views_footer":"add_javascript_views_footer","php_before_publish":"php_before_publish","javascript_views_footer":"javascript_views_footer","php_after_publish":"php_after_publish","add_custom_button":"add_custom_button","php_before_delete":"php_before_delete","php_after_delete":"php_after_delete","php_controller":"php_controller","php_document":"php_document","php_model":"php_model","source":"source","php_controller_list":"php_controller_list","sql":"sql","php_model_list":"php_model_list","add_php_ajax":"add_php_ajax","php_import_display":"php_import_display","php_ajaxmethod":"php_ajaxmethod","php_import":"php_import","php_import_setdata":"php_import_setdata","add_php_getitem":"add_php_getitem","php_import_ext":"php_import_ext","php_getitem":"php_getitem"}}';
 			$admin_view->router = 'ComponentbuilderHelperRoute::getAdmin_viewRoute';
-			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_before_publish","add_php_batchcopy","add_php_postsavehook","add_php_before_save","type","add_fadein","add_php_before_delete","add_php_document","add_php_getitems","add_custom_import","add_php_getlistquery","add_php_getitems_after_all","add_php_getform","add_php_save","add_php_allowedit","add_php_batchmove","add_php_after_publish","add_php_after_delete","add_sql","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
+			$admin_view->content_history_options = '{"formFile": "administrator/components/com_componentbuilder/models/forms/admin_view.xml","hideFields": ["asset_id","checked_out","checked_out_time","version","not_required"],"ignoreChanges": ["modified_by","modified","checked_out","checked_out_time","version","hits"],"convertToInt": ["published","ordering","add_php_allowedit","add_php_postsavehook","add_php_before_save","add_php_getlistquery","add_php_after_delete","type","add_fadein","add_php_batchmove","add_php_after_publish","add_sql","add_php_getform","add_php_save","add_php_allowadd","add_php_batchcopy","add_php_before_publish","add_php_before_delete","add_php_document","add_custom_import","add_php_getitems","add_php_getitems_after_all","add_css_view","add_css_views","add_javascript_view_file","add_javascript_view_footer","add_javascript_views_file","add_javascript_views_footer","add_custom_button","source","add_php_ajax","add_php_getitem"],"displayLookup": [{"sourceColumn": "created_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "access","targetTable": "#__viewlevels","targetColumn": "id","displayColumn": "title"},{"sourceColumn": "modified_by","targetTable": "#__users","targetColumn": "id","displayColumn": "name"},{"sourceColumn": "alias_builder","targetTable": "#__componentbuilder_field","targetColumn": "id","displayColumn": "name"}]}';
 
 			// Check if admin_view type is already in content_type DB.
 			$admin_view_id = null;
@@ -4989,7 +4989,7 @@ class com_componentbuilderInstallerScript
 			echo '<a target="_blank" href="http://www.joomlacomponentbuilder.com" title="Component Builder">
 				<img src="components/com_componentbuilder/assets/images/vdm-component.jpg"/>
 				</a>
-				<h3>Upgrade to Version 2.8.5 Was Successful! Let us know if anything is not working as expected.</h3>';
+				<h3>Upgrade to Version 2.8.6 Was Successful! Let us know if anything is not working as expected.</h3>';
 		}
 	}