diff --git a/README.md b/README.md
index 84b60c0d5..fff3d7b47 100644
--- a/README.md
+++ b/README.md
@@ -125,11 +125,11 @@ 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*: 2nd August, 2018
++ *Last Build*: 7th August, 2018
 + *Version*: 2.8.5
 + *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*: **186364**
++ *Line count*: **187020**
 + *Field count*: **1059**
 + *File count*: **1239**
 + *Folder count*: **197**
diff --git a/admin/README.txt b/admin/README.txt
index 84b60c0d5..fff3d7b47 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -125,11 +125,11 @@ 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*: 2nd August, 2018
++ *Last Build*: 7th August, 2018
 + *Version*: 2.8.5
 + *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*: **186364**
++ *Line count*: **187020**
 + *Field count*: **1059**
 + *File count*: **1239**
 + *Folder count*: **197**
diff --git a/admin/compiler/joomla_3/DASHJControllerAdmin.php b/admin/compiler/joomla_3/DASHJControllerAdmin.php
index c168d2d51..1d6e6ae7c 100644
--- a/admin/compiler/joomla_3/DASHJControllerAdmin.php
+++ b/admin/compiler/joomla_3/DASHJControllerAdmin.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * ###Component### Controller
  */
diff --git a/admin/compiler/joomla_3/DASHJModelList.php b/admin/compiler/joomla_3/DASHJModelList.php
index 65f0b06c4..19a250abc 100644
--- a/admin/compiler/joomla_3/DASHJModelList.php
+++ b/admin/compiler/joomla_3/DASHJModelList.php
@@ -29,10 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-jimport('joomla.application.component.helper');
-
 /**
  * ###Component### Model
  */
diff --git a/admin/compiler/joomla_3/DASHJViewLagacy.php b/admin/compiler/joomla_3/DASHJViewLagacy.php
index 5a31fd861..f7125737b 100644
--- a/admin/compiler/joomla_3/DASHJViewLagacy.php
+++ b/admin/compiler/joomla_3/DASHJViewLagacy.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * ###Component### View class
  */
diff --git a/admin/compiler/joomla_3/Helper_email.php b/admin/compiler/joomla_3/Helper_email.php
index a75d36ad2..2dd21a0be 100644
--- a/admin/compiler/joomla_3/Helper_email.php
+++ b/admin/compiler/joomla_3/Helper_email.php
@@ -319,7 +319,7 @@ abstract class ###Component###Email
 		$body[] = "<head>";
 		$body[] = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />";
 		$body[] = "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>";
-		$body[] = "<title>".$subject."</title>";
+		$body[] = "<title>" . $subject . "</title>";
 		$body[] = "<style type=\"text/css\">";
 		$body[] = "#outlook a {padding:0;}";
 		$body[] = ".ExternalClass {width:100%;}";
diff --git a/admin/compiler/joomla_3/JControllerAdmin.php b/admin/compiler/joomla_3/JControllerAdmin.php
index 33ed5e885..2f3b98f38 100644
--- a/admin/compiler/joomla_3/JControllerAdmin.php
+++ b/admin/compiler/joomla_3/JControllerAdmin.php
@@ -29,23 +29,32 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * ###Views### Controller
  */
 class ###Component###Controller###Views### extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_###COMPONENT###_###VIEWS###';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = '###View###', $prefix = '###Component###Model', $config = array())
+	protected $text_prefix = 'COM_###COMPONENT###_###VIEWS###';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = '###View###', $prefix = '###Component###Model', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}###CONTROLLEREXIMPORTMETHOD### ###CUSTOM_ADMIN_DYNAMIC_BUTTONS_CONTROLLER### ###ADMIN_CUSTOM_BUTTONS_CONTROLLER_LIST###
 }
diff --git a/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php b/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php
index cf469f93e..ce0d1723f 100644
--- a/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php
+++ b/admin/compiler/joomla_3/JControllerAdmin_custom_admin.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * ###SViews### Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerForm.php b/admin/compiler/joomla_3/JControllerForm.php
index 6c4a5e2db..b3c3b2f4d 100644
--- a/admin/compiler/joomla_3/JControllerForm.php
+++ b/admin/compiler/joomla_3/JControllerForm.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * ###View### Controller
  */
@@ -46,6 +43,13 @@ class ###Component###Controller###View### extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = '###Views###'; // safeguard for setting the return view listing to the main view.
@@ -87,42 +91,25 @@ class ###Component###Controller###View### extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -161,17 +148,31 @@ class ###Component###Controller###View### extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -216,11 +217,15 @@ class ###Component###Controller###View### extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -228,27 +233,43 @@ class ###Component###Controller###View### extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/compiler/joomla_3/JControllerForm_custom_site.php b/admin/compiler/joomla_3/JControllerForm_custom_site.php
index 911146a4e..ffeb5e0a4 100644
--- a/admin/compiler/joomla_3/JControllerForm_custom_site.php
+++ b/admin/compiler/joomla_3/JControllerForm_custom_site.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### ###SView### Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerForm_site.php b/admin/compiler/joomla_3/JControllerForm_site.php
index 8904ee4b5..82f58992a 100644
--- a/admin/compiler/joomla_3/JControllerForm_site.php
+++ b/admin/compiler/joomla_3/JControllerForm_site.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * ###View### Controller
  */
@@ -46,6 +43,13 @@ class ###Component###Controller###View### extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = '###SITE_DEFAULT_VIEW###'; // safeguard for setting the return view listing to the default site view.
@@ -87,42 +91,25 @@ class ###Component###Controller###View### extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
-		{
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+		// set the referral options
+		if ($refid && $ref)
+                {
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -161,17 +148,31 @@ class ###Component###Controller###View### extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -182,7 +183,7 @@ class ###Component###Controller###View### extends JControllerForm
 			}
 			elseif ($this->ref)
 			{
-				$redirect = '&view='.(string)$this->ref;
+				$redirect = '&view=' . (string)$this->ref;
 
 				// Redirect to the list screen.
 				$this->setRedirect(
@@ -216,11 +217,15 @@ class ###Component###Controller###View### extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -228,27 +233,43 @@ class ###Component###Controller###View### extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/compiler/joomla_3/JControllerLegacy.php b/admin/compiler/joomla_3/JControllerLegacy.php
index d6d5bf94f..6a67cbea1 100644
--- a/admin/compiler/joomla_3/JControllerLegacy.php
+++ b/admin/compiler/joomla_3/JControllerLegacy.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * General Controller of ###Component### component
  */
diff --git a/admin/compiler/joomla_3/JControllerLegacyAjax.php b/admin/compiler/joomla_3/JControllerLegacyAjax.php
index cd3a5f289..6a4033e7e 100644
--- a/admin/compiler/joomla_3/JControllerLegacyAjax.php
+++ b/admin/compiler/joomla_3/JControllerLegacyAjax.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### Ajax Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php
index 93eafcfae..d41050060 100644
--- a/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php
+++ b/admin/compiler/joomla_3/JControllerLegacyAjaxSite.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### Ajax Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp.php b/admin/compiler/joomla_3/JControllerLegacyHelp.php
index 45a7cda8f..443b72444 100644
--- a/admin/compiler/joomla_3/JControllerLegacyHelp.php
+++ b/admin/compiler/joomla_3/JControllerLegacyHelp.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### Help Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php b/admin/compiler/joomla_3/JControllerLegacyHelp_site.php
index 67ca284ab..c4ee5b0bd 100644
--- a/admin/compiler/joomla_3/JControllerLegacyHelp_site.php
+++ b/admin/compiler/joomla_3/JControllerLegacyHelp_site.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### Help Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerLegacySITE.php b/admin/compiler/joomla_3/JControllerLegacySITE.php
index 7d9a3f208..7bd96395b 100644
--- a/admin/compiler/joomla_3/JControllerLegacySITE.php
+++ b/admin/compiler/joomla_3/JControllerLegacySITE.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### Component Controller
  */
diff --git a/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php b/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php
index 396a6c0f3..cb9d588a1 100644
--- a/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php
+++ b/admin/compiler/joomla_3/JControllerLegacy_custom_admin.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### ###SView### Controller
  */
diff --git a/admin/compiler/joomla_3/JModelAdmin.php b/admin/compiler/joomla_3/JModelAdmin.php
index 4ac9a3908..6ca58f464 100644
--- a/admin/compiler/joomla_3/JModelAdmin.php
+++ b/admin/compiler/joomla_3/JModelAdmin.php
@@ -31,9 +31,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * ###Component### ###View### Model
  */
@@ -66,6 +63,9 @@ class ###Component###Model###View### extends JModelAdmin
 	 */
 	public function getTable($type = '###view###', $prefix = '###Component###Table', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_###component###/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}###ADMIN_CUSTOM_BUTTONS_METHOD###
     
diff --git a/admin/compiler/joomla_3/JModelAdmin_site.php b/admin/compiler/joomla_3/JModelAdmin_site.php
index 4ac9a3908..6ca58f464 100644
--- a/admin/compiler/joomla_3/JModelAdmin_site.php
+++ b/admin/compiler/joomla_3/JModelAdmin_site.php
@@ -31,9 +31,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * ###Component### ###View### Model
  */
@@ -66,6 +63,9 @@ class ###Component###Model###View### extends JModelAdmin
 	 */
 	public function getTable($type = '###view###', $prefix = '###Component###Table', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_###component###/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}###ADMIN_CUSTOM_BUTTONS_METHOD###
     
diff --git a/admin/compiler/joomla_3/JModelItem_custom_admin.php b/admin/compiler/joomla_3/JModelItem_custom_admin.php
index a05d76540..2536834cd 100644
--- a/admin/compiler/joomla_3/JModelItem_custom_admin.php
+++ b/admin/compiler/joomla_3/JModelItem_custom_admin.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla modelitem library
-jimport('joomla.application.component.modelitem');
-
 /**
  * ###Component### ###SView### Model
  */
diff --git a/admin/compiler/joomla_3/JModelItem_site.php b/admin/compiler/joomla_3/JModelItem_site.php
index acb2403bd..ab37a028c 100644
--- a/admin/compiler/joomla_3/JModelItem_site.php
+++ b/admin/compiler/joomla_3/JModelItem_site.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla modelitem library
-jimport('joomla.application.component.modelitem');
-
 /**
  * ###Component### ###SView### Model
  */
diff --git a/admin/compiler/joomla_3/JModelList.php b/admin/compiler/joomla_3/JModelList.php
index f8e3a1231..5bf61c270 100644
--- a/admin/compiler/joomla_3/JModelList.php
+++ b/admin/compiler/joomla_3/JModelList.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * ###Views### Model
  */
diff --git a/admin/compiler/joomla_3/JModelListAjax.php b/admin/compiler/joomla_3/JModelListAjax.php
index 794cade2e..2e8e7bf69 100644
--- a/admin/compiler/joomla_3/JModelListAjax.php
+++ b/admin/compiler/joomla_3/JModelListAjax.php
@@ -29,8 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-jimport('joomla.application.component.helper');
-
 /**
  * ###Component### Ajax Model
  */
diff --git a/admin/compiler/joomla_3/JModelList_custom_admin.php b/admin/compiler/joomla_3/JModelList_custom_admin.php
index c25a16204..b63ce4d6c 100644
--- a/admin/compiler/joomla_3/JModelList_custom_admin.php
+++ b/admin/compiler/joomla_3/JModelList_custom_admin.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * ###Component### Model for ###SViews###
  */
diff --git a/admin/compiler/joomla_3/JModelList_site.php b/admin/compiler/joomla_3/JModelList_site.php
index d37d9d4dd..14ec6f2a8 100644
--- a/admin/compiler/joomla_3/JModelList_site.php
+++ b/admin/compiler/joomla_3/JModelList_site.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * ###Component### Model for ###SViews###
  */
diff --git a/admin/compiler/joomla_3/JTable.php b/admin/compiler/joomla_3/JTable.php
index 67b5d48c4..bdd8e4e02 100644
--- a/admin/compiler/joomla_3/JTable.php
+++ b/admin/compiler/joomla_3/JTable.php
@@ -31,9 +31,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * ###Views### Table class
  */
diff --git a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
index 1c7591ab8..3deed776b 100644
--- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
@@ -27,10 +27,7 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access'); ###LICENSE_LOCKED_DEFINED###
-
-// import Joomla view library
-jimport('joomla.application.component.view');###CUSTOM_ADMIN_GET_MODULE_JIMPORT###
+defined('_JEXEC') or die('Restricted access'); ###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_GET_MODULE_JIMPORT###
 
 /**
  * ###Component### View class for the ###SView###
diff --git a/admin/compiler/joomla_3/JViewLegacy_edit.php b/admin/compiler/joomla_3/JViewLegacy_edit.php
index 280c17f58..02eeba941 100644
--- a/admin/compiler/joomla_3/JViewLegacy_edit.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * ###View### View class
  */
@@ -54,16 +51,24 @@ class ###Component###View###View### extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}###LINKEDVIEWITEMS###
 
 		// Set the toolbar
diff --git a/admin/compiler/joomla_3/JViewLegacy_edit_site.php b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
index 7d11ec1e8..9c5420dd9 100644
--- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * ###View### View class
  */
@@ -44,26 +41,34 @@ class ###Component###View###View### extends JViewLegacy
 	public function display($tpl = null)
 	{
 		// Assign the variables
-		$this->form 		= $this->get('Form');
-		$this->item 		= $this->get('Item');
-		$this->script 		= $this->get('Script');
-		$this->state		= $this->get('State');
+		$this->form = $this->get('Form');
+		$this->item = $this->get('Item');
+		$this->script = $this->get('Script');
+		$this->state = $this->get('State');
 		// get action permissions
-		$this->canDo		= ###Component###Helper::getActions('###view###',$this->item);
+		$this->canDo = ###Component###Helper::getActions('###view###',$this->item);
 		// get input
 		$jinput = JFactory::getApplication()->input;
-		$this->ref 		= $jinput->get('ref', 0, 'word');
-		$this->refid            = $jinput->get('refid', 0, 'int');
-		$this->referral         = '';
-		if ($this->refid)
+		$this->ref = $jinput->get('ref', 0, 'word');
+		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
+		$this->referral = '';
+		if ($this->refid && $this->ref)
 		{
-				// return to the item that refered to this item
-				$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-				// return to the list view that refered to this item
-				$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}###LINKEDVIEWITEMS###
 
 		// Set the toolbar
diff --git a/admin/compiler/joomla_3/JViewLegacy_import.php b/admin/compiler/joomla_3/JViewLegacy_import.php
index 8510dc6ce..a9142f337 100644
--- a/admin/compiler/joomla_3/JViewLegacy_import.php
+++ b/admin/compiler/joomla_3/JViewLegacy_import.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * ###Component### Import View
  */
diff --git a/admin/compiler/joomla_3/JViewLegacy_import_custom.php b/admin/compiler/joomla_3/JViewLegacy_import_custom.php
index 7207087fc..38fcec10b 100644
--- a/admin/compiler/joomla_3/JViewLegacy_import_custom.php
+++ b/admin/compiler/joomla_3/JViewLegacy_import_custom.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * ###Component### ###View### View
  */
diff --git a/admin/compiler/joomla_3/JViewLegacy_list.php b/admin/compiler/joomla_3/JViewLegacy_list.php
index 0bcff84ee..9d6ee8859 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * ###Component### View class for the ###Views###
  */
diff --git a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
index 2fbfce638..5997fac85 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
@@ -27,10 +27,7 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
-
-// import Joomla view library
-jimport('joomla.application.component.view');###CUSTOM_ADMIN_GET_MODULE_JIMPORT###
+defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######CUSTOM_ADMIN_GET_MODULE_JIMPORT###
 
 /**
  * ###Component### View class for the ###SViews###
diff --git a/admin/compiler/joomla_3/JViewLegacy_list_site.php b/admin/compiler/joomla_3/JViewLegacy_list_site.php
index ffb2113f0..ddfa7636a 100644
--- a/admin/compiler/joomla_3/JViewLegacy_list_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php
@@ -27,10 +27,7 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
-
-// import Joomla view library
-jimport('joomla.application.component.view');###SITE_GET_MODULE_JIMPORT###
+defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######SITE_GET_MODULE_JIMPORT###
 
 /**
  * ###Component### View class for the ###SViews###
diff --git a/admin/compiler/joomla_3/JViewLegacy_site.php b/admin/compiler/joomla_3/JViewLegacy_site.php
index ae2e5b1b6..43bbd32f5 100644
--- a/admin/compiler/joomla_3/JViewLegacy_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_site.php
@@ -27,10 +27,7 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED###
-
-// import Joomla view library
-jimport('joomla.application.component.view');###SITE_GET_MODULE_JIMPORT###
+defined('_JEXEC') or die('Restricted access');###LICENSE_LOCKED_DEFINED######SITE_GET_MODULE_JIMPORT###
 
 /**
  * ###Component### View class for the ###SView###
diff --git a/admin/compiler/joomla_3/ajax.json.php b/admin/compiler/joomla_3/ajax.json.php
index 58358cc88..4f6fe7603 100644
--- a/admin/compiler/joomla_3/ajax.json.php
+++ b/admin/compiler/joomla_3/ajax.json.php
@@ -29,9 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * ###Component### Ajax Controller
  */
@@ -47,14 +44,14 @@ class ###Component###ControllerAjax extends JControllerLegacy
 		// load the tasks
 		$this->registerTask('fieldRequired', 'ajax');
 	}
-	
+
 	public function ajax()
 	{
-		$user 		= JFactory::getUser();
-		$jinput 	= JFactory::getApplication()->input;
+		$user = JFactory::getUser();
+		$jinput = JFactory::getApplication()->input;
 		// Check Token!
-		$token 		= JSession::getFormToken();
-		$call_token	= $jinput->get('token', 0, 'ALNUM');
+		$token = JSession::getFormToken();
+		$call_token = $jinput->get('token', 0, 'ALNUM');
 		if($user->id != 0 && $token == $call_token)
 		{
 			$task = $this->getTask();
diff --git a/admin/compiler/joomla_3/ajax.php b/admin/compiler/joomla_3/ajax.php
index a98c3cf0e..a52149e1d 100644
--- a/admin/compiler/joomla_3/ajax.php
+++ b/admin/compiler/joomla_3/ajax.php
@@ -29,29 +29,26 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-jimport('joomla.application.component.helper');
-
 /**
  * ###Component### Ajax Model
  */
 class ###Component###ModelAjax extends JModelList
 {
 	protected $app_params;
-	
-	public function __construct() 
+
+	public function __construct()
 	{		
 		parent::__construct();		
 		// get params
-		$this->app_params	= JComponentHelper::getParams('com_###component###');
-		
+		$this->app_params = JComponentHelper::getParams('com_###component###');
 	}
-	
+
 	public function setFieldRequired($name,$form,$status)
 	{
 		// get the session
-		$session	= JFactory::getSession();
+		$session = JFactory::getSession();
 		// get this forms set fields
-		$fields		= $session->get($form.'_requiredFieldFix');
+		$fields = $session->get($form.'_requiredFieldFix');
 		if(###Component###Helper::checkArray($fields))
 		{
 			if ($status == 1)
@@ -62,7 +59,8 @@ class ###Component###ModelAjax extends JModelList
 			else
 			{	
 				// remove from array
-				if(($key = array_search($name, $fields)) !== false) {
+				if(($key = array_search($name, $fields)) !== false)
+				{
 					unset($fields[$key]);
 				}
 			}
diff --git a/admin/compiler/joomla_3/batchselection.php b/admin/compiler/joomla_3/batchselection.php
index 2777f588a..37ae4586f 100644
--- a/admin/compiler/joomla_3/batchselection.php
+++ b/admin/compiler/joomla_3/batchselection.php
@@ -30,8 +30,8 @@ defined('_JEXEC') or die('Restricted access');
 defined('JPATH_BASE') or die;
 
 JHtmlBehavior::core();
-$divWrapper 	= range(1,120,2);
-$counter 		= 0;
+$divWrapper = range(1,120,2);
+$counter = 0;
 ?>
 <?php if ($displayData->ListSelection) : ?>
 <div class="row-fluid">
diff --git a/admin/compiler/joomla_3/component_admin.php b/admin/compiler/joomla_3/component_admin.php
index 9fb7c0db8..742f702e4 100644
--- a/admin/compiler/joomla_3/component_admin.php
+++ b/admin/compiler/joomla_3/component_admin.php
@@ -28,29 +28,22 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+JHtml::_('behavior.tabstate');
 
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_###component###'))
 {
-	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 };
 
-// Load cms libraries
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms');
-// Load joomla libraries without overwrite
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/joomla',false);
-
 // Add CSS file for all pages
 $document = JFactory::getDocument();
 $document->addStyleSheet('components/com_###component###/assets/css/admin.css');
 $document->addScript('components/com_###component###/assets/js/admin.js');
 
 // require helper files
-JLoader::register('###Component###Helper', dirname(__FILE__) . '/helpers/###component###.php'); ###HELPER_EMAIL###
-JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php');###LICENSE_LOCKED_INT### ###ADMIN_GLOBAL_EVENT###
-
-// import joomla controller library
-jimport('joomla.application.component.controller');
+JLoader::register('###Component###Helper', __DIR__ . '/helpers/###component###.php'); ###HELPER_EMAIL###
+JLoader::register('JHtmlBatch_', __DIR__ . '/helpers/html/batch_.php');###LICENSE_LOCKED_INT### ###ADMIN_GLOBAL_EVENT###
 
 // Get an instance of the controller prefixed by ###Component###
 $controller = JControllerLegacy::getInstance('###Component###');
diff --git a/admin/compiler/joomla_3/component_site.php b/admin/compiler/joomla_3/component_site.php
index 0a7a8d5cf..b3c9ce9eb 100644
--- a/admin/compiler/joomla_3/component_site.php
+++ b/admin/compiler/joomla_3/component_site.php
@@ -28,6 +28,7 @@ defined('_JEXEC') or die('Restricted access');
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+JHtml::_('behavior.tabstate');
 
 // Set the component css/js
 $document = JFactory::getDocument();
@@ -35,18 +36,14 @@ $document->addStyleSheet('components/com_###component###/assets/css/site.css');
 $document->addScript('components/com_###component###/assets/js/site.js');
 
 // Require helper files
-JLoader::register('###Component###Helper', dirname(__FILE__) . '/helpers/###component###.php'); ###HELPER_EMAIL###
-JLoader::register('###Component###HelperRoute', dirname(__FILE__) . '/helpers/route.php');###LICENSE_LOCKED_INT### ###SITE_GLOBAL_EVENT###
-
-// import joomla controller library
-jimport('joomla.application.component.controller');
+JLoader::register('###Component###Helper', __DIR__ . '/helpers/###component###.php'); ###HELPER_EMAIL###
+JLoader::register('###Component###HelperRoute', __DIR__ . '/helpers/route.php');###LICENSE_LOCKED_INT### ###SITE_GLOBAL_EVENT###
 
 // Get an instance of the controller prefixed by ###Component###
 $controller = JControllerLegacy::getInstance('###Component###');
 
 // Perform the request task
-$jinput = JFactory::getApplication()->input;
-$controller->execute($jinput->get('task', null, 'CMD'));
+$controller->execute(JFactory::getApplication()->input->get('task'));
 
 // Redirect if set by the controller
 $controller->redirect();
diff --git a/admin/compiler/joomla_3/edit.php b/admin/compiler/joomla_3/edit.php
index bd430b0bd..0f839a17b 100644
--- a/admin/compiler/joomla_3/edit.php
+++ b/admin/compiler/joomla_3/edit.php
@@ -37,7 +37,7 @@ JHtml::_('behavior.keepalive');
 $componentParams = JComponentHelper::getParams('com_###component###');
 ?>
 ###EDITBODYFADEIN###
-<form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
 </form>
 </div>###EDITBODYSCRIPT###
diff --git a/admin/compiler/joomla_3/edit_site.php b/admin/compiler/joomla_3/edit_site.php
index 644b49e51..e4d47b1ff 100644
--- a/admin/compiler/joomla_3/edit_site.php
+++ b/admin/compiler/joomla_3/edit_site.php
@@ -39,6 +39,6 @@ JHtml::_('behavior.calendar');
 $componentParams = JComponentHelper::getParams('com_###component###');
 ?>
 <?php echo $this->toolbar->render(); ?>
-<form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_###component###&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 ###EDITBODY###
 </form>###EDITBODYSCRIPT###
diff --git a/admin/compiler/joomla_3/layout.php b/admin/compiler/joomla_3/layout.php
index 578e42d73..81d525c27 100644
--- a/admin/compiler/joomla_3/layout.php
+++ b/admin/compiler/joomla_3/layout.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/compiler/joomla_3/layout_custom_admin.php b/admin/compiler/joomla_3/layout_custom_admin.php
index ae672604d..66ac4de25 100644
--- a/admin/compiler/joomla_3/layout_custom_admin.php
+++ b/admin/compiler/joomla_3/layout_custom_admin.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('JPATH_BASE') or die('Restricted access');###CUSTOM_ADMIN_LAYOUT_CODE###
 
 ?>###CUSTOM_ADMIN_LAYOUT_BODY###
diff --git a/admin/compiler/joomla_3/layout_site.php b/admin/compiler/joomla_3/layout_site.php
index b4ab3d540..06b98cf10 100644
--- a/admin/compiler/joomla_3/layout_site.php
+++ b/admin/compiler/joomla_3/layout_site.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('JPATH_BASE') or die('Restricted access');###SITE_LAYOUT_CODE###
 
 ?>###SITE_LAYOUT_BODY###
diff --git a/admin/compiler/joomla_3/layoutfull.php b/admin/compiler/joomla_3/layoutfull.php
index 51efe768c..791c22fe1 100644
--- a/admin/compiler/joomla_3/layoutfull.php
+++ b/admin/compiler/joomla_3/layoutfull.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/compiler/joomla_3/layoutitems.php b/admin/compiler/joomla_3/layoutitems.php
index 178fa30d9..8c794471c 100644
--- a/admin/compiler/joomla_3/layoutitems.php
+++ b/admin/compiler/joomla_3/layoutitems.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/compiler/joomla_3/layoutlinkedview.php b/admin/compiler/joomla_3/layoutlinkedview.php
index c28a33b81..172026d8e 100644
--- a/admin/compiler/joomla_3/layoutlinkedview.php
+++ b/admin/compiler/joomla_3/layoutlinkedview.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
diff --git a/admin/compiler/joomla_3/layoutmetadata.php b/admin/compiler/joomla_3/layoutmetadata.php
index 76c1c4d62..c3b019d90 100644
--- a/admin/compiler/joomla_3/layoutmetadata.php
+++ b/admin/compiler/joomla_3/layoutmetadata.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/compiler/joomla_3/layoutpublished.php b/admin/compiler/joomla_3/layoutpublished.php
index 578e42d73..81d525c27 100644
--- a/admin/compiler/joomla_3/layoutpublished.php
+++ b/admin/compiler/joomla_3/layoutpublished.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/compiler/joomla_3/layouttitle.php b/admin/compiler/joomla_3/layouttitle.php
index 7a8b15d76..4055a9acb 100644
--- a/admin/compiler/joomla_3/layouttitle.php
+++ b/admin/compiler/joomla_3/layouttitle.php
@@ -27,7 +27,6 @@ defined('_JEXEC') or die('Restricted access');
 ###BOM###
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/compiler/joomla_3/routeHelper.php b/admin/compiler/joomla_3/routeHelper.php
index 2f1cfb282..8e3beea96 100644
--- a/admin/compiler/joomla_3/routeHelper.php
+++ b/admin/compiler/joomla_3/routeHelper.php
@@ -29,10 +29,6 @@ defined('_JEXEC') or die('Restricted access');
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// Component Helper
-jimport('joomla.application.component.helper');
-jimport('joomla.application.categories');
-
 /**
  * ###Component### Route Helper
  **/
diff --git a/admin/compiler/joomla_3/script.php b/admin/compiler/joomla_3/script.php
index e1525f537..b5c521505 100644
--- a/admin/compiler/joomla_3/script.php
+++ b/admin/compiler/joomla_3/script.php
@@ -30,8 +30,6 @@ defined('_JEXEC') or die('Restricted access');
 defined('_JEXEC') or die('Restricted access');
 
 JHTML::_('behavior.modal');
-jimport('joomla.installer.installer');
-jimport('joomla.installer.helper');
 
 /**
  * Script File of ###Component### Component
diff --git a/admin/componentbuilder.php b/admin/componentbuilder.php
index df0d2f292..2de666aa0 100644
--- a/admin/componentbuilder.php
+++ b/admin/componentbuilder.php
@@ -11,34 +11,27 @@
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+JHtml::_('behavior.tabstate');
 
 // Access check.
 if (!JFactory::getUser()->authorise('core.manage', 'com_componentbuilder'))
 {
-	return JError::raiseWaring(404, JText::_('JERROR_ALERTNOAUTHOR'));
+	throw new JAccessExceptionNotallowed(JText::_('JERROR_ALERTNOAUTHOR'), 403);
 };
 
-// Load cms libraries
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/cms');
-// Load joomla libraries without overwrite
-JLoader::registerPrefix('J', JPATH_PLATFORM . '/joomla',false);
-
 // Add CSS file for all pages
 $document = JFactory::getDocument();
 $document->addStyleSheet('components/com_componentbuilder/assets/css/admin.css');
 $document->addScript('components/com_componentbuilder/assets/js/admin.js');
 
 // require helper files
-JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); 
+JLoader::register('ComponentbuilderHelper', __DIR__ . '/helpers/componentbuilder.php'); 
 JLoader::register('ComponentbuilderEmail', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/componentbuilderemail.php'); 
-JLoader::register('JHtmlBatch_', dirname(__FILE__) . '/helpers/html/batch_.php'); 
+JLoader::register('JHtmlBatch_', __DIR__ . '/helpers/html/batch_.php'); 
 
 // Triger the Global Admin Event
 ComponentbuilderHelper::globalEvent($document);
 
-// import joomla controller library
-jimport('joomla.application.component.controller');
-
 // Get an instance of the controller prefixed by Componentbuilder
 $controller = JControllerLegacy::getInstance('Componentbuilder');
 
diff --git a/admin/controller.php b/admin/controller.php
index c81cc4e70..772c525e1 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * General Controller of Componentbuilder component
  */
diff --git a/admin/controllers/admin_fields.php b/admin/controllers/admin_fields.php
index 8f36355f0..d4869b407 100644
--- a/admin/controllers/admin_fields.php
+++ b/admin/controllers/admin_fields.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Admin_fields Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Admins_fields'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerAdmin_fields extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_fields_conditions.php b/admin/controllers/admin_fields_conditions.php
index 8e8fd0bab..cc194551f 100644
--- a/admin/controllers/admin_fields_conditions.php
+++ b/admin/controllers/admin_fields_conditions.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Admin_fields_conditions Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Admins_fields_conditions'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerAdmin_fields_conditions extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_fields_relations.php b/admin/controllers/admin_fields_relations.php
index 4bac598b1..67c8444c9 100644
--- a/admin/controllers/admin_fields_relations.php
+++ b/admin/controllers/admin_fields_relations.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Admin_fields_relations Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Admins_fields_relations'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerAdmin_fields_relations extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_view.php b/admin/controllers/admin_view.php
index cef4e30dc..5d737bc47 100644
--- a/admin/controllers/admin_view.php
+++ b/admin/controllers/admin_view.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Admin_view Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Admin_views'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerAdmin_view extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/admin_views.php b/admin/controllers/admin_views.php
index c78340661..4b0f487b9 100644
--- a/admin/controllers/admin_views.php
+++ b/admin/controllers/admin_views.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Admin_views Controller
  */
 class ComponentbuilderControllerAdmin_views extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMIN_VIEWS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Admin_view', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMIN_VIEWS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Admin_view', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/admins_fields.php b/admin/controllers/admins_fields.php
index 5a894c2c5..cd7d03c68 100644
--- a/admin/controllers/admins_fields.php
+++ b/admin/controllers/admins_fields.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Admins_fields Controller
  */
 class ComponentbuilderControllerAdmins_fields extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Admin_fields', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Admin_fields', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/admins_fields_conditions.php b/admin/controllers/admins_fields_conditions.php
index 3dc17d40d..c7fd6601c 100644
--- a/admin/controllers/admins_fields_conditions.php
+++ b/admin/controllers/admins_fields_conditions.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Admins_fields_conditions Controller
  */
 class ComponentbuilderControllerAdmins_fields_conditions extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Admin_fields_conditions', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Admin_fields_conditions', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/admins_fields_relations.php b/admin/controllers/admins_fields_relations.php
index 5f55e6a6d..c00993469 100644
--- a/admin/controllers/admins_fields_relations.php
+++ b/admin/controllers/admins_fields_relations.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Admins_fields_relations Controller
  */
 class ComponentbuilderControllerAdmins_fields_relations extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Admin_fields_relations', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Admin_fields_relations', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index 9d871d3b7..0ac05027c 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Componentbuilder Ajax Controller
  */
diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php
index 42cd08381..1e2d040e2 100644
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Compiler Controller
  */
diff --git a/admin/controllers/component_admin_views.php b/admin/controllers/component_admin_views.php
index 4266e67d9..1fa960484 100644
--- a/admin/controllers/component_admin_views.php
+++ b/admin/controllers/component_admin_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_admin_views Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_admin_views'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_admin_views extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_config.php b/admin/controllers/component_config.php
index 51fe78f28..b7920b637 100644
--- a/admin/controllers/component_config.php
+++ b/admin/controllers/component_config.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_config Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_config'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_config extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_custom_admin_menus.php b/admin/controllers/component_custom_admin_menus.php
index 172e2cf68..45591980a 100644
--- a/admin/controllers/component_custom_admin_menus.php
+++ b/admin/controllers/component_custom_admin_menus.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_custom_admin_menus Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_custom_admin_menus'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_custom_admin_menus extends JController
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_custom_admin_views.php b/admin/controllers/component_custom_admin_views.php
index 9372160c5..f9a2c2875 100644
--- a/admin/controllers/component_custom_admin_views.php
+++ b/admin/controllers/component_custom_admin_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_custom_admin_views Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_custom_admin_views'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_custom_admin_views extends JController
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_dashboard.php b/admin/controllers/component_dashboard.php
index 14a88a2f7..3be38033f 100644
--- a/admin/controllers/component_dashboard.php
+++ b/admin/controllers/component_dashboard.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_dashboard Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_dashboard'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_dashboard extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_files_folders.php b/admin/controllers/component_files_folders.php
index 325831bae..a468a56c4 100644
--- a/admin/controllers/component_files_folders.php
+++ b/admin/controllers/component_files_folders.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_files_folders Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_files_folders'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_files_folders extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_mysql_tweaks.php b/admin/controllers/component_mysql_tweaks.php
index fbb09c64b..bbe29a194 100644
--- a/admin/controllers/component_mysql_tweaks.php
+++ b/admin/controllers/component_mysql_tweaks.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_mysql_tweaks Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_mysql_tweaks'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_mysql_tweaks extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_site_views.php b/admin/controllers/component_site_views.php
index 107968ace..5b6988fa1 100644
--- a/admin/controllers/component_site_views.php
+++ b/admin/controllers/component_site_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_site_views Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_site_views'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_site_views extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/component_updates.php b/admin/controllers/component_updates.php
index 32f148775..5f7bf9fcc 100644
--- a/admin/controllers/component_updates.php
+++ b/admin/controllers/component_updates.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Component_updates Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Components_updates'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerComponent_updates extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/componentbuilder.php b/admin/controllers/componentbuilder.php
index de1f183c1..21af5af12 100644
--- a/admin/controllers/componentbuilder.php
+++ b/admin/controllers/componentbuilder.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Componentbuilder Controller
  */
diff --git a/admin/controllers/components_admin_views.php b/admin/controllers/components_admin_views.php
index 472b19c0a..886bf6ecd 100644
--- a/admin/controllers/components_admin_views.php
+++ b/admin/controllers/components_admin_views.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_admin_views Controller
  */
 class ComponentbuilderControllerComponents_admin_views extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_admin_views', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_admin_views', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_config.php b/admin/controllers/components_config.php
index c9f06baee..7454d1b79 100644
--- a/admin/controllers/components_config.php
+++ b/admin/controllers/components_config.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_config Controller
  */
 class ComponentbuilderControllerComponents_config extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CONFIG';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_config', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CONFIG';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_config', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_custom_admin_menus.php b/admin/controllers/components_custom_admin_menus.php
index e8a7e0525..11c9a8e63 100644
--- a/admin/controllers/components_custom_admin_menus.php
+++ b/admin/controllers/components_custom_admin_menus.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_custom_admin_menus Controller
  */
 class ComponentbuilderControllerComponents_custom_admin_menus extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_custom_admin_menus', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_custom_admin_menus', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_custom_admin_views.php b/admin/controllers/components_custom_admin_views.php
index ddaa2a04c..00d4b52ea 100644
--- a/admin/controllers/components_custom_admin_views.php
+++ b/admin/controllers/components_custom_admin_views.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_custom_admin_views Controller
  */
 class ComponentbuilderControllerComponents_custom_admin_views extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_custom_admin_views', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_custom_admin_views', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_dashboard.php b/admin/controllers/components_dashboard.php
index 86a92da87..b81f9d4a3 100644
--- a/admin/controllers/components_dashboard.php
+++ b/admin/controllers/components_dashboard.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_dashboard Controller
  */
 class ComponentbuilderControllerComponents_dashboard extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_dashboard', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_dashboard', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_files_folders.php b/admin/controllers/components_files_folders.php
index 060bc332e..0dc49ed6c 100644
--- a/admin/controllers/components_files_folders.php
+++ b/admin/controllers/components_files_folders.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_files_folders Controller
  */
 class ComponentbuilderControllerComponents_files_folders extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_files_folders', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_files_folders', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_mysql_tweaks.php b/admin/controllers/components_mysql_tweaks.php
index 36948c748..bf85f1f31 100644
--- a/admin/controllers/components_mysql_tweaks.php
+++ b/admin/controllers/components_mysql_tweaks.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_mysql_tweaks Controller
  */
 class ComponentbuilderControllerComponents_mysql_tweaks extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_mysql_tweaks', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_mysql_tweaks', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_site_views.php b/admin/controllers/components_site_views.php
index 7b823a358..1d76d9c09 100644
--- a/admin/controllers/components_site_views.php
+++ b/admin/controllers/components_site_views.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_site_views Controller
  */
 class ComponentbuilderControllerComponents_site_views extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_site_views', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_site_views', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/components_updates.php b/admin/controllers/components_updates.php
index ff05f5b1d..e957193dc 100644
--- a/admin/controllers/components_updates.php
+++ b/admin/controllers/components_updates.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Components_updates Controller
  */
 class ComponentbuilderControllerComponents_updates extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_UPDATES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Component_updates', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_COMPONENTS_UPDATES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Component_updates', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/custom_admin_view.php b/admin/controllers/custom_admin_view.php
index b792bd388..55413a5b1 100644
--- a/admin/controllers/custom_admin_view.php
+++ b/admin/controllers/custom_admin_view.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Custom_admin_view Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Custom_admin_views'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerCustom_admin_view extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/custom_admin_views.php b/admin/controllers/custom_admin_views.php
index cd030f089..3ef968f4d 100644
--- a/admin/controllers/custom_admin_views.php
+++ b/admin/controllers/custom_admin_views.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Custom_admin_views Controller
  */
 class ComponentbuilderControllerCustom_admin_views extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Custom_admin_view', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Custom_admin_view', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/custom_code.php b/admin/controllers/custom_code.php
index 19c277779..f83c19b46 100644
--- a/admin/controllers/custom_code.php
+++ b/admin/controllers/custom_code.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Custom_code Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Custom_codes'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerCustom_code extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/custom_codes.php b/admin/controllers/custom_codes.php
index ba5ade0aa..d52e412c3 100644
--- a/admin/controllers/custom_codes.php
+++ b/admin/controllers/custom_codes.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Custom_codes Controller
  */
 class ComponentbuilderControllerCustom_codes extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_CUSTOM_CODES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Custom_code', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_CUSTOM_CODES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Custom_code', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/dynamic_get.php b/admin/controllers/dynamic_get.php
index 0397d17f7..9165141da 100644
--- a/admin/controllers/dynamic_get.php
+++ b/admin/controllers/dynamic_get.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Dynamic_get Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Dynamic_gets'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerDynamic_get extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/dynamic_gets.php b/admin/controllers/dynamic_gets.php
index 3c71c79cc..d43cb8dde 100644
--- a/admin/controllers/dynamic_gets.php
+++ b/admin/controllers/dynamic_gets.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Dynamic_gets Controller
  */
 class ComponentbuilderControllerDynamic_gets extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_DYNAMIC_GETS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Dynamic_get', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_DYNAMIC_GETS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Dynamic_get', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/field.php b/admin/controllers/field.php
index a6056d8b4..9774bb407 100644
--- a/admin/controllers/field.php
+++ b/admin/controllers/field.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Field Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerField extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Fields'; // safeguard for setting the return view listing to the main view.
@@ -126,42 +130,25 @@ class ComponentbuilderControllerField extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -200,17 +187,31 @@ class ComponentbuilderControllerField extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -255,11 +256,15 @@ class ComponentbuilderControllerField extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -267,27 +272,43 @@ class ComponentbuilderControllerField extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/fields.php b/admin/controllers/fields.php
index 777107fe4..7136b324f 100644
--- a/admin/controllers/fields.php
+++ b/admin/controllers/fields.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Fields Controller
  */
 class ComponentbuilderControllerFields extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_FIELDS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Field', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_FIELDS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Field', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/fieldtype.php b/admin/controllers/fieldtype.php
index bde8f4b3d..7a69059aa 100644
--- a/admin/controllers/fieldtype.php
+++ b/admin/controllers/fieldtype.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Fieldtype Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Fieldtypes'; // safeguard for setting the return view listing to the main view.
@@ -126,42 +130,25 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -200,17 +187,31 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -255,11 +256,15 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -267,27 +272,43 @@ class ComponentbuilderControllerFieldtype extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/fieldtypes.php b/admin/controllers/fieldtypes.php
index 325514c2b..f1a93b00c 100644
--- a/admin/controllers/fieldtypes.php
+++ b/admin/controllers/fieldtypes.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Fieldtypes Controller
  */
 class ComponentbuilderControllerFieldtypes extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_FIELDTYPES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Fieldtype', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_FIELDTYPES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Fieldtype', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/get_snippets.php b/admin/controllers/get_snippets.php
index b95577f6e..e58d6fed4 100644
--- a/admin/controllers/get_snippets.php
+++ b/admin/controllers/get_snippets.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Get_snippets Controller
  */
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index 2891a205d..858ba9046 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Componentbuilder Help Controller
  */
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index cd78cad2d..b348e5f35 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Help_document Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Help_documents'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerHelp_document extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 893e71307..ecbeec680 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Help_documents Controller
  */
 class ComponentbuilderControllerHelp_documents extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_HELP_DOCUMENTS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Help_document', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_HELP_DOCUMENTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Help_document', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/joomla_component.php b/admin/controllers/joomla_component.php
index 53edb2202..21f35b7f4 100644
--- a/admin/controllers/joomla_component.php
+++ b/admin/controllers/joomla_component.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Joomla_component Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Joomla_components'; // safeguard for setting the return view listing to the main view.
@@ -152,42 +156,25 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -226,17 +213,31 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -281,11 +282,15 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -293,27 +298,43 @@ class ComponentbuilderControllerJoomla_component extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/joomla_components.php b/admin/controllers/joomla_components.php
index c85b312af..1e945b34b 100644
--- a/admin/controllers/joomla_components.php
+++ b/admin/controllers/joomla_components.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Joomla_components Controller
  */
 class ComponentbuilderControllerJoomla_components extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_COMPONENTS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Joomla_component', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_JOOMLA_COMPONENTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Joomla_component', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/language.php b/admin/controllers/language.php
index 0796119e7..07749d167 100644
--- a/admin/controllers/language.php
+++ b/admin/controllers/language.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Language Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Languages'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerLanguage extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/language_translation.php b/admin/controllers/language_translation.php
index 5d0ba8668..a2fe2b007 100644
--- a/admin/controllers/language_translation.php
+++ b/admin/controllers/language_translation.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Language_translation Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Language_translations'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerLanguage_translation extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/language_translations.php b/admin/controllers/language_translations.php
index 24853881d..a9b344e89 100644
--- a/admin/controllers/language_translations.php
+++ b/admin/controllers/language_translations.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Language_translations Controller
  */
 class ComponentbuilderControllerLanguage_translations extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Language_translation', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Language_translation', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/languages.php b/admin/controllers/languages.php
index f03b4c839..7c5bfe060 100644
--- a/admin/controllers/languages.php
+++ b/admin/controllers/languages.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Languages Controller
  */
 class ComponentbuilderControllerLanguages extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Language', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LANGUAGES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Language', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/layout.php b/admin/controllers/layout.php
index fb33821ea..60951533e 100644
--- a/admin/controllers/layout.php
+++ b/admin/controllers/layout.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Layout Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerLayout extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Layouts'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerLayout extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerLayout extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerLayout extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerLayout extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/layouts.php b/admin/controllers/layouts.php
index 2f88f2062..26e443dfb 100644
--- a/admin/controllers/layouts.php
+++ b/admin/controllers/layouts.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Layouts Controller
  */
 class ComponentbuilderControllerLayouts extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LAYOUTS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Layout', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LAYOUTS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Layout', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/libraries.php b/admin/controllers/libraries.php
index 3f387324a..cd9500161 100644
--- a/admin/controllers/libraries.php
+++ b/admin/controllers/libraries.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Libraries Controller
  */
 class ComponentbuilderControllerLibraries extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LIBRARIES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Library', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LIBRARIES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Library', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 
 	public function getSnippets()
diff --git a/admin/controllers/libraries_config.php b/admin/controllers/libraries_config.php
index e01d9f4f1..95e2c81e8 100644
--- a/admin/controllers/libraries_config.php
+++ b/admin/controllers/libraries_config.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Libraries_config Controller
  */
 class ComponentbuilderControllerLibraries_config extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LIBRARIES_CONFIG';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Library_config', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LIBRARIES_CONFIG';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Library_config', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/libraries_files_folders_urls.php b/admin/controllers/libraries_files_folders_urls.php
index cbcec1e3e..a82a630bd 100644
--- a/admin/controllers/libraries_files_folders_urls.php
+++ b/admin/controllers/libraries_files_folders_urls.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Libraries_files_folders_urls Controller
  */
 class ComponentbuilderControllerLibraries_files_folders_urls extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Library_files_folders_urls', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Library_files_folders_urls', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/library.php b/admin/controllers/library.php
index 39e898f97..196e144a4 100644
--- a/admin/controllers/library.php
+++ b/admin/controllers/library.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Library Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Libraries'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerLibrary extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/library_config.php b/admin/controllers/library_config.php
index c77e02521..26844d4ff 100644
--- a/admin/controllers/library_config.php
+++ b/admin/controllers/library_config.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Library_config Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Libraries_config'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerLibrary_config extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/library_files_folders_urls.php b/admin/controllers/library_files_folders_urls.php
index 2734776cc..a14a01990 100644
--- a/admin/controllers/library_files_folders_urls.php
+++ b/admin/controllers/library_files_folders_urls.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Library_files_folders_urls Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Libraries_files_folders_urls'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerLibrary_files_folders_urls extends JControllerFo
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/server.php b/admin/controllers/server.php
index 0b73ab6b5..f13572a81 100644
--- a/admin/controllers/server.php
+++ b/admin/controllers/server.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Server Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerServer extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Servers'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerServer extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerServer extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerServer extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerServer extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/servers.php b/admin/controllers/servers.php
index 00df68815..97a237140 100644
--- a/admin/controllers/servers.php
+++ b/admin/controllers/servers.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Servers Controller
  */
 class ComponentbuilderControllerServers extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_SERVERS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Server', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_SERVERS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Server', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/site_view.php b/admin/controllers/site_view.php
index 5310ae3c3..206ed3149 100644
--- a/admin/controllers/site_view.php
+++ b/admin/controllers/site_view.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Site_view Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Site_views'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerSite_view extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/site_views.php b/admin/controllers/site_views.php
index bde3b0e33..0555dd61d 100644
--- a/admin/controllers/site_views.php
+++ b/admin/controllers/site_views.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Site_views Controller
  */
 class ComponentbuilderControllerSite_views extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_SITE_VIEWS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Site_view', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_SITE_VIEWS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Site_view', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/snippet.php b/admin/controllers/snippet.php
index 449d3bdb2..d512ac34a 100644
--- a/admin/controllers/snippet.php
+++ b/admin/controllers/snippet.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Snippet Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Snippets'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerSnippet extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/snippet_type.php b/admin/controllers/snippet_type.php
index 515e78e50..20e1a191b 100644
--- a/admin/controllers/snippet_type.php
+++ b/admin/controllers/snippet_type.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Snippet_type Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Snippet_types'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerSnippet_type extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/snippet_types.php b/admin/controllers/snippet_types.php
index 9c6c9fdcd..fa92961eb 100644
--- a/admin/controllers/snippet_types.php
+++ b/admin/controllers/snippet_types.php
@@ -12,23 +12,32 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Snippet_types Controller
  */
 class ComponentbuilderControllerSnippet_types extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_SNIPPET_TYPES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Snippet_type', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_SNIPPET_TYPES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Snippet_type', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}  
 }
diff --git a/admin/controllers/snippets.php b/admin/controllers/snippets.php
index 8d96ffff1..685169eb0 100644
--- a/admin/controllers/snippets.php
+++ b/admin/controllers/snippets.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Snippets Controller
  */
 class ComponentbuilderControllerSnippets extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_SNIPPETS';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Snippet', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_SNIPPETS';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Snippet', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/template.php b/admin/controllers/template.php
index 0368951b2..d06f5a160 100644
--- a/admin/controllers/template.php
+++ b/admin/controllers/template.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Template Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Templates'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerTemplate extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/templates.php b/admin/controllers/templates.php
index 80935ad8d..76562b7f7 100644
--- a/admin/controllers/templates.php
+++ b/admin/controllers/templates.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Templates Controller
  */
 class ComponentbuilderControllerTemplates extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_TEMPLATES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Template', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_TEMPLATES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Template', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/controllers/validation_rule.php b/admin/controllers/validation_rule.php
index 3ab742f8e..7c93d27f2 100644
--- a/admin/controllers/validation_rule.php
+++ b/admin/controllers/validation_rule.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controllerform');
-
 /**
  * Validation_rule Controller
  */
@@ -29,6 +26,13 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 	 */
 	protected $task;
 
+	/**
+	 * Class constructor.
+	 *
+	 * @param   array  $config  A named array of configuration variables.
+	 *
+	 * @since   1.6
+	 */
 	public function __construct($config = array())
 	{
 		$this->view_list = 'Validation_rules'; // safeguard for setting the return view listing to the main view.
@@ -127,42 +131,25 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 	 *
 	 * @return  string  The arguments to append to the redirect URL.
 	 *
-	 * @since   12.2
+	 * @since   1.6
 	 */
 	protected function getRedirectToItemAppend($recordId = null, $urlVar = 'id')
 	{
-		$tmpl   = $this->input->get('tmpl');
-		$layout = $this->input->get('layout', 'edit', 'string');
+		// get the referral options (old method use return instead see parent)
+		$ref = $this->input->get('ref', 0, 'string');
+		$refid = $this->input->get('refid', 0, 'int');
 
-		$ref 	= $this->input->get('ref', 0, 'string');
-		$refid 	= $this->input->get('refid', 0, 'int');
+		// get redirect info.
+		$append = parent::getRedirectToItemAppend($recordId, $urlVar);
 
-		// Setup redirect info.
-
-		$append = '';
-
-		if ($refid)
+		// set the referral options
+		if ($refid && $ref)
                 {
-			$append .= '&ref='.(string)$ref.'&refid='.(int)$refid;
+			$append = '&ref=' . (string)$ref . '&refid='. (int)$refid . $append;
 		}
 		elseif ($ref)
 		{
-			$append .= '&ref='.(string)$ref;
-		}
-
-		if ($tmpl)
-		{
-			$append .= '&tmpl=' . $tmpl;
-		}
-
-		if ($layout)
-		{
-			$append .= '&layout=' . $layout;
-		}
-
-		if ($recordId)
-		{
-			$append .= '&' . $urlVar . '=' . $recordId;
+			$append = '&ref='. (string)$ref . $append;
 		}
 
 		return $append;
@@ -201,17 +188,31 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 	 */
 	public function cancel($key = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
+
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
 
 		$cancel = parent::cancel($key);
 
 		if ($cancel)
 		{
-			if ($this->refid)
+			if (!is_null($return) && JUri::isInternal(base64_decode($return)))
 			{
-				$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+				$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(
@@ -256,11 +257,15 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 	 */
 	public function save($key = null, $urlVar = null)
 	{
-		// get the referal details
-		$this->ref 		= $this->input->get('ref', 0, 'word');
-		$this->refid 	= $this->input->get('refid', 0, 'int');
+		// get the referral options
+		$this->ref = $this->input->get('ref', 0, 'word');
+		$this->refid = $this->input->get('refid', 0, 'int');
 
-		if ($this->ref || $this->refid)
+		// Check if there is a return value
+		$return = $this->input->get('return', null, 'base64');
+		$canReturn = (!is_null($return) && JUri::isInternal(base64_decode($return)));
+
+		if ($this->ref || $this->refid || $canReturn)
 		{
 			// to make sure the item is checkedin on redirect
 			$this->task = 'save';
@@ -268,27 +273,43 @@ class ComponentbuilderControllerValidation_rule extends JControllerForm
 
 		$saved = parent::save($key, $urlVar);
 
-		if ($this->refid && $saved)
+		if ($saved)
 		{
-			$redirect = '&view='.(string)$this->ref.'&layout=edit&id='.(int)$this->refid;
+			// 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 to the item screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
-		}
-		elseif ($this->ref && $saved)
-		{
-			$redirect = '&view='.(string)$this->ref;
+				// 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 list screen.
-			$this->setRedirect(
-				JRoute::_(
-					'index.php?option=' . $this->option . $redirect, false
-				)
-			);
+				// 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
+					)
+				);
+			}
 		}
 		return $saved;
 	}
diff --git a/admin/controllers/validation_rules.php b/admin/controllers/validation_rules.php
index 4b6889e0a..70044224e 100644
--- a/admin/controllers/validation_rules.php
+++ b/admin/controllers/validation_rules.php
@@ -12,24 +12,33 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controlleradmin library
-jimport('joomla.application.component.controlleradmin');
-
 /**
  * Validation_rules Controller
  */
 class ComponentbuilderControllerValidation_rules extends JControllerAdmin
 {
-	protected $text_prefix = 'COM_COMPONENTBUILDER_VALIDATION_RULES';
 	/**
-	 * Proxy for getModel.
-	 * @since	2.5
+	 * The prefix to use with controller messages.
+	 *
+	 * @var    string
+	 * @since  1.6
 	 */
-	public function getModel($name = 'Validation_rule', $prefix = 'ComponentbuilderModel', $config = array())
+	protected $text_prefix = 'COM_COMPONENTBUILDER_VALIDATION_RULES';
+
+	/**
+	 * Method to get a model object, loading it if required.
+	 *
+	 * @param   string  $name    The model name. Optional.
+	 * @param   string  $prefix  The class prefix. Optional.
+	 * @param   array   $config  Configuration array for model. Optional.
+	 *
+	 * @return  JModelLegacy  The model.
+	 *
+	 * @since   1.6
+	 */
+	public function getModel($name = 'Validation_rule', $prefix = 'ComponentbuilderModel', $config = array('ignore_request' => true))
 	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		
-		return $model;
+		return parent::getModel($name, $prefix, $config);
 	}
 
 	public function exportData()
diff --git a/admin/helpers/compiler.php b/admin/helpers/compiler.php
index 9b791efce..496fba6d9 100644
--- a/admin/helpers/compiler.php
+++ b/admin/helpers/compiler.php
@@ -66,7 +66,7 @@ class Compiler extends Infusion
 				$this->repoPath = $this->params->get('git_folder_path', null);
 			}
 			// remove site folder if not needed (TODO add check if custom script was moved to site folder then we must do a more complex cleanup here)
-			if ($this->removeSiteFolder)
+			if ($this->removeSiteFolder && $this->removeSiteEditFolder)
 			{
 				// first remove the files and folders
 				$this->removeFolder($this->componentPath . '/site');
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 45e162028..a78f18bf7 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -10973,10 +10973,14 @@ class Interpretation extends Fields
 		$allow[] = $this->_t(2) . "//" . $this->setLine(__LINE__) . " Only load these values if no id is found";
 		$allow[] = $this->_t(2) . "if (0 == \$id)";
 		$allow[] = $this->_t(2) . "{";
-		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set redirected field name";
-		$allow[] = $this->_t(3) . "\$redirectedField = \$jinput->get('ref', null, 'STRING');";
-		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set redirected field value";
-		$allow[] = $this->_t(3) . "\$redirectedValue = \$jinput->get('refid', 0, 'INT');";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set redirected view name";
+		$allow[] = $this->_t(3) . "\$redirectedView = \$jinput->get('ref', null, 'STRING');";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set field name (or fall back to view name)";
+		$allow[] = $this->_t(3) . "\$redirectedField = \$jinput->get('field', \$redirectedView, 'STRING');";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set redirected view id";
+		$allow[] = $this->_t(3) . "\$redirectedId = \$jinput->get('refid', 0, 'INT');";
+		$allow[] = $this->_t(3) . "//" . $this->setLine(__LINE__) . " Set field id (or fall back to redirected view id)";
+		$allow[] = $this->_t(3) . "\$redirectedValue = \$jinput->get('field_id', \$redirectedId, 'INT');";
 		$allow[] = $this->_t(3) . "if (0 != \$redirectedValue && \$redirectedField)";
 		$allow[] = $this->_t(3) . "{";
 		$allow[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Now set the local-redirected field default value";
@@ -11559,7 +11563,7 @@ class Interpretation extends Fields
 			$toolBar .= PHP_EOL . $this->_t(2) . "\$isNew = \$this->item->id == 0;";
 			$toolBar .= PHP_EOL . PHP_EOL . $this->_t(2) . "JToolbarHelper::title( JText:" . ":_(\$isNew ? '" . $viewNameLang_new . "' : '" . $viewNameLang_edit . "'), 'pencil-2 article-add');";
 			$toolBar .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) . " Built the actions for new and existing records.";
-			$toolBar .= PHP_EOL . $this->_t(2) . "if (\$this->refid || \$this->ref)";
+			$toolBar .= PHP_EOL . $this->_t(2) . "if (" . $this->fileContentStatic[$this->hhh . 'Component' . $this->hhh]. "Helper::checkString(\$this->referral))";
 			$toolBar .= PHP_EOL . $this->_t(2) . "{";
 			if ($coreLoad && isset($core['core.create']) && isset($this->permissionBuilder['global'][$core['core.create']]) && ComponentbuilderHelper::checkArray($this->permissionBuilder['global'][$core['core.create']]) && in_array($viewName, $this->permissionBuilder['global'][$core['core.create']]))
 			{
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 920607f8a..7065e8266 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -22,6 +22,7 @@ class Infusion extends Interpretation
 	public $importCustomScripts = array();
 	public $langFiles = array();
 	public $removeSiteFolder = false;
+	public $removeSiteEditFolder = true;
 	public $langNot = array();
 	public $langSet = array();
 
@@ -245,6 +246,8 @@ class Infusion extends Interpretation
 				{
 					$site_edit_view_array[] = $this->_t(4) . "'" . $viewName_single . "'";
 					$this->lang = 'both';
+					// insure site view does not get removed
+					$this->removeSiteEditFolder = false;
 				}
 				// check if help is being loaded
 				$this->checkHelp($viewName_single);
@@ -895,6 +898,18 @@ class Infusion extends Interpretation
 					// setup the templates
 					$this->setCustomViewTemplateBody($view);
 				}
+				// setup the layouts
+				$this->setCustomViewLayouts();
+			}
+			else
+			{
+				// clear all site folder since none is needed
+				$this->removeSiteFolder = true;
+			}
+			// load the site statics
+			if (!$this->removeSiteFolder || !$this->removeSiteEditFolder)
+			{
+				$this->target = 'site';
 				// if no default site view was set, the redirect to root
 				if (!isset($this->fileContentStatic[$this->hhh . 'SITE_DEFAULT_VIEW' . $this->hhh]))
 				{
@@ -921,13 +936,6 @@ class Infusion extends Interpretation
 					$this->fileContentStatic[$this->hhh . 'SITE_GLOBAL_EVENT_HELPER' . $this->hhh] .= PHP_EOL . $this->setPlaceholders($this->customScriptBuilder['component_php_site_event'], $this->placeholders);
 					$this->fileContentStatic[$this->hhh . 'SITE_GLOBAL_EVENT_HELPER' . $this->hhh] .= PHP_EOL . $this->_t(1) . '}';
 				}
-				// setup the layouts
-				$this->setCustomViewLayouts();
-			}
-			else
-			{
-				// clear all site folder since none is needed
-				$this->removeSiteFolder = true;
 			}
 
 			// PREINSTALLSCRIPT
@@ -1076,13 +1084,13 @@ class Infusion extends Interpretation
 			$mainLangLoader['adminsys'] = count($this->languages[$this->langTag]['adminsys']);
 		}
 		// check the site lang is set
-		if (!$this->removeSiteFolder && $this->setLangSite())
+		if ((!$this->removeSiteFolder || !$this->removeSiteEditFolder) && $this->setLangSite())
 		{
 			$values[] = array_values($this->languages[$this->langTag]['site']);
 			$mainLangLoader['site'] = count($this->languages[$this->langTag]['site']);
 		}
 		// check the site system lang is set
-		if (!$this->removeSiteFolder && $this->setLangSiteSys())
+		if ((!$this->removeSiteFolder || !$this->removeSiteEditFolder) && $this->setLangSiteSys())
 		{
 			$values[] = array_values($this->languages[$this->langTag]['sitesys']);
 			$mainLangLoader['sitesys'] = count($this->languages[$this->langTag]['sitesys']);
@@ -1132,7 +1140,7 @@ class Infusion extends Interpretation
 					$t = '';
 					if (strpos($area, 'site') !== false)
 					{
-						if ($this->removeSiteFolder)
+						if ($this->removeSiteFolder  && $this->removeSiteEditFolder)
 						{
 							continue;
 						}
@@ -1181,7 +1189,7 @@ class Infusion extends Interpretation
 				{
 					$replace[$this->hhh . 'ADMIN_LANGUAGES' . $this->hhh] = implode(PHP_EOL . $this->_t(3), $langXML['admin']);
 				}
-				if (!$this->removeSiteFolder && isset($langXML['site']) && ComponentbuilderHelper::checkArray($langXML['site']))
+				if ((!$this->removeSiteFolder || !$this->removeSiteEditFolder) && isset($langXML['site']) && ComponentbuilderHelper::checkArray($langXML['site']))
 				{
 					$replace[$this->hhh . 'SITE_LANGUAGES' . $this->hhh] = implode(PHP_EOL . $this->_t(2), $langXML['site']);
 				}
diff --git a/admin/helpers/componentbuilderemail.php b/admin/helpers/componentbuilderemail.php
index 30e51e487..5d0a3d525 100644
--- a/admin/helpers/componentbuilderemail.php
+++ b/admin/helpers/componentbuilderemail.php
@@ -302,7 +302,7 @@ abstract class ComponentbuilderEmail
 		$body[] = "<head>";
 		$body[] = "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />";
 		$body[] = "<meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"/>";
-		$body[] = "<title>".$subject."</title>";
+		$body[] = "<title>" . $subject . "</title>";
 		$body[] = "<style type=\"text/css\">";
 		$body[] = "#outlook a {padding:0;}";
 		$body[] = ".ExternalClass {width:100%;}";
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index f46613c0a..5c956fa3c 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -783,7 +783,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION="Add PHP to the documen
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_LABEL="PHP document method"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM="Php Getform"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_DESCRIPTION="Add PHP Here that should run in the getForm Method. Do not add the php tags."
-COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_LABEL="PHP getForm Method<br /><small>Target (array) $data values & (bool) $loadData & (object) $form. </small>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETFORM_LABEL="PHP getForm Method<br /><small>Target (array) $data values & (bool) $loadData & (object) $form & (int) $id (item id if found). </small>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM="Php Getitem"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS="Php Getitems"
 COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL="Php Getitems After All"
diff --git a/admin/layouts/admin_fields/fields_above.php b/admin/layouts/admin_fields/fields_above.php
index bef00dee1..fbbf44543 100644
--- a/admin/layouts/admin_fields/fields_above.php
+++ b/admin/layouts/admin_fields/fields_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_fields/fields_fullwidth.php b/admin/layouts/admin_fields/fields_fullwidth.php
index ddb017580..64d278138 100644
--- a/admin/layouts/admin_fields/fields_fullwidth.php
+++ b/admin/layouts/admin_fields/fields_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_fields/publishing.php b/admin/layouts/admin_fields/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/admin_fields/publishing.php
+++ b/admin/layouts/admin_fields/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_fields/publlshing.php b/admin/layouts/admin_fields/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/admin_fields/publlshing.php
+++ b/admin/layouts/admin_fields/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_fields_conditions/conditions_above.php b/admin/layouts/admin_fields_conditions/conditions_above.php
index bef00dee1..fbbf44543 100644
--- a/admin/layouts/admin_fields_conditions/conditions_above.php
+++ b/admin/layouts/admin_fields_conditions/conditions_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php
index c277fc20a..03724354a 100644
--- a/admin/layouts/admin_fields_conditions/conditions_fullwidth.php
+++ b/admin/layouts/admin_fields_conditions/conditions_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_fields_conditions/publishing.php b/admin/layouts/admin_fields_conditions/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/admin_fields_conditions/publishing.php
+++ b/admin/layouts/admin_fields_conditions/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_fields_conditions/publlshing.php b/admin/layouts/admin_fields_conditions/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/admin_fields_conditions/publlshing.php
+++ b/admin/layouts/admin_fields_conditions/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_fields_relations/publishing.php b/admin/layouts/admin_fields_relations/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/admin_fields_relations/publishing.php
+++ b/admin/layouts/admin_fields_relations/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_fields_relations/publlshing.php b/admin/layouts/admin_fields_relations/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/admin_fields_relations/publlshing.php
+++ b/admin/layouts/admin_fields_relations/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_fields_relations/relations_above.php b/admin/layouts/admin_fields_relations/relations_above.php
index bef00dee1..fbbf44543 100644
--- a/admin/layouts/admin_fields_relations/relations_above.php
+++ b/admin/layouts/admin_fields_relations/relations_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_fields_relations/relations_fullwidth.php b/admin/layouts/admin_fields_relations/relations_fullwidth.php
index 2a6eff36f..9f094fcf9 100644
--- a/admin/layouts/admin_fields_relations/relations_fullwidth.php
+++ b/admin/layouts/admin_fields_relations/relations_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/css_fullwidth.php b/admin/layouts/admin_view/css_fullwidth.php
index 251b2806d..aef643a25 100644
--- a/admin/layouts/admin_view/css_fullwidth.php
+++ b/admin/layouts/admin_view/css_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/custom_buttons_fullwidth.php b/admin/layouts/admin_view/custom_buttons_fullwidth.php
index beb7cad8a..48d680c7c 100644
--- a/admin/layouts/admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/admin_view/custom_buttons_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/custom_buttons_left.php b/admin/layouts/admin_view/custom_buttons_left.php
index 5a11248f1..9a5328805 100644
--- a/admin/layouts/admin_view/custom_buttons_left.php
+++ b/admin/layouts/admin_view/custom_buttons_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/custom_import_fullwidth.php b/admin/layouts/admin_view/custom_import_fullwidth.php
index e08bc7596..d8b9b6901 100644
--- a/admin/layouts/admin_view/custom_import_fullwidth.php
+++ b/admin/layouts/admin_view/custom_import_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/details_above.php b/admin/layouts/admin_view/details_above.php
index 58fed60be..674a8e6b1 100644
--- a/admin/layouts/admin_view/details_above.php
+++ b/admin/layouts/admin_view/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/details_fullwidth.php b/admin/layouts/admin_view/details_fullwidth.php
index 24975f5a2..ee8b7fe33 100644
--- a/admin/layouts/admin_view/details_fullwidth.php
+++ b/admin/layouts/admin_view/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/details_left.php b/admin/layouts/admin_view/details_left.php
index 0c1ad4821..2abf54dec 100644
--- a/admin/layouts/admin_view/details_left.php
+++ b/admin/layouts/admin_view/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/details_right.php b/admin/layouts/admin_view/details_right.php
index 5742757fb..39b65203e 100644
--- a/admin/layouts/admin_view/details_right.php
+++ b/admin/layouts/admin_view/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/details_under.php b/admin/layouts/admin_view/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/admin_view/details_under.php
+++ b/admin/layouts/admin_view/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/fields_fullwidth.php b/admin/layouts/admin_view/fields_fullwidth.php
index 8aa909c91..8893a80cc 100644
--- a/admin/layouts/admin_view/fields_fullwidth.php
+++ b/admin/layouts/admin_view/fields_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/fields_left.php b/admin/layouts/admin_view/fields_left.php
index 470c9a1d5..757364bc1 100644
--- a/admin/layouts/admin_view/fields_left.php
+++ b/admin/layouts/admin_view/fields_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/fields_right.php b/admin/layouts/admin_view/fields_right.php
index 951d30e86..401ead4c5 100644
--- a/admin/layouts/admin_view/fields_right.php
+++ b/admin/layouts/admin_view/fields_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/javascript_fullwidth.php b/admin/layouts/admin_view/javascript_fullwidth.php
index f491ff6d3..e0d523c02 100644
--- a/admin/layouts/admin_view/javascript_fullwidth.php
+++ b/admin/layouts/admin_view/javascript_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/mysql_fullwidth.php b/admin/layouts/admin_view/mysql_fullwidth.php
index 0acd39366..58abb1b85 100644
--- a/admin/layouts/admin_view/mysql_fullwidth.php
+++ b/admin/layouts/admin_view/mysql_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/mysql_left.php b/admin/layouts/admin_view/mysql_left.php
index b5358f229..f3f5cbdb9 100644
--- a/admin/layouts/admin_view/mysql_left.php
+++ b/admin/layouts/admin_view/mysql_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/php_fullwidth.php b/admin/layouts/admin_view/php_fullwidth.php
index 28262d538..da2caf42f 100644
--- a/admin/layouts/admin_view/php_fullwidth.php
+++ b/admin/layouts/admin_view/php_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/admin_view/publishing.php b/admin/layouts/admin_view/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/admin_view/publishing.php
+++ b/admin/layouts/admin_view/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_view/publlshing.php b/admin/layouts/admin_view/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/admin_view/publlshing.php
+++ b/admin/layouts/admin_view/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/admin_view/settings_fullwidth.php b/admin/layouts/admin_view/settings_fullwidth.php
index 719338799..0b8329080 100644
--- a/admin/layouts/admin_view/settings_fullwidth.php
+++ b/admin/layouts/admin_view/settings_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index 5d26bb176..9103e3860 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -13,8 +13,8 @@
 defined('JPATH_BASE') or die;
 
 JHtmlBehavior::core();
-$divWrapper 	= range(1,120,2);
-$counter 		= 0;
+$divWrapper = range(1,120,2);
+$counter = 0;
 ?>
 <?php if ($displayData->ListSelection) : ?>
 <div class="row-fluid">
diff --git a/admin/layouts/component_admin_views/publishing.php b/admin/layouts/component_admin_views/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_admin_views/publishing.php
+++ b/admin/layouts/component_admin_views/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_admin_views/publlshing.php b/admin/layouts/component_admin_views/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_admin_views/publlshing.php
+++ b/admin/layouts/component_admin_views/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_admin_views/views_above.php b/admin/layouts/component_admin_views/views_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_admin_views/views_above.php
+++ b/admin/layouts/component_admin_views/views_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_admin_views/views_fullwidth.php b/admin/layouts/component_admin_views/views_fullwidth.php
index f52aa20fa..2c06f8581 100644
--- a/admin/layouts/component_admin_views/views_fullwidth.php
+++ b/admin/layouts/component_admin_views/views_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_config/publishing.php b/admin/layouts/component_config/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_config/publishing.php
+++ b/admin/layouts/component_config/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_config/publlshing.php b/admin/layouts/component_config/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_config/publlshing.php
+++ b/admin/layouts/component_config/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_config/tweaks_above.php b/admin/layouts/component_config/tweaks_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_config/tweaks_above.php
+++ b/admin/layouts/component_config/tweaks_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_config/tweaks_fullwidth.php b/admin/layouts/component_config/tweaks_fullwidth.php
index 7bf262f66..b96b69b35 100644
--- a/admin/layouts/component_config/tweaks_fullwidth.php
+++ b/admin/layouts/component_config/tweaks_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_custom_admin_menus/publishing.php b/admin/layouts/component_custom_admin_menus/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_custom_admin_menus/publishing.php
+++ b/admin/layouts/component_custom_admin_menus/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_custom_admin_menus/publlshing.php b/admin/layouts/component_custom_admin_menus/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_custom_admin_menus/publlshing.php
+++ b/admin/layouts/component_custom_admin_menus/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_custom_admin_menus/tweaks_above.php b/admin/layouts/component_custom_admin_menus/tweaks_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_custom_admin_menus/tweaks_above.php
+++ b/admin/layouts/component_custom_admin_menus/tweaks_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php b/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php
index f3205f00c..1d53e2f5a 100644
--- a/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php
+++ b/admin/layouts/component_custom_admin_menus/tweaks_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_custom_admin_views/publishing.php b/admin/layouts/component_custom_admin_views/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_custom_admin_views/publishing.php
+++ b/admin/layouts/component_custom_admin_views/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_custom_admin_views/publlshing.php b/admin/layouts/component_custom_admin_views/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_custom_admin_views/publlshing.php
+++ b/admin/layouts/component_custom_admin_views/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_custom_admin_views/views_above.php b/admin/layouts/component_custom_admin_views/views_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_custom_admin_views/views_above.php
+++ b/admin/layouts/component_custom_admin_views/views_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_custom_admin_views/views_fullwidth.php b/admin/layouts/component_custom_admin_views/views_fullwidth.php
index 1569ed4d7..7b910ce6e 100644
--- a/admin/layouts/component_custom_admin_views/views_fullwidth.php
+++ b/admin/layouts/component_custom_admin_views/views_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_dashboard/dashboard_above.php b/admin/layouts/component_dashboard/dashboard_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_dashboard/dashboard_above.php
+++ b/admin/layouts/component_dashboard/dashboard_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_dashboard/dashboard_fullwidth.php b/admin/layouts/component_dashboard/dashboard_fullwidth.php
index f29a532df..1d7224665 100644
--- a/admin/layouts/component_dashboard/dashboard_fullwidth.php
+++ b/admin/layouts/component_dashboard/dashboard_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_dashboard/publishing.php b/admin/layouts/component_dashboard/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_dashboard/publishing.php
+++ b/admin/layouts/component_dashboard/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_dashboard/publlshing.php b/admin/layouts/component_dashboard/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_dashboard/publlshing.php
+++ b/admin/layouts/component_dashboard/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_files_folders/advance_fullwidth.php b/admin/layouts/component_files_folders/advance_fullwidth.php
index 49548b40c..508d9d18e 100644
--- a/admin/layouts/component_files_folders/advance_fullwidth.php
+++ b/admin/layouts/component_files_folders/advance_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_files_folders/basic_above.php b/admin/layouts/component_files_folders/basic_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_files_folders/basic_above.php
+++ b/admin/layouts/component_files_folders/basic_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_files_folders/basic_fullwidth.php b/admin/layouts/component_files_folders/basic_fullwidth.php
index 58bd27707..d524507b0 100644
--- a/admin/layouts/component_files_folders/basic_fullwidth.php
+++ b/admin/layouts/component_files_folders/basic_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_files_folders/publishing.php b/admin/layouts/component_files_folders/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_files_folders/publishing.php
+++ b/admin/layouts/component_files_folders/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_files_folders/publlshing.php b/admin/layouts/component_files_folders/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_files_folders/publlshing.php
+++ b/admin/layouts/component_files_folders/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_mysql_tweaks/publishing.php b/admin/layouts/component_mysql_tweaks/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_mysql_tweaks/publishing.php
+++ b/admin/layouts/component_mysql_tweaks/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_mysql_tweaks/publlshing.php b/admin/layouts/component_mysql_tweaks/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_mysql_tweaks/publlshing.php
+++ b/admin/layouts/component_mysql_tweaks/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_mysql_tweaks/tweaks_above.php b/admin/layouts/component_mysql_tweaks/tweaks_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_mysql_tweaks/tweaks_above.php
+++ b/admin/layouts/component_mysql_tweaks/tweaks_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php b/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php
index ad1de2c35..9a0050b0f 100644
--- a/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php
+++ b/admin/layouts/component_mysql_tweaks/tweaks_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_site_views/publishing.php b/admin/layouts/component_site_views/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_site_views/publishing.php
+++ b/admin/layouts/component_site_views/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_site_views/publlshing.php b/admin/layouts/component_site_views/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_site_views/publlshing.php
+++ b/admin/layouts/component_site_views/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_site_views/views_above.php b/admin/layouts/component_site_views/views_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_site_views/views_above.php
+++ b/admin/layouts/component_site_views/views_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_site_views/views_fullwidth.php b/admin/layouts/component_site_views/views_fullwidth.php
index 58028cb90..247778c61 100644
--- a/admin/layouts/component_site_views/views_fullwidth.php
+++ b/admin/layouts/component_site_views/views_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_updates/publishing.php b/admin/layouts/component_updates/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/component_updates/publishing.php
+++ b/admin/layouts/component_updates/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_updates/publlshing.php b/admin/layouts/component_updates/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/component_updates/publlshing.php
+++ b/admin/layouts/component_updates/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/component_updates/updates_above.php b/admin/layouts/component_updates/updates_above.php
index 20c5b9419..26f5796f7 100644
--- a/admin/layouts/component_updates/updates_above.php
+++ b/admin/layouts/component_updates/updates_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/component_updates/updates_fullwidth.php b/admin/layouts/component_updates/updates_fullwidth.php
index ac45abfa7..15019846a 100644
--- a/admin/layouts/component_updates/updates_fullwidth.php
+++ b/admin/layouts/component_updates/updates_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
index 9c1b7f47f..e3a7e886c 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/custom_buttons_left.php b/admin/layouts/custom_admin_view/custom_buttons_left.php
index 5a11248f1..9a5328805 100644
--- a/admin/layouts/custom_admin_view/custom_buttons_left.php
+++ b/admin/layouts/custom_admin_view/custom_buttons_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/details_above.php b/admin/layouts/custom_admin_view/details_above.php
index 58fed60be..674a8e6b1 100644
--- a/admin/layouts/custom_admin_view/details_above.php
+++ b/admin/layouts/custom_admin_view/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/details_fullwidth.php b/admin/layouts/custom_admin_view/details_fullwidth.php
index abfb3d2a6..55f1ff1c4 100644
--- a/admin/layouts/custom_admin_view/details_fullwidth.php
+++ b/admin/layouts/custom_admin_view/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/details_left.php b/admin/layouts/custom_admin_view/details_left.php
index 2b26bc7db..75286200a 100644
--- a/admin/layouts/custom_admin_view/details_left.php
+++ b/admin/layouts/custom_admin_view/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/details_right.php b/admin/layouts/custom_admin_view/details_right.php
index b293d5f7c..e29f4d14c 100644
--- a/admin/layouts/custom_admin_view/details_right.php
+++ b/admin/layouts/custom_admin_view/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/details_rightside.php b/admin/layouts/custom_admin_view/details_rightside.php
index 613ebb3d8..cc9dc978c 100644
--- a/admin/layouts/custom_admin_view/details_rightside.php
+++ b/admin/layouts/custom_admin_view/details_rightside.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/details_under.php b/admin/layouts/custom_admin_view/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/custom_admin_view/details_under.php
+++ b/admin/layouts/custom_admin_view/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/javascript_css_fullwidth.php b/admin/layouts/custom_admin_view/javascript_css_fullwidth.php
index 186371f6a..233501624 100644
--- a/admin/layouts/custom_admin_view/javascript_css_fullwidth.php
+++ b/admin/layouts/custom_admin_view/javascript_css_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/linked_components_fullwidth.php b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
index 24975f5a2..ee8b7fe33 100644
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/php_fullwidth.php b/admin/layouts/custom_admin_view/php_fullwidth.php
index 6b0ee0507..db7cb458f 100644
--- a/admin/layouts/custom_admin_view/php_fullwidth.php
+++ b/admin/layouts/custom_admin_view/php_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_admin_view/publishing.php b/admin/layouts/custom_admin_view/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/custom_admin_view/publishing.php
+++ b/admin/layouts/custom_admin_view/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/custom_admin_view/publlshing.php b/admin/layouts/custom_admin_view/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/custom_admin_view/publlshing.php
+++ b/admin/layouts/custom_admin_view/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/custom_code/details_above.php b/admin/layouts/custom_code/details_above.php
index 2416eb817..cb7fb804b 100644
--- a/admin/layouts/custom_code/details_above.php
+++ b/admin/layouts/custom_code/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_code/details_fullwidth.php b/admin/layouts/custom_code/details_fullwidth.php
index 8e89b37ef..d9410fa2f 100644
--- a/admin/layouts/custom_code/details_fullwidth.php
+++ b/admin/layouts/custom_code/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_code/details_left.php b/admin/layouts/custom_code/details_left.php
index b824895e7..940d16c3c 100644
--- a/admin/layouts/custom_code/details_left.php
+++ b/admin/layouts/custom_code/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_code/details_right.php b/admin/layouts/custom_code/details_right.php
index c8f3836b7..cd2ef804a 100644
--- a/admin/layouts/custom_code/details_right.php
+++ b/admin/layouts/custom_code/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_code/details_under.php b/admin/layouts/custom_code/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/custom_code/details_under.php
+++ b/admin/layouts/custom_code/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/custom_code/publishing.php b/admin/layouts/custom_code/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/custom_code/publishing.php
+++ b/admin/layouts/custom_code/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/custom_code/publlshing.php b/admin/layouts/custom_code/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/custom_code/publlshing.php
+++ b/admin/layouts/custom_code/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/dynamic_get/abacus_fullwidth.php b/admin/layouts/dynamic_get/abacus_fullwidth.php
index edc34ac81..68e3a7628 100644
--- a/admin/layouts/dynamic_get/abacus_fullwidth.php
+++ b/admin/layouts/dynamic_get/abacus_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/abacus_left.php b/admin/layouts/dynamic_get/abacus_left.php
index 3b32a6e7e..cdcb433f1 100644
--- a/admin/layouts/dynamic_get/abacus_left.php
+++ b/admin/layouts/dynamic_get/abacus_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/custom_script_fullwidth.php b/admin/layouts/dynamic_get/custom_script_fullwidth.php
index 495ebc720..57838a88f 100644
--- a/admin/layouts/dynamic_get/custom_script_fullwidth.php
+++ b/admin/layouts/dynamic_get/custom_script_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/joint_fullwidth.php b/admin/layouts/dynamic_get/joint_fullwidth.php
index b6eee7c50..cc4ebb4e3 100644
--- a/admin/layouts/dynamic_get/joint_fullwidth.php
+++ b/admin/layouts/dynamic_get/joint_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/main_above.php b/admin/layouts/dynamic_get/main_above.php
index 9007d0327..35b1d7edd 100644
--- a/admin/layouts/dynamic_get/main_above.php
+++ b/admin/layouts/dynamic_get/main_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/main_fullwidth.php b/admin/layouts/dynamic_get/main_fullwidth.php
index 7a79dc037..fa8ab8b6e 100644
--- a/admin/layouts/dynamic_get/main_fullwidth.php
+++ b/admin/layouts/dynamic_get/main_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/main_left.php b/admin/layouts/dynamic_get/main_left.php
index 7553990c8..026b9783d 100644
--- a/admin/layouts/dynamic_get/main_left.php
+++ b/admin/layouts/dynamic_get/main_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/main_under.php b/admin/layouts/dynamic_get/main_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/dynamic_get/main_under.php
+++ b/admin/layouts/dynamic_get/main_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/dynamic_get/publishing.php b/admin/layouts/dynamic_get/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/dynamic_get/publishing.php
+++ b/admin/layouts/dynamic_get/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/dynamic_get/publlshing.php b/admin/layouts/dynamic_get/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/dynamic_get/publlshing.php
+++ b/admin/layouts/dynamic_get/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/dynamic_get/tweak_fullwidth.php b/admin/layouts/dynamic_get/tweak_fullwidth.php
index 2b2befd00..80d0f83e3 100644
--- a/admin/layouts/dynamic_get/tweak_fullwidth.php
+++ b/admin/layouts/dynamic_get/tweak_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/data_base_fullwidth.php b/admin/layouts/field/data_base_fullwidth.php
index 024a5c533..fabb39688 100644
--- a/admin/layouts/field/data_base_fullwidth.php
+++ b/admin/layouts/field/data_base_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/data_base_left.php b/admin/layouts/field/data_base_left.php
index dfb1dc5b5..d821e271b 100644
--- a/admin/layouts/field/data_base_left.php
+++ b/admin/layouts/field/data_base_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/data_base_right.php b/admin/layouts/field/data_base_right.php
index 364140746..b29f88135 100644
--- a/admin/layouts/field/data_base_right.php
+++ b/admin/layouts/field/data_base_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/publishing.php b/admin/layouts/field/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/field/publishing.php
+++ b/admin/layouts/field/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/field/publlshing.php b/admin/layouts/field/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/field/publlshing.php
+++ b/admin/layouts/field/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/field/scripts_left.php b/admin/layouts/field/scripts_left.php
index a5709eff3..67b2df4ca 100644
--- a/admin/layouts/field/scripts_left.php
+++ b/admin/layouts/field/scripts_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/scripts_right.php b/admin/layouts/field/scripts_right.php
index 69b92b596..3cac69d34 100644
--- a/admin/layouts/field/scripts_right.php
+++ b/admin/layouts/field/scripts_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/set_properties_above.php b/admin/layouts/field/set_properties_above.php
index add2e5721..d47e6ef1a 100644
--- a/admin/layouts/field/set_properties_above.php
+++ b/admin/layouts/field/set_properties_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/set_properties_fullwidth.php b/admin/layouts/field/set_properties_fullwidth.php
index f565dc404..20d53ee3b 100644
--- a/admin/layouts/field/set_properties_fullwidth.php
+++ b/admin/layouts/field/set_properties_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/set_properties_under.php b/admin/layouts/field/set_properties_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/field/set_properties_under.php
+++ b/admin/layouts/field/set_properties_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/field/type_info_fullwidth.php b/admin/layouts/field/type_info_fullwidth.php
index 48330ff60..42b12952d 100644
--- a/admin/layouts/field/type_info_fullwidth.php
+++ b/admin/layouts/field/type_info_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/fieldtype/details_fullwidth.php b/admin/layouts/fieldtype/details_fullwidth.php
index a5dfea941..ab4fd24d8 100644
--- a/admin/layouts/fieldtype/details_fullwidth.php
+++ b/admin/layouts/fieldtype/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/fieldtype/details_left.php b/admin/layouts/fieldtype/details_left.php
index 5b7b452ba..386913f1e 100644
--- a/admin/layouts/fieldtype/details_left.php
+++ b/admin/layouts/fieldtype/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/fieldtype/details_right.php b/admin/layouts/fieldtype/details_right.php
index 9e3f3122c..bd11565e9 100644
--- a/admin/layouts/fieldtype/details_right.php
+++ b/admin/layouts/fieldtype/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/fieldtype/fields_fullwidth.php b/admin/layouts/fieldtype/fields_fullwidth.php
index dd93e2bda..46191ebd3 100644
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
diff --git a/admin/layouts/fieldtype/publishing.php b/admin/layouts/fieldtype/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/fieldtype/publishing.php
+++ b/admin/layouts/fieldtype/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/fieldtype/publlshing.php b/admin/layouts/fieldtype/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/fieldtype/publlshing.php
+++ b/admin/layouts/fieldtype/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 4d49bf689..c44b44228 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index cf95cd419..e5b983f28 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index 7bea8ff2d..284564afd 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 246af3968..8b7e8c982 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/joomla_component/admin_views_fullwidth.php b/admin/layouts/joomla_component/admin_views_fullwidth.php
index c66f8d17d..e6216c2d6 100644
--- a/admin/layouts/joomla_component/admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/admin_views_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
index 60fab6fd3..a5a777d76 100644
--- a/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
+++ b/admin/layouts/joomla_component/custom_admin_views_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/dash_install_fullwidth.php b/admin/layouts/joomla_component/dash_install_fullwidth.php
index 709bdd95a..7e514a2ed 100644
--- a/admin/layouts/joomla_component/dash_install_fullwidth.php
+++ b/admin/layouts/joomla_component/dash_install_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/dash_install_left.php b/admin/layouts/joomla_component/dash_install_left.php
index 60e1f0e47..f0f2f3148 100644
--- a/admin/layouts/joomla_component/dash_install_left.php
+++ b/admin/layouts/joomla_component/dash_install_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/dash_install_right.php b/admin/layouts/joomla_component/dash_install_right.php
index 2d3164ab5..4e48f6b4f 100644
--- a/admin/layouts/joomla_component/dash_install_right.php
+++ b/admin/layouts/joomla_component/dash_install_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/details_above.php b/admin/layouts/joomla_component/details_above.php
index 58fed60be..674a8e6b1 100644
--- a/admin/layouts/joomla_component/details_above.php
+++ b/admin/layouts/joomla_component/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/details_left.php b/admin/layouts/joomla_component/details_left.php
index 86ea4d97a..2ee9e3a41 100644
--- a/admin/layouts/joomla_component/details_left.php
+++ b/admin/layouts/joomla_component/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/details_right.php b/admin/layouts/joomla_component/details_right.php
index 783a77c7a..e4e43b97a 100644
--- a/admin/layouts/joomla_component/details_right.php
+++ b/admin/layouts/joomla_component/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/details_under.php b/admin/layouts/joomla_component/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/joomla_component/details_under.php
+++ b/admin/layouts/joomla_component/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
index 2d2b73ee1..6f9975d02 100644
--- a/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_build_beta_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
index 9b255c174..ed3387a62 100644
--- a/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
+++ b/admin/layouts/joomla_component/dynamic_integration_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/libs_helpers_fullwidth.php b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
index b7256d3a4..97b021e4d 100644
--- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php
+++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/metadata.php b/admin/layouts/joomla_component/metadata.php
index b6e39084b..2e883fce6 100644
--- a/admin/layouts/joomla_component/metadata.php
+++ b/admin/layouts/joomla_component/metadata.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/mysql_fullwidth.php b/admin/layouts/joomla_component/mysql_fullwidth.php
index b62a9deba..a8a1c14cc 100644
--- a/admin/layouts/joomla_component/mysql_fullwidth.php
+++ b/admin/layouts/joomla_component/mysql_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/publishing.php b/admin/layouts/joomla_component/publishing.php
index 16c6a8147..b8c696d4f 100644
--- a/admin/layouts/joomla_component/publishing.php
+++ b/admin/layouts/joomla_component/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/joomla_component/readme_left.php b/admin/layouts/joomla_component/readme_left.php
index 869bcdbe1..8f4d41cc2 100644
--- a/admin/layouts/joomla_component/readme_left.php
+++ b/admin/layouts/joomla_component/readme_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/readme_right.php b/admin/layouts/joomla_component/readme_right.php
index 02960ad62..79f2e0380 100644
--- a/admin/layouts/joomla_component/readme_right.php
+++ b/admin/layouts/joomla_component/readme_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/settings_fullwidth.php b/admin/layouts/joomla_component/settings_fullwidth.php
index 47610dbd0..2003ed243 100644
--- a/admin/layouts/joomla_component/settings_fullwidth.php
+++ b/admin/layouts/joomla_component/settings_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/settings_left.php b/admin/layouts/joomla_component/settings_left.php
index 20acd1eb2..bb64d3daf 100644
--- a/admin/layouts/joomla_component/settings_left.php
+++ b/admin/layouts/joomla_component/settings_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/settings_right.php b/admin/layouts/joomla_component/settings_right.php
index 98cbfbf57..d7f0019f2 100644
--- a/admin/layouts/joomla_component/settings_right.php
+++ b/admin/layouts/joomla_component/settings_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/joomla_component/site_views_fullwidth.php b/admin/layouts/joomla_component/site_views_fullwidth.php
index 22fe70ba7..d569e5a02 100644
--- a/admin/layouts/joomla_component/site_views_fullwidth.php
+++ b/admin/layouts/joomla_component/site_views_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/language/details_left.php b/admin/layouts/language/details_left.php
index 8dd53e3ea..f90d6b9da 100644
--- a/admin/layouts/language/details_left.php
+++ b/admin/layouts/language/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/language/details_right.php b/admin/layouts/language/details_right.php
index 796590c8a..fa4f5c8fe 100644
--- a/admin/layouts/language/details_right.php
+++ b/admin/layouts/language/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/language/publishing.php b/admin/layouts/language/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/language/publishing.php
+++ b/admin/layouts/language/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/language/publlshing.php b/admin/layouts/language/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/language/publlshing.php
+++ b/admin/layouts/language/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/language_translation/details_fullwidth.php b/admin/layouts/language_translation/details_fullwidth.php
index fb1d11ba5..993163fbe 100644
--- a/admin/layouts/language_translation/details_fullwidth.php
+++ b/admin/layouts/language_translation/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/language_translation/publishing.php b/admin/layouts/language_translation/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/language_translation/publishing.php
+++ b/admin/layouts/language_translation/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/language_translation/publlshing.php b/admin/layouts/language_translation/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/language_translation/publlshing.php
+++ b/admin/layouts/language_translation/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/layout/custom_script_fullwidth.php b/admin/layouts/layout/custom_script_fullwidth.php
index 62e62e9f9..7bb271168 100644
--- a/admin/layouts/layout/custom_script_fullwidth.php
+++ b/admin/layouts/layout/custom_script_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/layout/details_fullwidth.php b/admin/layouts/layout/details_fullwidth.php
index e62ccd95c..b5989a2c4 100644
--- a/admin/layouts/layout/details_fullwidth.php
+++ b/admin/layouts/layout/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/layout/details_left.php b/admin/layouts/layout/details_left.php
index 01aff7ea8..dd143b604 100644
--- a/admin/layouts/layout/details_left.php
+++ b/admin/layouts/layout/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/layout/details_right.php b/admin/layouts/layout/details_right.php
index 6f16b8381..301a0209b 100644
--- a/admin/layouts/layout/details_right.php
+++ b/admin/layouts/layout/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/layout/details_rightside.php b/admin/layouts/layout/details_rightside.php
index 0cd2f3238..64ff0e623 100644
--- a/admin/layouts/layout/details_rightside.php
+++ b/admin/layouts/layout/details_rightside.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/layout/details_under.php b/admin/layouts/layout/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/layout/details_under.php
+++ b/admin/layouts/layout/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/layout/publishing.php b/admin/layouts/layout/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/layout/publishing.php
+++ b/admin/layouts/layout/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/layout/publlshing.php b/admin/layouts/layout/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/layout/publlshing.php
+++ b/admin/layouts/layout/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/library/behaviour_above.php b/admin/layouts/library/behaviour_above.php
index 57f6bead2..1f39a9321 100644
--- a/admin/layouts/library/behaviour_above.php
+++ b/admin/layouts/library/behaviour_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/behaviour_fullwidth.php b/admin/layouts/library/behaviour_fullwidth.php
index aef35c78c..96d884a59 100644
--- a/admin/layouts/library/behaviour_fullwidth.php
+++ b/admin/layouts/library/behaviour_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/behaviour_left.php b/admin/layouts/library/behaviour_left.php
index 228fdc7ec..b0b86b8ea 100644
--- a/admin/layouts/library/behaviour_left.php
+++ b/admin/layouts/library/behaviour_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/behaviour_right.php b/admin/layouts/library/behaviour_right.php
index 9e3f3122c..bd11565e9 100644
--- a/admin/layouts/library/behaviour_right.php
+++ b/admin/layouts/library/behaviour_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/behaviour_under.php b/admin/layouts/library/behaviour_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/library/behaviour_under.php
+++ b/admin/layouts/library/behaviour_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/config_fullwidth.php b/admin/layouts/library/config_fullwidth.php
index 29e9f1716..8c1d19e54 100644
--- a/admin/layouts/library/config_fullwidth.php
+++ b/admin/layouts/library/config_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/files_folders_urls_fullwidth.php b/admin/layouts/library/files_folders_urls_fullwidth.php
index 91aa917a7..d099019e5 100644
--- a/admin/layouts/library/files_folders_urls_fullwidth.php
+++ b/admin/layouts/library/files_folders_urls_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/linked_fullwidth.php b/admin/layouts/library/linked_fullwidth.php
index 24975f5a2..ee8b7fe33 100644
--- a/admin/layouts/library/linked_fullwidth.php
+++ b/admin/layouts/library/linked_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library/publishing.php b/admin/layouts/library/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/library/publishing.php
+++ b/admin/layouts/library/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/library/publlshing.php b/admin/layouts/library/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/library/publlshing.php
+++ b/admin/layouts/library/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/library_config/publishing.php b/admin/layouts/library_config/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/library_config/publishing.php
+++ b/admin/layouts/library_config/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/library_config/publlshing.php b/admin/layouts/library_config/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/library_config/publlshing.php
+++ b/admin/layouts/library_config/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/library_config/tweaks_above.php b/admin/layouts/library_config/tweaks_above.php
index 1df22abca..97769dcda 100644
--- a/admin/layouts/library_config/tweaks_above.php
+++ b/admin/layouts/library_config/tweaks_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library_config/tweaks_fullwidth.php b/admin/layouts/library_config/tweaks_fullwidth.php
index 7bf262f66..b96b69b35 100644
--- a/admin/layouts/library_config/tweaks_fullwidth.php
+++ b/admin/layouts/library_config/tweaks_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library_files_folders_urls/advance_fullwidth.php b/admin/layouts/library_files_folders_urls/advance_fullwidth.php
index 49548b40c..508d9d18e 100644
--- a/admin/layouts/library_files_folders_urls/advance_fullwidth.php
+++ b/admin/layouts/library_files_folders_urls/advance_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library_files_folders_urls/basic_above.php b/admin/layouts/library_files_folders_urls/basic_above.php
index 1df22abca..97769dcda 100644
--- a/admin/layouts/library_files_folders_urls/basic_above.php
+++ b/admin/layouts/library_files_folders_urls/basic_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library_files_folders_urls/basic_fullwidth.php b/admin/layouts/library_files_folders_urls/basic_fullwidth.php
index 01719de43..a7c7b4d22 100644
--- a/admin/layouts/library_files_folders_urls/basic_fullwidth.php
+++ b/admin/layouts/library_files_folders_urls/basic_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/library_files_folders_urls/publishing.php b/admin/layouts/library_files_folders_urls/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/library_files_folders_urls/publishing.php
+++ b/admin/layouts/library_files_folders_urls/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/library_files_folders_urls/publlshing.php b/admin/layouts/library_files_folders_urls/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/library_files_folders_urls/publlshing.php
+++ b/admin/layouts/library_files_folders_urls/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/server/details_above.php b/admin/layouts/server/details_above.php
index d07bd0184..f927a57d3 100644
--- a/admin/layouts/server/details_above.php
+++ b/admin/layouts/server/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/server/details_fullwidth.php b/admin/layouts/server/details_fullwidth.php
index 8ad0f4e78..74d9fa836 100644
--- a/admin/layouts/server/details_fullwidth.php
+++ b/admin/layouts/server/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/server/details_left.php b/admin/layouts/server/details_left.php
index 3dc7d1b60..bb1471132 100644
--- a/admin/layouts/server/details_left.php
+++ b/admin/layouts/server/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/server/details_right.php b/admin/layouts/server/details_right.php
index 3e1be9910..4cb738fa0 100644
--- a/admin/layouts/server/details_right.php
+++ b/admin/layouts/server/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/server/linked_components_fullwidth.php b/admin/layouts/server/linked_components_fullwidth.php
index 843ad66fc..f17ddb13c 100644
--- a/admin/layouts/server/linked_components_fullwidth.php
+++ b/admin/layouts/server/linked_components_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 // set the defaults
diff --git a/admin/layouts/server/publishing.php b/admin/layouts/server/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/server/publishing.php
+++ b/admin/layouts/server/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/server/publlshing.php b/admin/layouts/server/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/server/publlshing.php
+++ b/admin/layouts/server/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/site_view/custom_buttons_fullwidth.php b/admin/layouts/site_view/custom_buttons_fullwidth.php
index 69e1f6f6b..0ef4a67c5 100644
--- a/admin/layouts/site_view/custom_buttons_fullwidth.php
+++ b/admin/layouts/site_view/custom_buttons_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/custom_buttons_left.php b/admin/layouts/site_view/custom_buttons_left.php
index a19acb684..0cfdbe506 100644
--- a/admin/layouts/site_view/custom_buttons_left.php
+++ b/admin/layouts/site_view/custom_buttons_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/custom_buttons_right.php b/admin/layouts/site_view/custom_buttons_right.php
index bc2b7e292..df0beb10d 100644
--- a/admin/layouts/site_view/custom_buttons_right.php
+++ b/admin/layouts/site_view/custom_buttons_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/details_above.php b/admin/layouts/site_view/details_above.php
index 58fed60be..674a8e6b1 100644
--- a/admin/layouts/site_view/details_above.php
+++ b/admin/layouts/site_view/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/details_fullwidth.php b/admin/layouts/site_view/details_fullwidth.php
index abfb3d2a6..55f1ff1c4 100644
--- a/admin/layouts/site_view/details_fullwidth.php
+++ b/admin/layouts/site_view/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/details_left.php b/admin/layouts/site_view/details_left.php
index 2b26bc7db..75286200a 100644
--- a/admin/layouts/site_view/details_left.php
+++ b/admin/layouts/site_view/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/details_right.php b/admin/layouts/site_view/details_right.php
index 6f16b8381..301a0209b 100644
--- a/admin/layouts/site_view/details_right.php
+++ b/admin/layouts/site_view/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/details_rightside.php b/admin/layouts/site_view/details_rightside.php
index 613ebb3d8..cc9dc978c 100644
--- a/admin/layouts/site_view/details_rightside.php
+++ b/admin/layouts/site_view/details_rightside.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/details_under.php b/admin/layouts/site_view/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/site_view/details_under.php
+++ b/admin/layouts/site_view/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/javascript_css_fullwidth.php b/admin/layouts/site_view/javascript_css_fullwidth.php
index 762e19446..fc241753c 100644
--- a/admin/layouts/site_view/javascript_css_fullwidth.php
+++ b/admin/layouts/site_view/javascript_css_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/linked_components_fullwidth.php b/admin/layouts/site_view/linked_components_fullwidth.php
index 24975f5a2..ee8b7fe33 100644
--- a/admin/layouts/site_view/linked_components_fullwidth.php
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/php_fullwidth.php b/admin/layouts/site_view/php_fullwidth.php
index 6b0ee0507..db7cb458f 100644
--- a/admin/layouts/site_view/php_fullwidth.php
+++ b/admin/layouts/site_view/php_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/site_view/publishing.php b/admin/layouts/site_view/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/site_view/publishing.php
+++ b/admin/layouts/site_view/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/site_view/publlshing.php b/admin/layouts/site_view/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/site_view/publlshing.php
+++ b/admin/layouts/site_view/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/snippet/contributor_fullwidth.php b/admin/layouts/snippet/contributor_fullwidth.php
index 97b348318..330caa947 100644
--- a/admin/layouts/snippet/contributor_fullwidth.php
+++ b/admin/layouts/snippet/contributor_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet/contributor_left.php b/admin/layouts/snippet/contributor_left.php
index 2cb7b555c..e41f909a2 100644
--- a/admin/layouts/snippet/contributor_left.php
+++ b/admin/layouts/snippet/contributor_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet/contributor_right.php b/admin/layouts/snippet/contributor_right.php
index d0fbb70b6..938f8543d 100644
--- a/admin/layouts/snippet/contributor_right.php
+++ b/admin/layouts/snippet/contributor_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet/details_above.php b/admin/layouts/snippet/details_above.php
index dcd755820..0d684da90 100644
--- a/admin/layouts/snippet/details_above.php
+++ b/admin/layouts/snippet/details_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet/details_left.php b/admin/layouts/snippet/details_left.php
index 521b4b2f1..2c23d70a5 100644
--- a/admin/layouts/snippet/details_left.php
+++ b/admin/layouts/snippet/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet/details_right.php b/admin/layouts/snippet/details_right.php
index a881d6866..7cecba8b4 100644
--- a/admin/layouts/snippet/details_right.php
+++ b/admin/layouts/snippet/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet/publishing.php b/admin/layouts/snippet/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/snippet/publishing.php
+++ b/admin/layouts/snippet/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/snippet/publlshing.php b/admin/layouts/snippet/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/snippet/publlshing.php
+++ b/admin/layouts/snippet/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/snippet_type/details_left.php b/admin/layouts/snippet_type/details_left.php
index 8dd53e3ea..f90d6b9da 100644
--- a/admin/layouts/snippet_type/details_left.php
+++ b/admin/layouts/snippet_type/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet_type/details_right.php b/admin/layouts/snippet_type/details_right.php
index 9e3f3122c..bd11565e9 100644
--- a/admin/layouts/snippet_type/details_right.php
+++ b/admin/layouts/snippet_type/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/snippet_type/publishing.php b/admin/layouts/snippet_type/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/snippet_type/publishing.php
+++ b/admin/layouts/snippet_type/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/snippet_type/publlshing.php b/admin/layouts/snippet_type/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/snippet_type/publlshing.php
+++ b/admin/layouts/snippet_type/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/template/custom_script_fullwidth.php b/admin/layouts/template/custom_script_fullwidth.php
index 62e62e9f9..7bb271168 100644
--- a/admin/layouts/template/custom_script_fullwidth.php
+++ b/admin/layouts/template/custom_script_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/template/details_fullwidth.php b/admin/layouts/template/details_fullwidth.php
index ffdb565d1..f052853aa 100644
--- a/admin/layouts/template/details_fullwidth.php
+++ b/admin/layouts/template/details_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/template/details_left.php b/admin/layouts/template/details_left.php
index 01aff7ea8..dd143b604 100644
--- a/admin/layouts/template/details_left.php
+++ b/admin/layouts/template/details_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/template/details_right.php b/admin/layouts/template/details_right.php
index 189e5de1f..5361d08aa 100644
--- a/admin/layouts/template/details_right.php
+++ b/admin/layouts/template/details_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/template/details_rightside.php b/admin/layouts/template/details_rightside.php
index 0cd2f3238..64ff0e623 100644
--- a/admin/layouts/template/details_rightside.php
+++ b/admin/layouts/template/details_rightside.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/template/details_under.php b/admin/layouts/template/details_under.php
index ef6e5b818..676b68504 100644
--- a/admin/layouts/template/details_under.php
+++ b/admin/layouts/template/details_under.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/template/publishing.php b/admin/layouts/template/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/template/publishing.php
+++ b/admin/layouts/template/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/template/publlshing.php b/admin/layouts/template/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/template/publlshing.php
+++ b/admin/layouts/template/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/validation_rule/extends_formrule_above.php b/admin/layouts/validation_rule/extends_formrule_above.php
index e166f32ed..8f1aab922 100644
--- a/admin/layouts/validation_rule/extends_formrule_above.php
+++ b/admin/layouts/validation_rule/extends_formrule_above.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/validation_rule/extends_formrule_fullwidth.php b/admin/layouts/validation_rule/extends_formrule_fullwidth.php
index 974737b53..db432ae1c 100644
--- a/admin/layouts/validation_rule/extends_formrule_fullwidth.php
+++ b/admin/layouts/validation_rule/extends_formrule_fullwidth.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/validation_rule/extends_formrule_left.php b/admin/layouts/validation_rule/extends_formrule_left.php
index 8dd53e3ea..f90d6b9da 100644
--- a/admin/layouts/validation_rule/extends_formrule_left.php
+++ b/admin/layouts/validation_rule/extends_formrule_left.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/validation_rule/extends_formrule_right.php b/admin/layouts/validation_rule/extends_formrule_right.php
index 7e64673f8..081de8882 100644
--- a/admin/layouts/validation_rule/extends_formrule_right.php
+++ b/admin/layouts/validation_rule/extends_formrule_right.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $form = $displayData->getForm();
diff --git a/admin/layouts/validation_rule/publishing.php b/admin/layouts/validation_rule/publishing.php
index fbd856376..ea58156d1 100644
--- a/admin/layouts/validation_rule/publishing.php
+++ b/admin/layouts/validation_rule/publishing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/layouts/validation_rule/publlshing.php b/admin/layouts/validation_rule/publlshing.php
index 37b1fd658..7dfa73168 100644
--- a/admin/layouts/validation_rule/publlshing.php
+++ b/admin/layouts/validation_rule/publlshing.php
@@ -10,7 +10,6 @@
  */
 
 // No direct access to this file
-
 defined('_JEXEC') or die('Restricted access');
 
 $app = JFactory::getApplication();
diff --git a/admin/models/admin_fields.php b/admin/models/admin_fields.php
index b6e63d1df..eea312434 100644
--- a/admin/models/admin_fields.php
+++ b/admin/models/admin_fields.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Admin_fields Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 	 */
 	public function getTable($type = 'admin_fields', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -195,10 +195,14 @@ class ComponentbuilderModelAdmin_fields extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/admin_fields_conditions.php b/admin/models/admin_fields_conditions.php
index acaff146c..2baa8d1e6 100644
--- a/admin/models/admin_fields_conditions.php
+++ b/admin/models/admin_fields_conditions.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Admin_fields_conditions Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 	 */
 	public function getTable($type = 'admin_fields_conditions', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -195,10 +195,14 @@ class ComponentbuilderModelAdmin_fields_conditions extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/admin_fields_relations.php b/admin/models/admin_fields_relations.php
index 60c8adcad..94a718889 100644
--- a/admin/models/admin_fields_relations.php
+++ b/admin/models/admin_fields_relations.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Admin_fields_relations Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 	 */
 	public function getTable($type = 'admin_fields_relations', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -175,10 +175,14 @@ class ComponentbuilderModelAdmin_fields_relations extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index 63f0fd2a0..2668adfbc 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Admin_view Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 	 */
 	public function getTable($type = 'admin_view', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -495,10 +495,14 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/admin_views.php b/admin/models/admin_views.php
index 099600954..6f2df64d0 100644
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Admin_views Model
  */
diff --git a/admin/models/admins_fields.php b/admin/models/admins_fields.php
index d56384b9e..d43e3f330 100644
--- a/admin/models/admins_fields.php
+++ b/admin/models/admins_fields.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Admins_fields Model
  */
diff --git a/admin/models/admins_fields_conditions.php b/admin/models/admins_fields_conditions.php
index c375c5aa2..2a63f28e6 100644
--- a/admin/models/admins_fields_conditions.php
+++ b/admin/models/admins_fields_conditions.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Admins_fields_conditions Model
  */
diff --git a/admin/models/admins_fields_relations.php b/admin/models/admins_fields_relations.php
index 2dea912aa..b90c33494 100644
--- a/admin/models/admins_fields_relations.php
+++ b/admin/models/admins_fields_relations.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Admins_fields_relations Model
  */
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index d420bfbb5..445258d3b 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -12,8 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-jimport('joomla.application.component.helper');
-
 /**
  * Componentbuilder Ajax Model
  */
diff --git a/admin/models/compiler.php b/admin/models/compiler.php
index a4208a3f3..4561b2de4 100644
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Componentbuilder Model for Compiler
  */
diff --git a/admin/models/component_admin_views.php b/admin/models/component_admin_views.php
index 2991135a5..3d05ab54c 100644
--- a/admin/models/component_admin_views.php
+++ b/admin/models/component_admin_views.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_admin_views Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 	 */
 	public function getTable($type = 'component_admin_views', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_admin_views extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_config.php b/admin/models/component_config.php
index ca398cd29..4a1c9c03c 100644
--- a/admin/models/component_config.php
+++ b/admin/models/component_config.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_config Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 	 */
 	public function getTable($type = 'component_config', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_config extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_custom_admin_menus.php b/admin/models/component_custom_admin_menus.php
index 3bc75b7e1..ff7d66b74 100644
--- a/admin/models/component_custom_admin_menus.php
+++ b/admin/models/component_custom_admin_menus.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_custom_admin_menus Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 	 */
 	public function getTable($type = 'component_custom_admin_menus', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_custom_admin_menus extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_custom_admin_views.php b/admin/models/component_custom_admin_views.php
index c8bee38c5..8164a8301 100644
--- a/admin/models/component_custom_admin_views.php
+++ b/admin/models/component_custom_admin_views.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_custom_admin_views Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 	 */
 	public function getTable($type = 'component_custom_admin_views', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_custom_admin_views extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_dashboard.php b/admin/models/component_dashboard.php
index f35f918af..d36a8bb59 100644
--- a/admin/models/component_dashboard.php
+++ b/admin/models/component_dashboard.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_dashboard Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 	 */
 	public function getTable($type = 'component_dashboard', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -212,10 +212,14 @@ class ComponentbuilderModelComponent_dashboard extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_files_folders.php b/admin/models/component_files_folders.php
index 7b323428e..2be39de25 100644
--- a/admin/models/component_files_folders.php
+++ b/admin/models/component_files_folders.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_files_folders Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 	 */
 	public function getTable($type = 'component_files_folders', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -231,10 +231,14 @@ class ComponentbuilderModelComponent_files_folders extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_mysql_tweaks.php b/admin/models/component_mysql_tweaks.php
index 7841ff435..ee8671988 100644
--- a/admin/models/component_mysql_tweaks.php
+++ b/admin/models/component_mysql_tweaks.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_mysql_tweaks Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 	 */
 	public function getTable($type = 'component_mysql_tweaks', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_mysql_tweaks extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_site_views.php b/admin/models/component_site_views.php
index d0be872db..75f284ef6 100644
--- a/admin/models/component_site_views.php
+++ b/admin/models/component_site_views.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_site_views Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 	 */
 	public function getTable($type = 'component_site_views', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_site_views extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/component_updates.php b/admin/models/component_updates.php
index 53ef224f4..ebe546763 100644
--- a/admin/models/component_updates.php
+++ b/admin/models/component_updates.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Component_updates Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 	 */
 	public function getTable($type = 'component_updates', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -206,10 +206,14 @@ class ComponentbuilderModelComponent_updates extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/componentbuilder.php b/admin/models/componentbuilder.php
index e3e37590c..65167314a 100644
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@@ -12,10 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-jimport('joomla.application.component.helper');
-
 /**
  * Componentbuilder Model
  */
diff --git a/admin/models/components_admin_views.php b/admin/models/components_admin_views.php
index 2a29b660d..85b0781a5 100644
--- a/admin/models/components_admin_views.php
+++ b/admin/models/components_admin_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_admin_views Model
  */
diff --git a/admin/models/components_config.php b/admin/models/components_config.php
index d41d07e51..8e1e735cf 100644
--- a/admin/models/components_config.php
+++ b/admin/models/components_config.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_config Model
  */
diff --git a/admin/models/components_custom_admin_menus.php b/admin/models/components_custom_admin_menus.php
index 4013e3179..6b6064bac 100644
--- a/admin/models/components_custom_admin_menus.php
+++ b/admin/models/components_custom_admin_menus.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_custom_admin_menus Model
  */
diff --git a/admin/models/components_custom_admin_views.php b/admin/models/components_custom_admin_views.php
index 2068c3013..4c9688e98 100644
--- a/admin/models/components_custom_admin_views.php
+++ b/admin/models/components_custom_admin_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_custom_admin_views Model
  */
diff --git a/admin/models/components_dashboard.php b/admin/models/components_dashboard.php
index 515799618..7a86c217e 100644
--- a/admin/models/components_dashboard.php
+++ b/admin/models/components_dashboard.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_dashboard Model
  */
diff --git a/admin/models/components_files_folders.php b/admin/models/components_files_folders.php
index 56bcce65b..f589423bf 100644
--- a/admin/models/components_files_folders.php
+++ b/admin/models/components_files_folders.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_files_folders Model
  */
diff --git a/admin/models/components_mysql_tweaks.php b/admin/models/components_mysql_tweaks.php
index 13f9d73fb..cbaaca472 100644
--- a/admin/models/components_mysql_tweaks.php
+++ b/admin/models/components_mysql_tweaks.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_mysql_tweaks Model
  */
diff --git a/admin/models/components_site_views.php b/admin/models/components_site_views.php
index 818030699..686be172a 100644
--- a/admin/models/components_site_views.php
+++ b/admin/models/components_site_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_site_views Model
  */
diff --git a/admin/models/components_updates.php b/admin/models/components_updates.php
index b1c7b055f..0de9c5cb4 100644
--- a/admin/models/components_updates.php
+++ b/admin/models/components_updates.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Components_updates Model
  */
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 64a725a23..17f8033d7 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Custom_admin_view Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 	 */
 	public function getTable($type = 'custom_admin_view', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -316,10 +316,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/custom_admin_views.php b/admin/models/custom_admin_views.php
index fb3cfff13..cacdda386 100644
--- a/admin/models/custom_admin_views.php
+++ b/admin/models/custom_admin_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Custom_admin_views Model
  */
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index fdcbaab2f..6f1db6bae 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Custom_code Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 	 */
 	public function getTable($type = 'custom_code', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -173,10 +173,14 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/custom_codes.php b/admin/models/custom_codes.php
index 7baf9042b..4e3fedcd0 100644
--- a/admin/models/custom_codes.php
+++ b/admin/models/custom_codes.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Custom_codes Model
  */
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index cefcf9b82..728573474 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Dynamic_get Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 	 */
 	public function getTable($type = 'dynamic_get', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -323,10 +323,14 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/dynamic_gets.php b/admin/models/dynamic_gets.php
index 6e078e869..d234bf0cc 100644
--- a/admin/models/dynamic_gets.php
+++ b/admin/models/dynamic_gets.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Dynamic_gets Model
  */
diff --git a/admin/models/field.php b/admin/models/field.php
index b7cdf238b..bc2bc00a5 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Field Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelField extends JModelAdmin
 	 */
 	public function getTable($type = 'field', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -221,10 +221,14 @@ class ComponentbuilderModelField extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/fields.php b/admin/models/fields.php
index f3e3e90f2..b91ea5cbe 100644
--- a/admin/models/fields.php
+++ b/admin/models/fields.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Fields Model
  */
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 766610089..3dc229162 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Fieldtype Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	 */
 	public function getTable($type = 'fieldtype', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -376,10 +376,14 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/fieldtypes.php b/admin/models/fieldtypes.php
index e7b6afc44..8c7c06246 100644
--- a/admin/models/fieldtypes.php
+++ b/admin/models/fieldtypes.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Fieldtypes Model
  */
diff --git a/admin/models/get_snippets.php b/admin/models/get_snippets.php
index 5d0b046ca..12b91574d 100644
--- a/admin/models/get_snippets.php
+++ b/admin/models/get_snippets.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Componentbuilder Model for Get_snippets
  */
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index b3f186140..ec0f19791 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Help_document Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 	 */
 	public function getTable($type = 'help_document', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -171,10 +171,14 @@ class ComponentbuilderModelHelp_document extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index 4f0a3e9f9..319f16d30 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Help_documents Model
  */
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index 6c14623f6..43539aba3 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Joomla_component Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 	 */
 	public function getTable($type = 'joomla_component', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -351,10 +351,14 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/joomla_components.php b/admin/models/joomla_components.php
index a9d1023cd..22e83b9fd 100644
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Joomla_components Model
  */
diff --git a/admin/models/language.php b/admin/models/language.php
index 2c7ab6b0e..eacd7b4b9 100644
--- a/admin/models/language.php
+++ b/admin/models/language.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Language Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 	 */
 	public function getTable($type = 'language', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -165,10 +165,14 @@ class ComponentbuilderModelLanguage extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/language_translation.php b/admin/models/language_translation.php
index 500c3ae9a..61c4b454e 100644
--- a/admin/models/language_translation.php
+++ b/admin/models/language_translation.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Language_translation Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 	 */
 	public function getTable($type = 'language_translation', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -205,10 +205,14 @@ class ComponentbuilderModelLanguage_translation extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/language_translations.php b/admin/models/language_translations.php
index 1f120e041..9ac2db24e 100644
--- a/admin/models/language_translations.php
+++ b/admin/models/language_translations.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Language_translations Model
  */
diff --git a/admin/models/languages.php b/admin/models/languages.php
index 61ec24a1c..be03a67fe 100644
--- a/admin/models/languages.php
+++ b/admin/models/languages.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Languages Model
  */
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 10657db01..695d29168 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Layout Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelLayout extends JModelAdmin
 	 */
 	public function getTable($type = 'layout', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -211,10 +211,14 @@ class ComponentbuilderModelLayout extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/layouts.php b/admin/models/layouts.php
index dd01fb700..a24a0b287 100644
--- a/admin/models/layouts.php
+++ b/admin/models/layouts.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Layouts Model
  */
diff --git a/admin/models/libraries.php b/admin/models/libraries.php
index faca76a33..5c0e89cd0 100644
--- a/admin/models/libraries.php
+++ b/admin/models/libraries.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Libraries Model
  */
diff --git a/admin/models/libraries_config.php b/admin/models/libraries_config.php
index 7f6de9474..37e7c02fc 100644
--- a/admin/models/libraries_config.php
+++ b/admin/models/libraries_config.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Libraries_config Model
  */
diff --git a/admin/models/libraries_files_folders_urls.php b/admin/models/libraries_files_folders_urls.php
index 68ee65daa..d2adafb7e 100644
--- a/admin/models/libraries_files_folders_urls.php
+++ b/admin/models/libraries_files_folders_urls.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Libraries_files_folders_urls Model
  */
diff --git a/admin/models/library.php b/admin/models/library.php
index c754dbf3c..567b0751c 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Library Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 	 */
 	public function getTable($type = 'library', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -213,10 +213,14 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/library_config.php b/admin/models/library_config.php
index 138367410..5f8ec4c60 100644
--- a/admin/models/library_config.php
+++ b/admin/models/library_config.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Library_config Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 	 */
 	public function getTable($type = 'library_config', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -175,10 +175,14 @@ class ComponentbuilderModelLibrary_config extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/library_files_folders_urls.php b/admin/models/library_files_folders_urls.php
index f08ea01ff..afb227d35 100644
--- a/admin/models/library_files_folders_urls.php
+++ b/admin/models/library_files_folders_urls.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Library_files_folders_urls Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 	 */
 	public function getTable($type = 'library_files_folders_urls', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -207,10 +207,14 @@ class ComponentbuilderModelLibrary_files_folders_urls extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/server.php b/admin/models/server.php
index b48836ee4..323020402 100644
--- a/admin/models/server.php
+++ b/admin/models/server.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Server Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelServer extends JModelAdmin
 	 */
 	public function getTable($type = 'server', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -306,10 +306,14 @@ class ComponentbuilderModelServer extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/servers.php b/admin/models/servers.php
index b35f4cdd5..3a0d1a649 100644
--- a/admin/models/servers.php
+++ b/admin/models/servers.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Servers Model
  */
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index e31bd79ac..ae016c173 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Site_view Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 	 */
 	public function getTable($type = 'site_view', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -334,10 +334,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/site_views.php b/admin/models/site_views.php
index 069684d80..e69fd8292 100644
--- a/admin/models/site_views.php
+++ b/admin/models/site_views.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Site_views Model
  */
diff --git a/admin/models/snippet.php b/admin/models/snippet.php
index 5bf14a873..ffce3d3b7 100644
--- a/admin/models/snippet.php
+++ b/admin/models/snippet.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Snippet Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 	 */
 	public function getTable($type = 'snippet', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -171,10 +171,14 @@ class ComponentbuilderModelSnippet extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/snippet_type.php b/admin/models/snippet_type.php
index e32fdac90..108d6b8b3 100644
--- a/admin/models/snippet_type.php
+++ b/admin/models/snippet_type.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Snippet_type Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 	 */
 	public function getTable($type = 'snippet_type', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
     
@@ -165,10 +165,14 @@ class ComponentbuilderModelSnippet_type extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/snippet_types.php b/admin/models/snippet_types.php
index 56382df95..91d4d3283 100644
--- a/admin/models/snippet_types.php
+++ b/admin/models/snippet_types.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Snippet_types Model
  */
diff --git a/admin/models/snippets.php b/admin/models/snippets.php
index 007a2171d..c9c6ad6c9 100644
--- a/admin/models/snippets.php
+++ b/admin/models/snippets.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Snippets Model
  */
diff --git a/admin/models/template.php b/admin/models/template.php
index dc630da89..362d00179 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Template Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 	 */
 	public function getTable($type = 'template', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -211,10 +211,14 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/templates.php b/admin/models/templates.php
index c50775e90..c816c625c 100644
--- a/admin/models/templates.php
+++ b/admin/models/templates.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Templates Model
  */
diff --git a/admin/models/validation_rule.php b/admin/models/validation_rule.php
index a95849d67..9313a78be 100644
--- a/admin/models/validation_rule.php
+++ b/admin/models/validation_rule.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla modelform library
-jimport('joomla.application.component.modeladmin');
-
 /**
  * Componentbuilder Validation_rule Model
  */
@@ -49,6 +46,9 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 	 */
 	public function getTable($type = 'validation_rule', $prefix = 'ComponentbuilderTable', $config = array())
 	{
+		// add table path for when model gets used from other component
+		$this->addTablePath(JPATH_ADMINISTRATOR . '/components/com_componentbuilder/tables');
+		// get instance of the table
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
@@ -197,10 +197,14 @@ class ComponentbuilderModelValidation_rule extends JModelAdmin
 		// Only load these values if no id is found
 		if (0 == $id)
 		{
-			// Set redirected field name
-			$redirectedField = $jinput->get('ref', null, 'STRING');
-			// Set redirected field value
-			$redirectedValue = $jinput->get('refid', 0, 'INT');
+			// Set redirected view name
+			$redirectedView = $jinput->get('ref', null, 'STRING');
+			// Set field name (or fall back to view name)
+			$redirectedField = $jinput->get('field', $redirectedView, 'STRING');
+			// Set redirected view id
+			$redirectedId = $jinput->get('refid', 0, 'INT');
+			// Set field id (or fall back to redirected view id)
+			$redirectedValue = $jinput->get('field_id', $redirectedId, 'INT');
 			if (0 != $redirectedValue && $redirectedField)
 			{
 				// Now set the local-redirected field default value
diff --git a/admin/models/validation_rules.php b/admin/models/validation_rules.php
index 8ae07f5a0..ce3034210 100644
--- a/admin/models/validation_rules.php
+++ b/admin/models/validation_rules.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import the Joomla modellist library
-jimport('joomla.application.component.modellist');
-
 /**
  * Validation_rules Model
  */
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 29259a3d8..a82eb302d 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -1517,7 +1517,7 @@ INSERT INTO `#__componentbuilder_field` (`id`, `add_css_view`, `add_css_views`,
 (203, '', '', '', '', '', '', '', '', '', 1, '', 'INT', '', '', '', 'Not Required', 'NOT NULL', '', 9, '\"<field \\r\\n\\ttype=\\\"hidden\\\" \\r\\n\\tname=\\\"not_required\\\" \\r\\n\\tdefault=\\\"[]\\\" \\r\\n\\/>\"', 1, '2015-05-08 16:19:16', '2015-08-25 21:15:22', 1, '', 19),
 (280, '', '', '', '', '', '', '', '', '', 255, '', 'VARCHAR', '', '', '', 'Website', 'NOT NULL', '', 27, '\"<field\\n\\ttype=\\\"url\\\"\\n\\tname=\\\"website\\\"\\n\\tlabel=\\\"Website\\\"\\n\\tsize=\\\"60\\\"\\n\\tmaxlength=\\\"150\\\"\\n\\tdescription=\\\"Enter website address\\\"\\n\\tclass=\\\"text_area\\\"\\n\\tfilter=\\\"url\\\"\\n\\tvalidated=\\\"url\\\"\\n\\tmessage=\\\"Error! Please add website here.\\\"\\n\\thint=\\\"http:\\/\\/www.example.com\\\"\\n\\tscheme=\\\"http,https\\\"\\n\\/>\"', 1, '2015-04-08 00:36:16', '2018-07-08 00:11:05', 2, '', 105),
 (682, '', '', '', '', '', '', '', '', '', 1, '', 'TINYINT', 2, '', '', 'Add More', 'NOT NULL', '', 17, '\"<field \\r\\n\\ttype=\\\"radio\\\" \\r\\n\\tname=\\\"add\\\" \\r\\n\\tlabel=\\\"Add More\\\" \\r\\n\\tdescription=\\\"\\\" \\r\\n\\tclass=\\\"btn-group btn-group-yesno\\\" \\r\\n\\toption=\\\"1|Yes,0|No\\\" \\r\\n\\tdefault=\\\"0\\\" \\r\\n\\trequired=\\\"true\\\" \\r\\n\\/>\"', 1, '2015-08-05 01:18:20', '2018-03-30 09:30:45', 4, '', 196),
-(1011, '', '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth', 'NOT NULL', '', 1, '\"<field \\r\\n\\ttype=\\\"calendar\\\" \\r\\n\\tname=\\\"dateofbirth\\\" \\r\\n\\tlabel=\\\"Date of Birth\\\" \\r\\n\\tdefault=\\\"1970-01-01\\\" \\r\\n\\tdescription=\\\"Your date of birth\\\" \\r\\n\\tclass=\\\"\\\" \\r\\n\\tformat=\\\"%Y-%m-%d\\\" \\r\\n\\tfilter=\\\"\\\" \\r\\n\\trequired=\\\"\\\" \\r\\n\\/>\"', 1, '2015-12-07 01:47:32', '2015-12-07 02:15:24', 3, '', 649);
+(1011, '', '', '', '', '', '', '', 'Other', '0000-00-00', '', '', 'DATE', '', '', '', 'Date of Birth', 'NOT NULL', '', 1, '\"<field\\n\\ttype=\\\"calendar\\\"\\n\\tname=\\\"dateofbirth\\\"\\n\\tlabel=\\\"Date of Birth\\\"\\n\\tdefault=\\\"1970-01-01\\\"\\n\\tdescription=\\\"Your date of birth\\\"\\n\\tformat=\\\"%Y-%m-%d\\\"\\n\\tminyear=\\\"-120\\\"\\n\\tmaxyear=\\\"-1\\\"\\n\\tfilter=\\\"STRING\\\"\\n\\ttodaybutton=\\\"false\\\"\\n\\trequired=\\\"true\\\"\\n\\/>\"', 1, '2015-12-07 01:47:32', '2018-08-03 09:56:07', 4, '', 649);
 
 --
 -- Dumping data for table `#__componentbuilder_fieldtype`
diff --git a/admin/tables/admin_fields.php b/admin/tables/admin_fields.php
index 7bd14c130..59bf69131 100644
--- a/admin/tables/admin_fields.php
+++ b/admin/tables/admin_fields.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Admins_fields Table class
  */
diff --git a/admin/tables/admin_fields_conditions.php b/admin/tables/admin_fields_conditions.php
index f7783e2af..445ac85f0 100644
--- a/admin/tables/admin_fields_conditions.php
+++ b/admin/tables/admin_fields_conditions.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Admins_fields_conditions Table class
  */
diff --git a/admin/tables/admin_fields_relations.php b/admin/tables/admin_fields_relations.php
index 000373dc2..62a29ef6e 100644
--- a/admin/tables/admin_fields_relations.php
+++ b/admin/tables/admin_fields_relations.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Admins_fields_relations Table class
  */
diff --git a/admin/tables/admin_view.php b/admin/tables/admin_view.php
index 81fbf0dfa..54c0057d9 100644
--- a/admin/tables/admin_view.php
+++ b/admin/tables/admin_view.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Admin_views Table class
  */
diff --git a/admin/tables/component_admin_views.php b/admin/tables/component_admin_views.php
index 13e2a906f..e2dde9b78 100644
--- a/admin/tables/component_admin_views.php
+++ b/admin/tables/component_admin_views.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_admin_views Table class
  */
diff --git a/admin/tables/component_config.php b/admin/tables/component_config.php
index 96a308620..c6b9e373b 100644
--- a/admin/tables/component_config.php
+++ b/admin/tables/component_config.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_config Table class
  */
diff --git a/admin/tables/component_custom_admin_menus.php b/admin/tables/component_custom_admin_menus.php
index 4ae63178a..fe67dc1de 100644
--- a/admin/tables/component_custom_admin_menus.php
+++ b/admin/tables/component_custom_admin_menus.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_custom_admin_menus Table class
  */
diff --git a/admin/tables/component_custom_admin_views.php b/admin/tables/component_custom_admin_views.php
index 93f67e821..ffb4d3ce5 100644
--- a/admin/tables/component_custom_admin_views.php
+++ b/admin/tables/component_custom_admin_views.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_custom_admin_views Table class
  */
diff --git a/admin/tables/component_dashboard.php b/admin/tables/component_dashboard.php
index 06ee0160c..0fe7d88fe 100644
--- a/admin/tables/component_dashboard.php
+++ b/admin/tables/component_dashboard.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_dashboard Table class
  */
diff --git a/admin/tables/component_files_folders.php b/admin/tables/component_files_folders.php
index cb02f6e99..30ae8df2c 100644
--- a/admin/tables/component_files_folders.php
+++ b/admin/tables/component_files_folders.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_files_folders Table class
  */
diff --git a/admin/tables/component_mysql_tweaks.php b/admin/tables/component_mysql_tweaks.php
index 84a034cce..e374631ac 100644
--- a/admin/tables/component_mysql_tweaks.php
+++ b/admin/tables/component_mysql_tweaks.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_mysql_tweaks Table class
  */
diff --git a/admin/tables/component_site_views.php b/admin/tables/component_site_views.php
index 4134c8407..b5452c0df 100644
--- a/admin/tables/component_site_views.php
+++ b/admin/tables/component_site_views.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_site_views Table class
  */
diff --git a/admin/tables/component_updates.php b/admin/tables/component_updates.php
index 727c952fd..6290e2ab2 100644
--- a/admin/tables/component_updates.php
+++ b/admin/tables/component_updates.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Components_updates Table class
  */
diff --git a/admin/tables/custom_admin_view.php b/admin/tables/custom_admin_view.php
index 11d2825e8..43dd40669 100644
--- a/admin/tables/custom_admin_view.php
+++ b/admin/tables/custom_admin_view.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Custom_admin_views Table class
  */
diff --git a/admin/tables/custom_code.php b/admin/tables/custom_code.php
index 2e15d9efb..4f891fe31 100644
--- a/admin/tables/custom_code.php
+++ b/admin/tables/custom_code.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Custom_codes Table class
  */
diff --git a/admin/tables/dynamic_get.php b/admin/tables/dynamic_get.php
index 0986572b7..546b41364 100644
--- a/admin/tables/dynamic_get.php
+++ b/admin/tables/dynamic_get.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Dynamic_gets Table class
  */
diff --git a/admin/tables/field.php b/admin/tables/field.php
index 99044ff1c..427d88589 100644
--- a/admin/tables/field.php
+++ b/admin/tables/field.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Fields Table class
  */
diff --git a/admin/tables/fieldtype.php b/admin/tables/fieldtype.php
index 7e0b4630f..3e4ac978d 100644
--- a/admin/tables/fieldtype.php
+++ b/admin/tables/fieldtype.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Fieldtypes Table class
  */
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 1c3c12db9..8d4815b2a 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Help_documents Table class
  */
diff --git a/admin/tables/joomla_component.php b/admin/tables/joomla_component.php
index 376403cc8..e51f82f6f 100644
--- a/admin/tables/joomla_component.php
+++ b/admin/tables/joomla_component.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Joomla_components Table class
  */
diff --git a/admin/tables/language.php b/admin/tables/language.php
index d11a50f15..d09e5e490 100644
--- a/admin/tables/language.php
+++ b/admin/tables/language.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Languages Table class
  */
diff --git a/admin/tables/language_translation.php b/admin/tables/language_translation.php
index c459f6a23..1d71961e1 100644
--- a/admin/tables/language_translation.php
+++ b/admin/tables/language_translation.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Language_translations Table class
  */
diff --git a/admin/tables/layout.php b/admin/tables/layout.php
index ea96bbdf6..864facaa2 100644
--- a/admin/tables/layout.php
+++ b/admin/tables/layout.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Layouts Table class
  */
diff --git a/admin/tables/library.php b/admin/tables/library.php
index 04c629e21..8bb2983c4 100644
--- a/admin/tables/library.php
+++ b/admin/tables/library.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Libraries Table class
  */
diff --git a/admin/tables/library_config.php b/admin/tables/library_config.php
index 2bf6c4c61..6621b7214 100644
--- a/admin/tables/library_config.php
+++ b/admin/tables/library_config.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Libraries_config Table class
  */
diff --git a/admin/tables/library_files_folders_urls.php b/admin/tables/library_files_folders_urls.php
index e923ee242..42c200bad 100644
--- a/admin/tables/library_files_folders_urls.php
+++ b/admin/tables/library_files_folders_urls.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Libraries_files_folders_urls Table class
  */
diff --git a/admin/tables/server.php b/admin/tables/server.php
index 3705b7f36..b1bf88673 100644
--- a/admin/tables/server.php
+++ b/admin/tables/server.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Servers Table class
  */
diff --git a/admin/tables/site_view.php b/admin/tables/site_view.php
index 5e9df15ac..f5471fd70 100644
--- a/admin/tables/site_view.php
+++ b/admin/tables/site_view.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Site_views Table class
  */
diff --git a/admin/tables/snippet.php b/admin/tables/snippet.php
index 24c87cd72..4297245d9 100644
--- a/admin/tables/snippet.php
+++ b/admin/tables/snippet.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Snippets Table class
  */
diff --git a/admin/tables/snippet_type.php b/admin/tables/snippet_type.php
index 00785f494..ce1290531 100644
--- a/admin/tables/snippet_type.php
+++ b/admin/tables/snippet_type.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Snippet_types Table class
  */
diff --git a/admin/tables/template.php b/admin/tables/template.php
index bbd3e4c0f..c64b3359d 100644
--- a/admin/tables/template.php
+++ b/admin/tables/template.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Templates Table class
  */
diff --git a/admin/tables/validation_rule.php b/admin/tables/validation_rule.php
index 12e887e48..f3eec7833 100644
--- a/admin/tables/validation_rule.php
+++ b/admin/tables/validation_rule.php
@@ -14,9 +14,6 @@ defined('_JEXEC') or die('Restricted access');
 
 use Joomla\Registry\Registry;
 
-// import Joomla table library
-jimport('joomla.database.table');
-
 /**
  * Validation_rules Table class
  */
diff --git a/admin/views/admin_fields/tmpl/edit.php b/admin/views/admin_fields/tmpl/edit.php
index 8c865e062..c11ec3246 100644
--- a/admin/views/admin_fields/tmpl/edit.php
+++ b/admin/views/admin_fields/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('admin_fields.fields_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/admin_fields/view.html.php b/admin/views/admin_fields/view.html.php
index 71954e1c2..1d64c89ea 100644
--- a/admin/views/admin_fields/view.html.php
+++ b/admin/views/admin_fields/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Admin_fields View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('admin_fields.create') && $isNew)
 			{
diff --git a/admin/views/admin_fields_conditions/tmpl/edit.php b/admin/views/admin_fields_conditions/tmpl/edit.php
index 443a1698d..d46890107 100644
--- a/admin/views/admin_fields_conditions/tmpl/edit.php
+++ b/admin/views/admin_fields_conditions/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('admin_fields_conditions.conditions_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/admin_fields_conditions/view.html.php b/admin/views/admin_fields_conditions/view.html.php
index 49812d138..9419e9c9e 100644
--- a/admin/views/admin_fields_conditions/view.html.php
+++ b/admin/views/admin_fields_conditions/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Admin_fields_conditions View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('admin_fields_conditions.create') && $isNew)
 			{
diff --git a/admin/views/admin_fields_relations/tmpl/edit.php b/admin/views/admin_fields_relations/tmpl/edit.php
index ae64ff6ba..46ca6cc9c 100644
--- a/admin/views/admin_fields_relations/tmpl/edit.php
+++ b/admin/views/admin_fields_relations/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('admin_fields_relations.relations_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/admin_fields_relations/view.html.php b/admin/views/admin_fields_relations/view.html.php
index 376f517df..83e431e4c 100644
--- a/admin/views/admin_fields_relations/view.html.php
+++ b/admin/views/admin_fields_relations/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Admin_fields_relations View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewAdmin_fields_relations extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewAdmin_fields_relations extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_RELATIONS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('admin_fields_relations.create') && $isNew)
 			{
diff --git a/admin/views/admin_view/tmpl/edit.php b/admin/views/admin_view/tmpl/edit.php
index 52f4ed39c..7d070a386 100644
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('admin_view.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/admin_view/view.html.php b/admin/views/admin_view/view.html.php
index 4ad2b69fb..a9f8235f0 100644
--- a/admin/views/admin_view/view.html.php
+++ b/admin/views/admin_view/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Admin_view View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('admin_view.create') && $isNew)
 			{
diff --git a/admin/views/admin_views/view.html.php b/admin/views/admin_views/view.html.php
index 34aea38ed..94f86e694 100644
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Admin_views
  */
diff --git a/admin/views/admins_fields/view.html.php b/admin/views/admins_fields/view.html.php
index eaadf09d7..45bd57e04 100644
--- a/admin/views/admins_fields/view.html.php
+++ b/admin/views/admins_fields/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Admins_fields
  */
diff --git a/admin/views/admins_fields_conditions/view.html.php b/admin/views/admins_fields_conditions/view.html.php
index c2704a0cd..8bb9d47bb 100644
--- a/admin/views/admins_fields_conditions/view.html.php
+++ b/admin/views/admins_fields_conditions/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Admins_fields_conditions
  */
diff --git a/admin/views/admins_fields_relations/view.html.php b/admin/views/admins_fields_relations/view.html.php
index 28a73f9e4..cacd36d86 100644
--- a/admin/views/admins_fields_relations/view.html.php
+++ b/admin/views/admins_fields_relations/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Admins_fields_relations
  */
diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php
index e4c6f4104..fd789d46d 100644
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Compiler
  */
diff --git a/admin/views/component_admin_views/tmpl/edit.php b/admin/views/component_admin_views/tmpl/edit.php
index d469e56ad..330ccac50 100644
--- a/admin/views/component_admin_views/tmpl/edit.php
+++ b/admin/views/component_admin_views/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_admin_views.views_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_admin_views/view.html.php b/admin/views/component_admin_views/view.html.php
index e50c984a9..1a0820ef9 100644
--- a/admin/views/component_admin_views/view.html.php
+++ b/admin/views/component_admin_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_admin_views View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_admin_views extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_admin_views extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_admin_views.create') && $isNew)
 			{
diff --git a/admin/views/component_config/tmpl/edit.php b/admin/views/component_config/tmpl/edit.php
index 134bdb86b..d71a0458e 100644
--- a/admin/views/component_config/tmpl/edit.php
+++ b/admin/views/component_config/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_config.tweaks_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_config/view.html.php b/admin/views/component_config/view.html.php
index 56b5e17a7..eaf094e58 100644
--- a/admin/views/component_config/view.html.php
+++ b/admin/views/component_config/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_config View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_config extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_config extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_config.create') && $isNew)
 			{
diff --git a/admin/views/component_custom_admin_menus/tmpl/edit.php b/admin/views/component_custom_admin_menus/tmpl/edit.php
index 407477095..4eea45ba9 100644
--- a/admin/views/component_custom_admin_menus/tmpl/edit.php
+++ b/admin/views/component_custom_admin_menus/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_custom_admin_menus.tweaks_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_custom_admin_menus/view.html.php b/admin/views/component_custom_admin_menus/view.html.php
index 0e2691c4c..0e9c6fbeb 100644
--- a/admin/views/component_custom_admin_menus/view.html.php
+++ b/admin/views/component_custom_admin_menus/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_custom_admin_menus View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_custom_admin_menus extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_custom_admin_menus extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_custom_admin_menus.create') && $isNew)
 			{
diff --git a/admin/views/component_custom_admin_views/tmpl/edit.php b/admin/views/component_custom_admin_views/tmpl/edit.php
index d3b12ae3b..0943ae70b 100644
--- a/admin/views/component_custom_admin_views/tmpl/edit.php
+++ b/admin/views/component_custom_admin_views/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_custom_admin_views.views_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_custom_admin_views/view.html.php b/admin/views/component_custom_admin_views/view.html.php
index 816271ddc..62c370241 100644
--- a/admin/views/component_custom_admin_views/view.html.php
+++ b/admin/views/component_custom_admin_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_custom_admin_views View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_custom_admin_views extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_custom_admin_views extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_custom_admin_views.create') && $isNew)
 			{
diff --git a/admin/views/component_dashboard/tmpl/edit.php b/admin/views/component_dashboard/tmpl/edit.php
index 0d82e62ed..99e3c6f36 100644
--- a/admin/views/component_dashboard/tmpl/edit.php
+++ b/admin/views/component_dashboard/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_dashboard.dashboard_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_dashboard/view.html.php b/admin/views/component_dashboard/view.html.php
index 4a0bf7c7a..7831405e6 100644
--- a/admin/views/component_dashboard/view.html.php
+++ b/admin/views/component_dashboard/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_dashboard View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_dashboard extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_dashboard extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_dashboard.create') && $isNew)
 			{
diff --git a/admin/views/component_files_folders/tmpl/edit.php b/admin/views/component_files_folders/tmpl/edit.php
index c881bf83f..b66893813 100644
--- a/admin/views/component_files_folders/tmpl/edit.php
+++ b/admin/views/component_files_folders/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_files_folders.basic_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_files_folders/view.html.php b/admin/views/component_files_folders/view.html.php
index 49173db83..724a57f20 100644
--- a/admin/views/component_files_folders/view.html.php
+++ b/admin/views/component_files_folders/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_files_folders View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_files_folders extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_files_folders extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_files_folders.create') && $isNew)
 			{
diff --git a/admin/views/component_mysql_tweaks/tmpl/edit.php b/admin/views/component_mysql_tweaks/tmpl/edit.php
index 986effd3b..86fc86ef4 100644
--- a/admin/views/component_mysql_tweaks/tmpl/edit.php
+++ b/admin/views/component_mysql_tweaks/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_mysql_tweaks.tweaks_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_mysql_tweaks/view.html.php b/admin/views/component_mysql_tweaks/view.html.php
index 7414eeedd..214f987a5 100644
--- a/admin/views/component_mysql_tweaks/view.html.php
+++ b/admin/views/component_mysql_tweaks/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_mysql_tweaks View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_mysql_tweaks extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_mysql_tweaks extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_mysql_tweaks.create') && $isNew)
 			{
diff --git a/admin/views/component_site_views/tmpl/edit.php b/admin/views/component_site_views/tmpl/edit.php
index e6b7dccc0..9e1826955 100644
--- a/admin/views/component_site_views/tmpl/edit.php
+++ b/admin/views/component_site_views/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_site_views.views_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_site_views/view.html.php b/admin/views/component_site_views/view.html.php
index 89f73e6f0..5384ad281 100644
--- a/admin/views/component_site_views/view.html.php
+++ b/admin/views/component_site_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_site_views View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_site_views extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_site_views extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_site_views.create') && $isNew)
 			{
diff --git a/admin/views/component_updates/tmpl/edit.php b/admin/views/component_updates/tmpl/edit.php
index 55c08c99f..bbd06afdc 100644
--- a/admin/views/component_updates/tmpl/edit.php
+++ b/admin/views/component_updates/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('component_updates.updates_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/component_updates/view.html.php b/admin/views/component_updates/view.html.php
index 0ca8d9f74..fa6f40c6e 100644
--- a/admin/views/component_updates/view.html.php
+++ b/admin/views/component_updates/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Component_updates View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewComponent_updates extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewComponent_updates extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('component_updates.create') && $isNew)
 			{
diff --git a/admin/views/componentbuilder/view.html.php b/admin/views/componentbuilder/view.html.php
index d1bc358e8..2a148956b 100644
--- a/admin/views/componentbuilder/view.html.php
+++ b/admin/views/componentbuilder/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class
  */
diff --git a/admin/views/components_admin_views/view.html.php b/admin/views/components_admin_views/view.html.php
index 03e54ab01..3cfd206e9 100644
--- a/admin/views/components_admin_views/view.html.php
+++ b/admin/views/components_admin_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_admin_views
  */
diff --git a/admin/views/components_config/view.html.php b/admin/views/components_config/view.html.php
index 0006005c3..5eceb65ce 100644
--- a/admin/views/components_config/view.html.php
+++ b/admin/views/components_config/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_config
  */
diff --git a/admin/views/components_custom_admin_menus/view.html.php b/admin/views/components_custom_admin_menus/view.html.php
index 72fe15ed6..95f47a0fb 100644
--- a/admin/views/components_custom_admin_menus/view.html.php
+++ b/admin/views/components_custom_admin_menus/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_custom_admin_menus
  */
diff --git a/admin/views/components_custom_admin_views/view.html.php b/admin/views/components_custom_admin_views/view.html.php
index f82ff483f..fc65c5e08 100644
--- a/admin/views/components_custom_admin_views/view.html.php
+++ b/admin/views/components_custom_admin_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_custom_admin_views
  */
diff --git a/admin/views/components_dashboard/view.html.php b/admin/views/components_dashboard/view.html.php
index 8bdd4799a..3d729a260 100644
--- a/admin/views/components_dashboard/view.html.php
+++ b/admin/views/components_dashboard/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_dashboard
  */
diff --git a/admin/views/components_files_folders/view.html.php b/admin/views/components_files_folders/view.html.php
index a754aa2cd..64e7af691 100644
--- a/admin/views/components_files_folders/view.html.php
+++ b/admin/views/components_files_folders/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_files_folders
  */
diff --git a/admin/views/components_mysql_tweaks/view.html.php b/admin/views/components_mysql_tweaks/view.html.php
index 95c8a2ccb..f8e769a7a 100644
--- a/admin/views/components_mysql_tweaks/view.html.php
+++ b/admin/views/components_mysql_tweaks/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_mysql_tweaks
  */
diff --git a/admin/views/components_site_views/view.html.php b/admin/views/components_site_views/view.html.php
index fc544f2c7..d3ce0c22d 100644
--- a/admin/views/components_site_views/view.html.php
+++ b/admin/views/components_site_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_site_views
  */
diff --git a/admin/views/components_updates/view.html.php b/admin/views/components_updates/view.html.php
index 94f60a740..a44f045ab 100644
--- a/admin/views/components_updates/view.html.php
+++ b/admin/views/components_updates/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Components_updates
  */
diff --git a/admin/views/custom_admin_view/tmpl/edit.php b/admin/views/custom_admin_view/tmpl/edit.php
index 8fe8efa4e..8877fd401 100644
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('custom_admin_view.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/custom_admin_view/view.html.php b/admin/views/custom_admin_view/view.html.php
index 24ffe9c1c..cf3f81c38 100644
--- a/admin/views/custom_admin_view/view.html.php
+++ b/admin/views/custom_admin_view/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Custom_admin_view View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('core.create') && $isNew)
 			{
diff --git a/admin/views/custom_admin_views/view.html.php b/admin/views/custom_admin_views/view.html.php
index 1a65b6cb6..170365326 100644
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Custom_admin_views
  */
diff --git a/admin/views/custom_code/tmpl/edit.php b/admin/views/custom_code/tmpl/edit.php
index 21932be92..d5d71d3f0 100644
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('custom_code.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/custom_code/view.html.php b/admin/views/custom_code/view.html.php
index 1af27013b..07d1d7892 100644
--- a/admin/views/custom_code/view.html.php
+++ b/admin/views/custom_code/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Custom_code View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewCustom_code extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewCustom_code extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('custom_code.create') && $isNew)
 			{
diff --git a/admin/views/custom_codes/view.html.php b/admin/views/custom_codes/view.html.php
index eff1473fd..7c03cd6e5 100644
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Custom_codes
  */
diff --git a/admin/views/dynamic_get/tmpl/edit.php b/admin/views/dynamic_get/tmpl/edit.php
index a8f2f0b43..fc63ec752 100644
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('dynamic_get.main_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/dynamic_get/view.html.php b/admin/views/dynamic_get/view.html.php
index 5af45debe..a6f403292 100644
--- a/admin/views/dynamic_get/view.html.php
+++ b/admin/views/dynamic_get/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Dynamic_get View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('dynamic_get.create') && $isNew)
 			{
diff --git a/admin/views/dynamic_gets/view.html.php b/admin/views/dynamic_gets/view.html.php
index d4edad41f..7b2e53169 100644
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Dynamic_gets
  */
diff --git a/admin/views/field/tmpl/edit.php b/admin/views/field/tmpl/edit.php
index 8f8ec4e8d..4d900aab5 100644
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('field.set_properties_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/field/view.html.php b/admin/views/field/view.html.php
index 86d1845a3..8b3920f5a 100644
--- a/admin/views/field/view.html.php
+++ b/admin/views/field/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Field View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewField extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewField extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('field.create') && $isNew)
 			{
diff --git a/admin/views/fields/view.html.php b/admin/views/fields/view.html.php
index de463c5b7..66ff0f501 100644
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Fields
  */
diff --git a/admin/views/fieldtype/tmpl/edit.php b/admin/views/fieldtype/tmpl/edit.php
index 526621293..42cd45270 100644
--- a/admin/views/fieldtype/tmpl/edit.php
+++ b/admin/views/fieldtype/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="form-horizontal">
 
diff --git a/admin/views/fieldtype/view.html.php b/admin/views/fieldtype/view.html.php
index 7985887c1..566d5e186 100644
--- a/admin/views/fieldtype/view.html.php
+++ b/admin/views/fieldtype/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Fieldtype View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Get Linked view data
@@ -81,7 +86,7 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELDTYPE_NEW' : 'COM_COMPONENTBUILDER_FIELDTYPE_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('fieldtype.create') && $isNew)
 			{
diff --git a/admin/views/fieldtypes/view.html.php b/admin/views/fieldtypes/view.html.php
index 868fa5302..bd2b3a458 100644
--- a/admin/views/fieldtypes/view.html.php
+++ b/admin/views/fieldtypes/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Fieldtypes
  */
diff --git a/admin/views/get_snippets/view.html.php b/admin/views/get_snippets/view.html.php
index 2f7da2a29..58f08f620 100644
--- a/admin/views/get_snippets/view.html.php
+++ b/admin/views/get_snippets/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Get_snippets
  */
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index f32168f0f..564fa305d 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('help_document.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 45029eccc..056427512 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Help_document View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewHelp_document extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewHelp_document extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_HELP_DOCUMENT_NEW' : 'COM_COMPONENTBUILDER_HELP_DOCUMENT_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('help_document.create') && $isNew)
 			{
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 8837a7ad5..f7fbe9787 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Help_documents
  */
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 2a3dade46..19698d882 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder Import View
  */
diff --git a/admin/views/import_joomla_components/view.html.php b/admin/views/import_joomla_components/view.html.php
index f65bda83b..d56cebda4 100644
--- a/admin/views/import_joomla_components/view.html.php
+++ b/admin/views/import_joomla_components/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder Import_joomla_components View
  */
diff --git a/admin/views/import_language_translations/view.html.php b/admin/views/import_language_translations/view.html.php
index 0501d0d04..091a84866 100644
--- a/admin/views/import_language_translations/view.html.php
+++ b/admin/views/import_language_translations/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder Import_language_translations View
  */
diff --git a/admin/views/joomla_component/tmpl/edit.php b/admin/views/joomla_component/tmpl/edit.php
index e1427ad56..2b3cdf055 100644
--- a/admin/views/joomla_component/tmpl/edit.php
+++ b/admin/views/joomla_component/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('joomla_component.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/joomla_component/view.html.php b/admin/views/joomla_component/view.html.php
index e5151c41a..da8f7668f 100644
--- a/admin/views/joomla_component/view.html.php
+++ b/admin/views/joomla_component/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Joomla_component View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewJoomla_component extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW' : 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('joomla_component.create') && $isNew)
 			{
diff --git a/admin/views/joomla_components/view.html.php b/admin/views/joomla_components/view.html.php
index 2baff0acd..20647048f 100644
--- a/admin/views/joomla_components/view.html.php
+++ b/admin/views/joomla_components/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Joomla_components
  */
diff --git a/admin/views/language/tmpl/edit.php b/admin/views/language/tmpl/edit.php
index 8219189cf..c8443ee08 100644
--- a/admin/views/language/tmpl/edit.php
+++ b/admin/views/language/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="form-horizontal">
 
diff --git a/admin/views/language/view.html.php b/admin/views/language/view.html.php
index cede2541b..d77bb5f04 100644
--- a/admin/views/language/view.html.php
+++ b/admin/views/language/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Language View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewLanguage extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewLanguage extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_LANGUAGE_NEW' : 'COM_COMPONENTBUILDER_LANGUAGE_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('language.create') && $isNew)
 			{
diff --git a/admin/views/language_translation/tmpl/edit.php b/admin/views/language_translation/tmpl/edit.php
index da425645e..90da99e47 100644
--- a/admin/views/language_translation/tmpl/edit.php
+++ b/admin/views/language_translation/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="form-horizontal">
 
diff --git a/admin/views/language_translation/view.html.php b/admin/views/language_translation/view.html.php
index 94d7e9509..374de8bbc 100644
--- a/admin/views/language_translation/view.html.php
+++ b/admin/views/language_translation/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Language_translation View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewLanguage_translation extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_NEW' : 'COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('language_translation.create') && $isNew)
 			{
diff --git a/admin/views/language_translations/view.html.php b/admin/views/language_translations/view.html.php
index f813d394f..08ad40cdf 100644
--- a/admin/views/language_translations/view.html.php
+++ b/admin/views/language_translations/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Language_translations
  */
diff --git a/admin/views/languages/view.html.php b/admin/views/languages/view.html.php
index 321531610..5d5de000c 100644
--- a/admin/views/languages/view.html.php
+++ b/admin/views/languages/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Languages
  */
diff --git a/admin/views/layout/tmpl/edit.php b/admin/views/layout/tmpl/edit.php
index f459debdd..ba62adc16 100644
--- a/admin/views/layout/tmpl/edit.php
+++ b/admin/views/layout/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="form-horizontal">
 	<div class="span9">
diff --git a/admin/views/layout/view.html.php b/admin/views/layout/view.html.php
index d125dda58..e9c7d2e04 100644
--- a/admin/views/layout/view.html.php
+++ b/admin/views/layout/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Layout View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewLayout extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewLayout extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_LAYOUT_NEW' : 'COM_COMPONENTBUILDER_LAYOUT_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('core.create') && $isNew)
 			{
diff --git a/admin/views/layouts/view.html.php b/admin/views/layouts/view.html.php
index ff413267e..33b3f891b 100644
--- a/admin/views/layouts/view.html.php
+++ b/admin/views/layouts/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Layouts
  */
diff --git a/admin/views/libraries/view.html.php b/admin/views/libraries/view.html.php
index b936e59d0..3c3cdb3cc 100644
--- a/admin/views/libraries/view.html.php
+++ b/admin/views/libraries/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Libraries
  */
diff --git a/admin/views/libraries_config/view.html.php b/admin/views/libraries_config/view.html.php
index 50fc2408f..229f4a2b5 100644
--- a/admin/views/libraries_config/view.html.php
+++ b/admin/views/libraries_config/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Libraries_config
  */
diff --git a/admin/views/libraries_files_folders_urls/view.html.php b/admin/views/libraries_files_folders_urls/view.html.php
index 0c2437266..3da6ed0fb 100644
--- a/admin/views/libraries_files_folders_urls/view.html.php
+++ b/admin/views/libraries_files_folders_urls/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Libraries_files_folders_urls
  */
diff --git a/admin/views/library/tmpl/edit.php b/admin/views/library/tmpl/edit.php
index bf4895aa2..413f92d2b 100644
--- a/admin/views/library/tmpl/edit.php
+++ b/admin/views/library/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('library.behaviour_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/library/view.html.php b/admin/views/library/view.html.php
index 4616e849e..f4831818d 100644
--- a/admin/views/library/view.html.php
+++ b/admin/views/library/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Library View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewLibrary extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewLibrary extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('library.create') && $isNew)
 			{
diff --git a/admin/views/library_config/tmpl/edit.php b/admin/views/library_config/tmpl/edit.php
index e2a440e72..5cf71162f 100644
--- a/admin/views/library_config/tmpl/edit.php
+++ b/admin/views/library_config/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('library_config.tweaks_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/library_config/view.html.php b/admin/views/library_config/view.html.php
index 7b4f72428..1855cdd54 100644
--- a/admin/views/library_config/view.html.php
+++ b/admin/views/library_config/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Library_config View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewLibrary_config extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewLibrary_config extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_CONFIG_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_CONFIG_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('library_config.create') && $isNew)
 			{
diff --git a/admin/views/library_files_folders_urls/tmpl/edit.php b/admin/views/library_files_folders_urls/tmpl/edit.php
index 48c2458ea..4ec500b34 100644
--- a/admin/views/library_files_folders_urls/tmpl/edit.php
+++ b/admin/views/library_files_folders_urls/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('library_files_folders_urls.basic_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/library_files_folders_urls/view.html.php b/admin/views/library_files_folders_urls/view.html.php
index e34466647..859e61dce 100644
--- a/admin/views/library_files_folders_urls/view.html.php
+++ b/admin/views/library_files_folders_urls/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Library_files_folders_urls View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewLibrary_files_folders_urls extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewLibrary_files_folders_urls extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NEW' : 'COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('library_files_folders_urls.create') && $isNew)
 			{
diff --git a/admin/views/server/tmpl/edit.php b/admin/views/server/tmpl/edit.php
index 9d8e9edd9..f70b1fcec 100644
--- a/admin/views/server/tmpl/edit.php
+++ b/admin/views/server/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('server.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/server/view.html.php b/admin/views/server/view.html.php
index b3576c153..3c5b4c149 100644
--- a/admin/views/server/view.html.php
+++ b/admin/views/server/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Server View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewServer extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Get Linked view data
@@ -81,7 +86,7 @@ class ComponentbuilderViewServer extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_SERVER_NEW' : 'COM_COMPONENTBUILDER_SERVER_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('server.create') && $isNew)
 			{
diff --git a/admin/views/servers/view.html.php b/admin/views/servers/view.html.php
index 3e859be4b..fc9bfd2e1 100644
--- a/admin/views/servers/view.html.php
+++ b/admin/views/servers/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Servers
  */
diff --git a/admin/views/site_view/tmpl/edit.php b/admin/views/site_view/tmpl/edit.php
index 277028fe0..da811287c 100644
--- a/admin/views/site_view/tmpl/edit.php
+++ b/admin/views/site_view/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('site_view.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/site_view/view.html.php b/admin/views/site_view/view.html.php
index 02a719bf3..4caf3df21 100644
--- a/admin/views/site_view/view.html.php
+++ b/admin/views/site_view/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Site_view View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewSite_view extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewSite_view extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_SITE_VIEW_NEW' : 'COM_COMPONENTBUILDER_SITE_VIEW_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('core.create') && $isNew)
 			{
diff --git a/admin/views/site_views/view.html.php b/admin/views/site_views/view.html.php
index 8893852b5..0b317e2a2 100644
--- a/admin/views/site_views/view.html.php
+++ b/admin/views/site_views/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Site_views
  */
diff --git a/admin/views/snippet/tmpl/edit.php b/admin/views/snippet/tmpl/edit.php
index 48d1b41ff..521e2ba32 100644
--- a/admin/views/snippet/tmpl/edit.php
+++ b/admin/views/snippet/tmpl/edit.php
@@ -20,7 +20,7 @@ JHtml::_('behavior.keepalive');
 $componentParams = JComponentHelper::getParams('com_componentbuilder');
 ?>
 <div id="componentbuilder_loader">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('snippet.details_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/snippet/view.html.php b/admin/views/snippet/view.html.php
index 376b8e1a3..1141b73a5 100644
--- a/admin/views/snippet/view.html.php
+++ b/admin/views/snippet/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Snippet View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewSnippet extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewSnippet extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('core.create') && $isNew)
 			{
diff --git a/admin/views/snippet_type/tmpl/edit.php b/admin/views/snippet_type/tmpl/edit.php
index 8e417af4f..0dc1e34cf 100644
--- a/admin/views/snippet_type/tmpl/edit.php
+++ b/admin/views/snippet_type/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="form-horizontal">
 
diff --git a/admin/views/snippet_type/view.html.php b/admin/views/snippet_type/view.html.php
index dee1b0310..dfe0db139 100644
--- a/admin/views/snippet_type/view.html.php
+++ b/admin/views/snippet_type/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Snippet_type View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewSnippet_type extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewSnippet_type extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_SNIPPET_TYPE_NEW' : 'COM_COMPONENTBUILDER_SNIPPET_TYPE_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('snippet_type.create') && $isNew)
 			{
diff --git a/admin/views/snippet_types/view.html.php b/admin/views/snippet_types/view.html.php
index 17f4842fe..20fcf7d05 100644
--- a/admin/views/snippet_types/view.html.php
+++ b/admin/views/snippet_types/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Snippet_types
  */
diff --git a/admin/views/snippets/view.html.php b/admin/views/snippets/view.html.php
index 3063408ec..5b6418138 100644
--- a/admin/views/snippets/view.html.php
+++ b/admin/views/snippets/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Snippets
  */
diff --git a/admin/views/template/tmpl/edit.php b/admin/views/template/tmpl/edit.php
index 89567b70e..0c3b4da79 100644
--- a/admin/views/template/tmpl/edit.php
+++ b/admin/views/template/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 <div class="form-horizontal">
 	<div class="span9">
diff --git a/admin/views/template/view.html.php b/admin/views/template/view.html.php
index 2b99223d5..5952319a8 100644
--- a/admin/views/template/view.html.php
+++ b/admin/views/template/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Template View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewTemplate extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewTemplate extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_TEMPLATE_NEW' : 'COM_COMPONENTBUILDER_TEMPLATE_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('core.create') && $isNew)
 			{
diff --git a/admin/views/templates/view.html.php b/admin/views/templates/view.html.php
index 0d060636d..659901e13 100644
--- a/admin/views/templates/view.html.php
+++ b/admin/views/templates/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Templates
  */
diff --git a/admin/views/validation_rule/tmpl/edit.php b/admin/views/validation_rule/tmpl/edit.php
index d61388051..951ef51f7 100644
--- a/admin/views/validation_rule/tmpl/edit.php
+++ b/admin/views/validation_rule/tmpl/edit.php
@@ -42,7 +42,7 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 	});
 </script>
 <div id="componentbuilder_loader" style="display: none;">
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='.(int) $this->item->id.$this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&layout=edit&id='. (int) $this->item->id . $this->referral); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
 
 	<?php echo JLayoutHelper::render('validation_rule.extends_formrule_above', $this); ?>
 <div class="form-horizontal">
diff --git a/admin/views/validation_rule/view.html.php b/admin/views/validation_rule/view.html.php
index 42a50f7e4..22d639b72 100644
--- a/admin/views/validation_rule/view.html.php
+++ b/admin/views/validation_rule/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Validation_rule View class
  */
@@ -37,16 +34,24 @@ class ComponentbuilderViewValidation_rule extends JViewLegacy
 		$jinput = JFactory::getApplication()->input;
 		$this->ref = $jinput->get('ref', 0, 'word');
 		$this->refid = $jinput->get('refid', 0, 'int');
+		$return = $jinput->get('return', null, 'base64');
+		// set the referral string
 		$this->referral = '';
-		if ($this->refid)
+		if ($this->refid && $this->ref)
 		{
-			// return to the item that refered to this item
-			$this->referral = '&ref='.(string)$this->ref.'&refid='.(int)$this->refid;
+			// return to the item that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref . '&refid=' . (int)$this->refid;
 		}
 		elseif($this->ref)
 		{
-			// return to the list view that refered to this item
-			$this->referral = '&ref='.(string)$this->ref;
+			// return to the list view that referred to this item
+			$this->referral = '&ref=' . (string)$this->ref;
+		}
+		// check return value
+		if (!is_null($return))
+		{
+			// add the return value
+			$this->referral .= '&return=' . (string)$return;
 		}
 
 		// Set the toolbar
@@ -78,7 +83,7 @@ class ComponentbuilderViewValidation_rule extends JViewLegacy
 
 		JToolbarHelper::title( JText::_($isNew ? 'COM_COMPONENTBUILDER_VALIDATION_RULE_NEW' : 'COM_COMPONENTBUILDER_VALIDATION_RULE_EDIT'), 'pencil-2 article-add');
 		// Built the actions for new and existing records.
-		if ($this->refid || $this->ref)
+		if (ComponentbuilderHelper::checkString($this->referral))
 		{
 			if ($this->canDo->get('validation_rule.create') && $isNew)
 			{
diff --git a/admin/views/validation_rules/view.html.php b/admin/views/validation_rules/view.html.php
index aa9a5a0ef..b6763d14d 100644
--- a/admin/views/validation_rules/view.html.php
+++ b/admin/views/validation_rules/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Validation_rules
  */
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 47e28242e..deae1084b 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>2nd August, 2018</creationDate>
+	<creationDate>7th August, 2018</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/script.php b/script.php
index c8d8c0f28..a222eb457 100644
--- a/script.php
+++ b/script.php
@@ -13,8 +13,6 @@
 defined('_JEXEC') or die('Restricted access');
 
 JHTML::_('behavior.modal');
-jimport('joomla.installer.installer');
-jimport('joomla.installer.helper');
 
 /**
  * Script File of Componentbuilder Component
diff --git a/site/componentbuilder.php b/site/componentbuilder.php
index 98173600a..41c231cca 100644
--- a/site/componentbuilder.php
+++ b/site/componentbuilder.php
@@ -11,6 +11,7 @@
 
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
+JHtml::_('behavior.tabstate');
 
 // Set the component css/js
 $document = JFactory::getDocument();
@@ -18,22 +19,18 @@ $document->addStyleSheet('components/com_componentbuilder/assets/css/site.css');
 $document->addScript('components/com_componentbuilder/assets/js/site.js');
 
 // Require helper files
-JLoader::register('ComponentbuilderHelper', dirname(__FILE__) . '/helpers/componentbuilder.php'); 
+JLoader::register('ComponentbuilderHelper', __DIR__ . '/helpers/componentbuilder.php'); 
 JLoader::register('ComponentbuilderEmail', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/componentbuilderemail.php'); 
-JLoader::register('ComponentbuilderHelperRoute', dirname(__FILE__) . '/helpers/route.php'); 
+JLoader::register('ComponentbuilderHelperRoute', __DIR__ . '/helpers/route.php'); 
 
 // Triger the Global Site Event
 ComponentbuilderHelper::globalEvent($document);
 
-// import joomla controller library
-jimport('joomla.application.component.controller');
-
 // Get an instance of the controller prefixed by Componentbuilder
 $controller = JControllerLegacy::getInstance('Componentbuilder');
 
 // Perform the request task
-$jinput = JFactory::getApplication()->input;
-$controller->execute($jinput->get('task', null, 'CMD'));
+$controller->execute(JFactory::getApplication()->input->get('task'));
 
 // Redirect if set by the controller
 $controller->redirect();
diff --git a/site/controller.php b/site/controller.php
index a5777253c..0ffb2fb2f 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controller library
-jimport('joomla.application.component.controller');
-
 /**
  * Componentbuilder Component Controller
  */
diff --git a/site/controllers/api.php b/site/controllers/api.php
index 4eb4ad777..f65cbfdc0 100644
--- a/site/controllers/api.php
+++ b/site/controllers/api.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Componentbuilder Api Controller
  */
diff --git a/site/controllers/help.php b/site/controllers/help.php
index 0d9264b22..badee8a12 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla controllerform library
-jimport('joomla.application.component.controller');
-
 /**
  * Componentbuilder Help Controller
  */
diff --git a/site/helpers/route.php b/site/helpers/route.php
index 2f9973218..4abfe8f96 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -12,10 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// Component Helper
-jimport('joomla.application.component.helper');
-jimport('joomla.application.categories');
-
 /**
  * Componentbuilder Route Helper
  **/
diff --git a/site/models/api.php b/site/models/api.php
index b19b78e40..9fe91d092 100644
--- a/site/models/api.php
+++ b/site/models/api.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla modelitem library
-jimport('joomla.application.component.modelitem');
-
 /**
  * Componentbuilder Api Model
  */
diff --git a/site/views/api/view.html.php b/site/views/api/view.html.php
index 94153d144..cf7beda2e 100644
--- a/site/views/api/view.html.php
+++ b/site/views/api/view.html.php
@@ -12,9 +12,6 @@
 // No direct access to this file
 defined('_JEXEC') or die('Restricted access');
 
-// import Joomla view library
-jimport('joomla.application.component.view');
-
 /**
  * Componentbuilder View class for the Api
  */
