Added (Linked To) back in related areas, so we can see where what is linked. Added ajax fields to the custom admin view. Added some backward compatibility to stylesheets and scripts being added, resolved gh-217. Fixed gh-212 no access lang string. Added the site CSS area to Joomla Component view resolved gh-216.

2018-01-15 17:54:05 +02:00 · 2018-01-15 17:54:05 +02:00 · 98510ae504
commit 98510ae504
parent 423df415fa
144 changed files with 6453 additions and 5362 deletions
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.9) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th December, 2017
-+ *Version*: 2.6.9
+ *Last Build*: 15th January, 2018
+ *Version*: 2.6.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **178630**
-+ *Field count*: **1539**
-+ *File count*: **1147**
+ *Line count*: **179644**
+ *Field count*: **1571**
+ *File count*: **1151**
 + *Folder count*: **184**

 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/README.txt
+++ b/admin/README.txt
@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo

 Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have!

-You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.9) with **ALL** its features and **ALL** concepts totally open-source and free! 
+You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.10) with **ALL** its features and **ALL** concepts totally open-source and free! 

 > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45)

@ -126,13 +126,13 @@ Component Builder is mapped as a component in itself on my local development env
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 29th December, 2017
-+ *Version*: 2.6.9
+ *Last Build*: 15th January, 2018
+ *Version*: 2.6.10
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
-+ *Line count*: **178630**
-+ *Field count*: **1539**
-+ *File count*: **1147**
+ *Line count*: **179644**
+ *Field count*: **1571**
+ *File count*: **1151**
 + *Folder count*: **184**

 > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com).
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@ -43,6 +43,24 @@ abstract class ###Component###Helper
 		return simplexml_load_file($manifestUrl);
 	}
 	
+	/**
+	*	Joomla version object
+	**/	
+	protected static $JVersion;
+	
+	/**
+	*	set/get Joomla version
+	**/
+	public static function jVersion()
+	{
+		// check if set
+		if (!self::checkObject(self::$JVersion))
+		{
+			self::$JVersion = new JVersion();
+		}
+		return self::$JVersion;
+	}
+
 	/**
 	*	Load the Contributors details.
 	**/
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@ -75,6 +75,24 @@ abstract class ###Component###Helper
 		return simplexml_load_file($manifestUrl);
 	}
 	
+	/**
+	*	Joomla version object
+	**/	
+	protected static $JVersion;
+	
+	/**
+	*	set/get Joomla version
+	**/
+	public static function jVersion()
+	{
+		// check if set
+		if (!self::checkObject(self::$JVersion))
+		{
+			self::$JVersion = new JVersion();
+		}
+		return self::$JVersion;
+	}
+
 	/**
 	*	Load the Contributors details.
 	**/
--- a/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_custom_admin.php
@ -56,7 +56,7 @@ class ###Component###View###SView### extends JViewLegacy
 	protected function setDocument()
 	{###CUSTOM_ADMIN_LIBRARIES_LOADER### ###CUSTOM_ADMIN_DOCUMENT_METADATA### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP###
 		// add the document default css file
-		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sview###.css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
+		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sview###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
 	}

 	/**
--- a/admin/compiler/joomla_3/JViewLegacy_edit.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit.php
@ -122,9 +122,9 @@ class ###Component###View###View### extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css", array('version' => 'auto'));###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js", array('version' => 'auto')); ###DOCUMENT_CUSTOM_PHP###
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###view###.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
+		$this->document->addScript(JURI::root() . $this->script, (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_###component###/views/###view###/submitbutton.js", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); ###DOCUMENT_CUSTOM_PHP###
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/compiler/joomla_3/JViewLegacy_edit_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_edit_site.php
@ -127,13 +127,13 @@ class ###Component###View###View### extends JViewLegacy
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_###COMPONENT###_###VIEW###_NEW' : 'COM_###COMPONENT###_###VIEW###_EDIT'));
 		// we need this to fix the form display
-		$this->document->addStyleSheet(JURI::root()."administrator/templates/isis/css/template.css", array('version' => 'auto'));
-		$this->document->addScript(JURI::root()."administrator/templates/isis/js/template.js", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root()."administrator/templates/isis/css/template.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addScript(JURI::root()."administrator/templates/isis/js/template.js", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
 		// the default style of this view
-		$this->document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css", array('version' => 'auto'));###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
+		$this->document->addStyleSheet(JURI::root()."components/com_###component###/assets/css/###view###.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###AJAXTOKE### ###LINKEDVIEWTABLESCRIPTS###
 		// default javascript of this view
-		$this->document->addScript(JURI::root().$this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js", array('version' => 'auto')); ###DOCUMENT_CUSTOM_PHP###
+		$this->document->addScript(JURI::root().$this->script, (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root(). "components/com_###component###/views/###view###/submitbutton.js", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); ###DOCUMENT_CUSTOM_PHP###
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/compiler/joomla_3/JViewLegacy_list.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list.php
@ -202,7 +202,7 @@ class ###Component###View###Views### extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_###COMPONENT###_###VIEWS###'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###views###.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_###component###/assets/css/###views###.css", (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_custom_admin.php
@ -56,7 +56,7 @@ class ###Component###View###SViews### extends JViewLegacy
 	protected function setDocument()
 	{###CUSTOM_ADMIN_LIBRARIES_LOADER### ###CUSTOM_ADMIN_UIKIT_LOADER### ###CUSTOM_ADMIN_GOOGLECHART_LOADER### ###CUSTOM_ADMIN_FOOTABLE_LOADER### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_PHP###
 		// add the document default css file
-		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sviews###.css', array('version' => 'auto'));###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
+		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_###component###/assets/css/###sviews###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###CUSTOM_ADMIN_DOCUMENT_CUSTOM_CSS### ###CUSTOM_ADMIN_DOCUMENT_CUSTOM_JS###
 	}

 	/**
--- a/admin/compiler/joomla_3/JViewLegacy_list_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_list_site.php
@ -54,7 +54,7 @@ class ###Component###View###SViews### extends JViewLegacy
 	protected function _prepareDocument()
 	{###SITE_LIBRARIES_LOADER### ###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP###
 		// add the document default css file
-		$this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', array('version' => 'auto'));###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
+		$this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
 	}

 	/**
--- a/admin/compiler/joomla_3/JViewLegacy_site.php
+++ b/admin/compiler/joomla_3/JViewLegacy_site.php
@ -54,7 +54,7 @@ class ###Component###View###SView### extends JViewLegacy
 	protected function _prepareDocument()
 	{###SITE_LIBRARIES_LOADER### ###SITE_UIKIT_LOADER### ###SITE_GOOGLECHART_LOADER### ###SITE_FOOTABLE_LOADER### ###SITE_DOCUMENT_METADATA### ###SITE_DOCUMENT_CUSTOM_PHP### 
 		// add the document default css file
-		$this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', array('version' => 'auto'));###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
+		$this->document->addStyleSheet(JURI::root(true) .'/components/com_###component###/assets/css/###sview###.css', (###Component###Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');###SITE_DOCUMENT_CUSTOM_CSS### ###SITE_DOCUMENT_CUSTOM_JS###
 	}

 	/**
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@ -52,7 +52,7 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('getButton', 'ajax');
 		$this->registerTask('getButtonID', 'ajax');
 		$this->registerTask('getAjaxDisplay', 'ajax');
-		$this->registerTask('getSnippets', 'ajax');
+		$this->registerTask('getLinked', 'ajax');
 		$this->registerTask('templateDetails', 'ajax');
 		$this->registerTask('getLayoutDetails', 'ajax');
 		$this->registerTask('dbTableColumns', 'ajax');
@ -60,9 +60,10 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 		$this->registerTask('getDynamicValues', 'ajax');
 		$this->registerTask('checkFunctionName', 'ajax');
 		$this->registerTask('usedin', 'ajax');
+		$this->registerTask('fieldOptions', 'ajax');
 		$this->registerTask('snippetDetails', 'ajax');
 		$this->registerTask('setSnippetGithub', 'ajax');
-		$this->registerTask('fieldOptions', 'ajax');
+		$this->registerTask('getSnippets', 'ajax');
 	}

 	public function ajax()
@ -458,14 +459,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'getSnippets':
+				case 'getLinked':
 					try
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
-						$librariesValue = $jinput->get('libraries', NULL, 'STRING');
-						if($librariesValue && $user->id != 0)
+						$typeValue = $jinput->get('type', NULL, 'INT');
+						if($typeValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getSnippets($librariesValue);
+							$result = $this->getModel('ajax')->getLinked($typeValue);
 						}
 						else
 						{
@ -770,6 +771,44 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
+				case 'fieldOptions':
+					try
+					{
+						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
+						$idValue = $jinput->get('id', NULL, 'INT');
+						if($idValue)
+						{
+							$result = $this->getModel('ajax')->getFieldOptions($idValue);
+						}
+						else
+						{
+							$result = false;
+						}
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback . "(".json_encode($result).");";
+						}
+						elseif($returnRaw)
+						{
+							echo json_encode($result);
+						}
+						else
+						{
+							echo "(".json_encode($result).");";
+						}
+					}
+					catch(Exception $e)
+					{
+						if($callback = $jinput->get('callback', null, 'CMD'))
+						{
+							echo $callback."(".json_encode($e).");";
+						}
+						else
+						{
+							echo "(".json_encode($e).");";
+						}
+					}
+				break;
 				case 'snippetDetails':
 					try
 					{
@ -847,14 +886,14 @@ class ComponentbuilderControllerAjax extends JControllerLegacy
 						}
 					}
 				break;
-				case 'fieldOptions':
+				case 'getSnippets':
 					try
 					{
 						$returnRaw = $jinput->get('raw', false, 'BOOLEAN');
-						$idValue = $jinput->get('id', NULL, 'INT');
-						if($idValue)
+						$librariesValue = $jinput->get('libraries', NULL, 'STRING');
+						if($librariesValue && $user->id != 0)
 						{
-							$result = $this->getModel('ajax')->getFieldOptions($idValue);
+							$result = $this->getModel('ajax')->getSnippets($librariesValue);
 						}
 						else
 						{
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@ -989,17 +989,21 @@ class Get
 		}
 		unset($component->javascript);

-		// add_css
-		if ($component->add_css == 1)
+		// add global CSS
+		$addGlobalCss = array('admin', 'site');
+		foreach ($addGlobalCss as $area)
 		{
-			$this->customScriptBuilder['component_css'] = base64_decode($component->css);
+			// add_css if found
+			if (isset($component->{'add_css_'.$area}) && $component->{'add_css_'.$area} == 1 && isset($component->{'css_'.$area}) && ComponentbuilderHelper::checkString($component->{'css_'.$area}))
+			{
+				$this->customScriptBuilder['component_css_'.$area] = base64_decode($component->{'css_'.$area});
 			}
 			else
 			{
-			$this->customScriptBuilder['component_css'] = '';
+				$this->customScriptBuilder['component_css_'.$area] = '';
+			}
+			unset($component->{'css_'.$area});
 		}
-		unset($component->css);
-
 		// set the lang target
 		$this->lang = 'admin';
 		// add PHP in ADMIN
@ -1212,6 +1216,7 @@ class Get

 			// Load the results as a list of stdClass objects (see later for more options on retrieving data).
 			$view = $this->db->loadObject();
+
 			// setup view name to use in storing the data
 			$name_single = ComponentbuilderHelper::safeString($view->name_single);
 			$name_list = ComponentbuilderHelper::safeString($view->name_list);
@ -1613,6 +1618,7 @@ class Get
 			unset($this->placeholders['[[[Views]]]']);
 			unset($this->placeholders['[[[VIEW]]]']);
 			unset($this->placeholders['[[[VIEWS]]]']);
+
 			// store this view to class object
 			$this->_adminViewData[$id] = $view;
 		}
@ -1811,23 +1817,45 @@ class Get
 		// add_Ajax for this view
 		if (isset($view->add_php_ajax) && $view->add_php_ajax == 1)
 		{
+			// ajax target (since we only have two options really)
+			if ('site' === $this->target)
+			{
+				$target = 'site';
+			}
+			else
+			{
+				$target = 'admin';
+			}
+			$setAjax = false;
 			// check if controller input as been set
 			$view->ajax_input = (isset($view->ajax_input) && ComponentbuilderHelper::checkJson($view->ajax_input)) ? json_decode($view->ajax_input, true) : null;
 			if (ComponentbuilderHelper::checkArray($view->ajax_input))
 			{
-				$this->customScriptBuilder[$this->target]['ajax_controller'][$view->code] = array_values($view->ajax_input);
-				$this->addSiteAjax = true;
+				$this->customScriptBuilder[$target]['ajax_controller'][$view->code] = array_values($view->ajax_input);
+				$setAjax = true;
 			}
 			unset($view->ajax_input);
 			// load the ajax class mathods (if set)
 			if (ComponentbuilderHelper::checkString($view->php_ajaxmethod))
 			{
-
-				$this->customScriptBuilder[$this->target]['ajax_model'][$view->code] = $this->setDynamicValues(base64_decode($view->php_ajaxmethod));
-				$this->addSiteAjax = true;
+				$this->customScriptBuilder[$target]['ajax_model'][$view->code] = $this->setDynamicValues(base64_decode($view->php_ajaxmethod));
+				$setAjax = true;
 			}
 			// unset anyway
 			unset($view->php_ajaxmethod);
+			// should ajax be set
+			if ($setAjax)
+			{
+				// turn on ajax area
+				if ('site' === $this->target)
+				{
+					$this->addSiteAjax = true;
+				}
+				else
+				{
+					$this->addAjax = true;
+				}
+			}
 		}
 		// add the custom buttons
 		if (isset($view->add_custom_button) && $view->add_custom_button == 1)
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@ -3493,9 +3493,9 @@ class Interpretation extends Fields
 			$chart[] = PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " add the google chart builder class.";
 			$chart[] = "\t\trequire_once JPATH_COMPONENT_ADMINISTRATOR.'/helpers/chartbuilder.php';";
 			$chart[] = "\t\t//" . $this->setLine(__LINE__) . " load the google chart js.";
-			$chart[] = "\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/js/google.jsapi.js', array('version' => 'auto'));";
-			$chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', array('version' => 'auto'));";
-			$chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', array('version' => 'auto'));";
+			$chart[] = "\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/js/google.jsapi.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$chart[] = "\t\t\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			return implode(PHP_EOL, $chart);
 		}
 		return '';
@ -3699,11 +3699,11 @@ class Interpretation extends Fields
 			switch ($pathInfo['extension'])
 			{
 				case 'js':
-					return '$this->document->addScript(' . $JURI . '"' . $path . '", array("version" => "auto"));';
+					return '$this->document->addScript(' . $JURI . '"' . $path . '", (' . $this->fileContentStatic['###Component###'] . 'Helper::jVersion()->isCompatible("3.8.0")) ? array("version" => "auto") : "text/javascript");';
 					break;
 				case 'css':
 				case 'less':
-					return '$this->document->addStyleSheet(' . $JURI . '"' . $path . '", array("version" => "auto"));';
+					return '$this->document->addStyleSheet(' . $JURI . '"' . $path . '", (' . $this->fileContentStatic['###Component###'] . 'Helper::jVersion()->isCompatible("3.8.0")) ? array("version" => "auto") : "text/css");';
 					break;
 				case 'php':
 					if (strpos($path, 'http') === false)
@ -3765,12 +3765,12 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit css.";
 			$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . "\t\t{";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/uikit'.\$style.\$size.'.css', array('version' => 'auto'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/uikit'.\$style.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . "\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit js.";
 			$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . "\t\t{";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/uikit'.\$size.'.js', array('version' => 'auto'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/uikit'.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			$setter .= PHP_EOL . $tabV . "\t\t}";
 		}
 		// load the components need
@ -3818,13 +3818,13 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the css.";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', array('version' => 'auto'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t//" . $this->setLine(__LINE__) . " check if the JavaScript file exists.";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the js.";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t\t}";
@ -3847,13 +3847,13 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css'))";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the css.";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', array('version' => 'auto'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t//" . $this->setLine(__LINE__) . " check if the JavaScript file exists.";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\tif (JFile::exists(JPATH_ROOT.'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js'))";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t{";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t//" . $this->setLine(__LINE__) . " load the js.";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t\t}";
@ -3873,12 +3873,12 @@ class Interpretation extends Fields
 			$setter .= PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit css.";
 			$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . "\t\t{";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/css/uikit'.\$size.'.css', array('version' => 'auto'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/css/uikit'.\$size.'.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$setter .= PHP_EOL . $tabV . "\t\t}";
 			$setter .= PHP_EOL . $tabV . "\t\t//" . $this->setLine(__LINE__) . " The uikit js.";
 			$setter .= PHP_EOL . $tabV . "\t\tif ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
 			$setter .= PHP_EOL . $tabV . "\t\t{";
-			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/js/uikit'.\$size.'.js', array('version' => 'auto'));";
+			$setter .= PHP_EOL . $tabV . "\t\t\t\$this->document->addScript(JURI::root(true) .'/media/com_" . $this->fileContentStatic['###component###'] . "/uikit-v3/js/uikit'.\$size.'.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			$setter .= PHP_EOL . $tabV . "\t\t}";
 			if (2 == $this->uikit)
 			{
@ -5756,7 +5756,7 @@ class Interpretation extends Fields
 		$componentName = JFilterOutput::cleanText($this->componentData->name);
 		$this->langContent['adminsys'][$this->langPrefix] = $componentName;
 		$this->langContent['adminsys'][$this->langPrefix . '_CONFIGURATION'] = $componentName . ' Configuration';
-		$this->langContent[$this->lang][$this->langPrefix] = $componentName;
+		$this->langContent['admin'][$this->langPrefix] = $componentName;
 		$this->langContent['admin'][$this->langPrefix . '_BACK'] = 'Back';
 		$this->langContent['admin'][$this->langPrefix . '_DASH'] = 'Dashboard';
 		$this->langContent['admin'][$this->langPrefix . '_VERSION'] = 'Version';
@ -5781,6 +5781,8 @@ class Interpretation extends Fields
 		$this->langContent['admin'][$this->langPrefix . '_INACTIVE'] = 'Inactive';
 		$this->langContent['admin'][$this->langPrefix . '_ARCHIVED'] = 'Archived';
 		$this->langContent['admin'][$this->langPrefix . '_TRASHED'] = 'Trashed';
+		$this->langContent['admin'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
+		$this->langContent['admin'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";
 		if ($this->componentData->add_license && $this->componentData->license_type == 3)
 		{
 			$this->langContent['admin']['NIE_REG_NIE'] = "<br /><br /><center><h1>License not set for " . $componentName . ".</h1><p>Notify your administrator!<br />The license can be obtained from " . $this->componentData->companyname . ".</p></center>";
@ -5822,7 +5824,6 @@ class Interpretation extends Fields
 			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FILE_COLUMNS'] = "File Columns";
 			$this->langContent['admin'][$this->langPrefix . '_IMPORT_PLEASE_SELECT_COLUMN'] = "-- Please Select Column --";
 			$this->langContent['admin'][$this->langPrefix . '_IMPORT_IGNORE_COLUMN'] = "-- Ignore This Column --";
-			$this->langContent['admin'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
 		}
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
@ -5875,6 +5876,7 @@ class Interpretation extends Fields
 		$this->langContent['site'][$this->langPrefix . '_CREATE_NEW_S'] = "Create New %s";
 		$this->langContent['site'][$this->langPrefix . '_EDIT_S'] = "Edit %s";
 		$this->langContent['site'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
+		$this->langContent['site'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";

 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
@ -5910,6 +5912,7 @@ class Interpretation extends Fields
 		// add final list of needed lang strings
 		$this->langContent['sitesys'][$this->langPrefix] = ComponentbuilderHelper::safeString($this->componentData->name, 'W');
 		$this->langContent['sitesys'][$this->langPrefix . '_NO_ACCESS_GRANTED'] = "No Access Granted!";
+		$this->langContent['sitesys'][$this->langPrefix . '_NOT_FOUND_OR_ACCESS_DENIED'] = "Not found or access denied!";

 		// check if the both site array is set
 		if (isset($this->langContent['bothsite']) && ComponentbuilderHelper::checkArray($this->langContent['bothsite']))
@ -7176,22 +7179,22 @@ class Interpretation extends Fields
 		if (!isset($this->footableVersion) || 2 == $this->footableVersion) // loading version 2
 		{
 			$foo = PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the CSS for Footable.";
-			$foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.core.min.css', array('version' => 'auto'));";
+			$foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.core.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Use the Metro Style";
 			$foo .= PHP_EOL . "\t\tif (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)";
 			$foo .= PHP_EOL . "\t\t{";
-			$foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.metro.min.css', array('version' => 'auto'));";
+			$foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.metro.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . "\t\t}";
 			$foo .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Use the Legacy Style.";
 			$foo .= PHP_EOL . "\t\telseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)";
 			$foo .= PHP_EOL . "\t\t{";
-			$foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.standalone.min.css', array('version' => 'auto'));";
+			$foo .= PHP_EOL . "\t\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/css/footable.standalone.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . "\t\t}";
 			$foo .= PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable";
-			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.js', array('version' => 'auto'));";
-			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.sort.js', array('version' => 'auto'));";
-			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.filter.js', array('version' => 'auto'));";
-			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.paginate.js', array('version' => 'auto'));";
+			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.sort.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.filter.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
+			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v2/js/footable.paginate.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			if ($init)
 			{
 				$foo .= PHP_EOL . PHP_EOL . "\t\t" . '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery(' . "'.footable'" . ').footable(); }); jQuery(' . "'.nav-tabs'" . ').on(' . "'click'" . ', ' . "'li'" . ', function() { setTimeout(tableFix, 10); }); }); function tableFix() { jQuery(' . "'.footable'" . ').trigger(' . "'footable_resize'" . '); }";';
@ -7203,9 +7206,9 @@ class Interpretation extends Fields

 			$foo = PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the CSS for Footable";
 			$foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');";
-			$foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/css/footable.standalone.min.css', array('version' => 'auto'));";
+			$foo .= PHP_EOL . "\t\t\$this->document->addStyleSheet(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/css/footable.standalone.min.css', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
 			$foo .= PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add the JavaScript for Footable (adding all funtions)";
-			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/js/footable.min.js', array('version' => 'auto'));";
+			$foo .= PHP_EOL . "\t\t\$this->document->addScript(JURI::root() .'media/com_" . $this->fileContentStatic['###component###'] . "/footable-v3/js/footable.min.js', (" . $this->fileContentStatic['###Component###'] . "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
 			if ($init)
 			{
 				$foo .= PHP_EOL . PHP_EOL . "\t\t" . '$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery(' . "'.footable'" . ').footable();});});";';
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@ -173,9 +173,9 @@ class Infusion extends Interpretation
 			$this->fileContentStatic['###SITEJS###'] = $this->setPlaceholders($this->customScriptBuilder['component_js'], $this->placeholders);

 			// ###ADMINCSS###
-			$this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
+			$this->fileContentStatic['###ADMINCSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css_admin'], $this->placeholders);
 			// ###SITECSS###
-			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css'], $this->placeholders);
+			$this->fileContentStatic['###SITECSS###'] = $this->setPlaceholders($this->customScriptBuilder['component_css_site'], $this->placeholders);

 			// ###CUSTOM_HELPER_SCRIPT###
 			$this->fileContentStatic['###CUSTOM_HELPER_SCRIPT###'] = $this->setPlaceholders($this->customScriptBuilder['component_php_helper_admin'], $this->placeholders);
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@ -1854,6 +1854,24 @@ abstract class ComponentbuilderHelper
 		return simplexml_load_file($manifestUrl);
 	}
 	
+	/**
+	*	Joomla version object
+	**/	
+	protected static $JVersion;
+	
+	/**
+	*	set/get Joomla version
+	**/
+	public static function jVersion()
+	{
+		// check if set
+		if (!self::checkObject(self::$JVersion))
+		{
+			self::$JVersion = new JVersion();
+		}
+		return self::$JVersion;
+	}
+
 	/**
 	*	Load the Contributors details.
 	**/
@ -2018,6 +2036,11 @@ abstract class ComponentbuilderHelper
 		{
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_SNIPPETS'), 'index.php?option=com_componentbuilder&view=snippets', $submenu === 'snippets');
 		}
+		// Access control (get_snippets.submenu).
+		if ($user->authorise('get_snippets.submenu', 'com_componentbuilder'))
+		{
+			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_GET_SNIPPETS'), 'index.php?option=com_componentbuilder&view=get_snippets', $submenu === 'get_snippets');
+		}
 		if ($user->authorise('field.access', 'com_componentbuilder') && $user->authorise('field.submenu', 'com_componentbuilder'))
 		{
 			JHtmlSidebar::addEntry(JText::_('COM_COMPONENTBUILDER_SUBMENU_FIELDS'), 'index.php?option=com_componentbuilder&view=fields', $submenu === 'fields');
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@ -598,6 +598,8 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION="Some Short
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION="<hr /><h4>Linked Fields <span id='header_admin_fields_buttons'></span></h4><div id='display_admin_fields'>Display of the fields will load here!</div><hr /><h4>Field Conditions <span id='header_admin_fields_conditions_buttons'></span></h4><div id='display_admin_fields_conditions'>Display of the fields conditions will load here!</div>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION="<h5>Welcome to the new improved fields and conditions layout.</h5><p>We had to remove the repeatable fields layouts since Joomla has depreciated it. With this new improved layout we trust your experience will be better then ever before.</p><p>You can still <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=32m28s' target='_blank'>watch the tutorials</a>, and though it was made during the time repeatable fields were still being used, the various concepts and layouts still look mostly the same.</p>"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields &amp; Conditions"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
+COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION="You can link other views that has relationship with this view. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=22m20s' target='_blank'>tutorial</a> for more info. "
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL="Linked Views Options"
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION="Only if you add permissions here will this view have permissions. Please watch this <a href='https://youtu.be/CdSKSCTzmRA?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&t=6m19s' target='_blank'>tutorial</a> for more info."
@ -2466,6 +2468,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION="Add Java
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JAVASCRIPT_FILE_LABEL="Add JavaScript (file)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT="Add Js Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL="Add JS (custom document script)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX="Add Php Ajax"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL="Add PHP (AJAX)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT="Add Php Document"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL="Add PHP (custom document script)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW="Add Php Jview"
@ -2474,7 +2478,11 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL="Add PHP (cus
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL="Add PHP (custom JViewLegacy methods)"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW="Add Php View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL="Add PHP (custom view script)"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT="Ajax Input"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT_LABEL="Ajax Input"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALNUM="ALNUM"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARCHIVE="Archive"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARRAY="ARRAY"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN="Arrow Down"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN_FOUR="Arrow Down 4"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARROW_DOWN_THREE="Arrow Down 3"
@ -2497,10 +2505,12 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ATTACHMENT="Attachment"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BACKWARD_CIRCLE="Backward Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BAN_CIRCLE="Ban Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BARS="Bars"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BASESIXTY_FOUR="BASE64"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BASKET="Basket"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOK="Book"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOKMARK="Bookmark"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOKMARK_TWO="Bookmark 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOLEAN="BOOLEAN"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOTH="Both"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOX_ADD="Box Add"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOX_REMOVE="Box Remove"
@ -2522,6 +2532,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CHECKMARK_CIRCLE="Checkmark Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CHECKMARK_TWO="Checkmark 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CIRCLE="Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CLOCK="Clock"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CMD="CMD"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME="Codename"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_DESCRIPTION="Add Name in Code Here"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CODENAME_HINT="codename"
@ -2598,6 +2609,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FIRST="First"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLAG="Flag"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLAG_THREE="Flag 3"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLASH="Flash"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLOAT="FLOAT"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FOLDER_CLOSE="Folder Close"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FOLDER_MINUS="Folder Minus"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FOLDER_OPEN="Folder Open"
@ -2617,6 +2629,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEART="Heart"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEART_TWO="Heart 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME="Home"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HOME_TWO="Home 2"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HTML="HTML"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_DESCRIPTION="Joomla Standard Icomoon Fonts"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICOMOON_LABEL="Icon"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON="Icon"
@ -2627,6 +2640,13 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGE="Image"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_IMAGES="Images"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO="Info"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INFO_CIRCLE="Info Circle"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION="Enter default input value"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_HINT="Default Value Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_LABEL="Default"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_MESSAGE="Error! Please add default input value here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_DESCRIPTION="Select the filter used to sanitized the input value."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_LABEL="Select a Filter"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INT="INT"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_CSS="JavaScript & CSS"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE="Javascript File"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_JAVASCRIPT_FILE_DESCRIPTION="Add your JavaScript here! [Do not add the script tags]"
@ -2644,6 +2664,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL="Libraries"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINK="Link"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST="List"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIST_TWO="List 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LOCATION="Location"
@ -2659,6 +2680,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_DESCRIPTION="Add Controller Method
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_HINT="methodName"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_LABEL="Target Controller Method"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_MESSAGE="Error! Please add controller method name here."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_DESCRIPTION="Enter method name."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_HINT="Method Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_LABEL="Method Name"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_MESSAGE="Error! Please add method name here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS="Minus"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MINUS_SIGN="Minus Sign"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_MOBILE="Mobile"
@ -2682,6 +2707,8 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION="<co
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL="Add Language String"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the <span id='open-libraries'>libraries</span> for more details."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTIFICATION="Notification"
@ -2694,6 +2721,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_CENTER="Paragraph Center"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_JUSTIFY="Paragraph Justify"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_LEFT="Paragraph Left"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PARAGRAPH_RIGHT="Paragraph Right"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PATH="PATH"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PAUSE="Pause"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PAUSE_CIRCLE="Pause Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PENCIL="Pencil"
@ -2702,6 +2730,10 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE="Phone"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHONE_TWO="Phone 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP="PHP"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD="Php Ajaxmethod"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_HINT="// PHP Method that should run in the AJAX Model"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL="php Ajax Method"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER="Php Controller"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION="Add your PHP here! [Do not add the php tags]"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT="// PHP methods for the controller that the button will target"
@ -2744,6 +2776,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_QUESTION_TWO="Question 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_QUOTES_LEFT="Quotes Left"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_QUOTES_RIGHT="Quotes Right"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_RADIO_UNCHECKED="Radio Unchecked"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_RAW="RAW"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_REPLY="Reply"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SAVE_COPY="Save Copy"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SAVE_NEW="Save New"
@ -2774,6 +2807,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STAR_TWO="Star 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STATUS="Status"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STOP="Stop"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STOP_CIRCLE="Stop Circle"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STRING="STRING"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SUPPORT="Support"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SWITCH="Switch"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_SYSTEM_NAME="System Name"
@ -2788,22 +2822,35 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TAGS_TWO="Tags 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TAG_TWO="Tag 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TARGET_DESCRIPTION="Set the target view type"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TARGET_LABEL="Target"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_DESCRIPTION="Enter Task Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_HINT="Task Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_LABEL="Task Name"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_MESSAGE="Error! Please add task name here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_THUMBS_DOWN="Thumbs Down"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_THUMBS_UP="Thumbs Up"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UINT="UINT"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNARCHIVE="Unarchive"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNBLOCK="Unblock"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNDO="Undo"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNDO_TWO="Undo 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNFEATURED="Unfeatured"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNKNOWN="unknown"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNLOCK="Unlock"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNPUBLISH="Unpublish"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UPLOAD="Upload"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER="User"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USERNAME="USERNAME"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USERS="Users"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_DESCRIPTION="Allow only users."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_LABEL="User Check"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_DESCRIPTION="Enter Value Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_HINT="Value Name Here"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_LABEL="Value Name"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_MESSAGE="Error! Please add value name here."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VCARD="Vcard"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_DESC="A count of the number of times this Custom Admin View has been revised."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VERSION_LABEL="Revision"
@ -2811,6 +2858,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WAND="Wand"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WARNING="Warning"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WARNING_CIRCLE="Warning Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WIFI="Wifi"
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WORD="WORD"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WRENCH="Wrench"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES="Yes"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YOUTUBE="Youtube"
@ -3276,6 +3324,8 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_NN="nn"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NO="No"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEMS_DESCRIPTION="Fields are in the $item Object."
 COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_CALCULATION_ITEM_DESCRIPTION="Fields are in the $data Object."
+COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
+COM_COMPONENTBUILDER_DYNAMIC_GET_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_EQUAL="not equal"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_GREATER_THAN="not greater than"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NOT_IN="NOT IN"
@ -3359,7 +3409,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_TAGS="Tags"
 COM_COMPONENTBUILDER_DYNAMIC_GET_THIS="This"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TT="tt"
 COM_COMPONENTBUILDER_DYNAMIC_GET_TWEAK="Tweak"
-COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Set Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"
@ -3678,7 +3728,10 @@ COM_COMPONENTBUILDER_FIELD_NEW="A New Field"
 COM_COMPONENTBUILDER_FIELD_NO="No"
 COM_COMPONENTBUILDER_FIELD_NONE="None"
 COM_COMPONENTBUILDER_FIELD_NONE_SET="None Set"
-COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<b>The available values for the filter attribute are:</b><br />
+COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<div class='form-horizontal'>
+<div class='span6'>
+<h1>Filter Information</h1>
+<b>The available values for the filter attribute are:</b><br />
 <p>
    <code>INT</code>  - An integer,<br />
    <code>UINT</code>  - An unsigned integer,<br />
@ -3695,8 +3748,13 @@ COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION="<b>The available
    <code>USERNAME</code>  - Do not use (use an application specific filter),<br />
    <code>RAW</code>  - The raw string is returned with no filtering,<br />
    <code>unknown</code>  - An unknown filter will act like STRING. If the input is an array it will return an array of fully decoded and sanitized strings.
-                </p>"
-COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_LABEL="Filter Information"
+</p>
+</div>
+<div class='span6'>
+<h1>Linked To</h1>
+<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>
+</div>
+</div>"
 COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_DESCRIPTION="When using the VDM encryption you need to get a VDM public key from https://www.vdm.io/ "
 COM_COMPONENTBUILDER_FIELD_NOTE_VDM_ENCRYPTION_LABEL="The VDM Encryption"
 COM_COMPONENTBUILDER_FIELD_NOT_NULL="NOT NULL"
@ -4093,8 +4151,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDUIKIT_LABEL="Add Uikit"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT="Add Admin Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_ADMIN_EVENT_LABEL="Add Global Admin Event"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_BOTH_VTWO_AMP_VTHREE="Add Both v2 &amp; v3"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS="Add Css"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_LABEL="Add CSS"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN="Add Css Admin"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN_LABEL="Add CSS (admin)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE="Add Css Site"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE_LABEL="Add CSS (site)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER="Add Email Helper"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_DESCRIPTION="Adding the email helper class, that can be used to send emails."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_EMAIL_HELPER_LABEL="Add Email Helper"
@ -4176,10 +4236,14 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATED_DATE_DESC="The date this Joomla Co
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATED_DATE_LABEL="Created Date"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER="Creatuserhelper"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CREATUSERHELPER_LABEL="Add Create User Helper Method"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS="Css"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_HINT="// CSS for the entire back-end"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_LABEL="CSS"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN="Css Admin"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_HINT="// CSS for the entire back-end of your component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL="CSS (admin)"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE="Css Site"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION="Add your CSS here! [Do not add the style tags]"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT="// CSS for the entire front-end of your component"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL="CSS (site)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE="Custom (used in custom code)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DEBUG_LINENR="Debug Linenr"
@ -5019,6 +5083,7 @@ COM_COMPONENTBUILDER_LIBRARY_KEY_WORD_ANY_CASESENSITIVE_ONLY_FOUR_TEXT_FIELD="Ke
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_DESCRIPTION="Select the libraries you want to bundle here."
 COM_COMPONENTBUILDER_LIBRARY_LIBRARIES_LABEL="Libraries"
+COM_COMPONENTBUILDER_LIBRARY_LINKED="Linked"
 COM_COMPONENTBUILDER_LIBRARY_MAIN="Main"
 COM_COMPONENTBUILDER_LIBRARY_MAX_LENGTH_ONLY_FOUR_TEXT_FIELD="Max Length (only 4 text_field)"
 COM_COMPONENTBUILDER_LIBRARY_MIN_LENGTH_ONLY_FOUR_TEXT_FIELD="Min Length (only 4 text_field)"
@ -5042,6 +5107,8 @@ COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION="<h4>Linked
 COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION="<h4>Linked Files, Folders & URLs <span id='header_library_files_folders_urls_buttons'></span></h4><div id='display_library_files_folders_urls' >Display of the files, folders & urls will load here!</div>"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION="Watch a <a href='https://www.youtube.com/watch?v=rDjvgLYOt1o&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE' target='_blank'>tutorial overview</a> of the new library manager concept."
 COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_LABEL="Quick overview"
+COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
+COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL="No Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION="There is no behaviour set for this library. This means JCB will not add any files unless you custom code it in somewhere."
@ -5102,13 +5169,14 @@ COM_COMPONENTBUILDER_NEW_MEANS_THAT_WE_COULD_NOT_FIND_A_LOCAL_SNIPPET_WITH_THE_S
 COM_COMPONENTBUILDER_NEW_NOTICE="New Notice"
 COM_COMPONENTBUILDER_NO="No"
 COM_COMPONENTBUILDER_NOTRANSLATION="no-translation"
-COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found, or access denied."
+COM_COMPONENTBUILDER_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
 COM_COMPONENTBUILDER_NOT_SET="not set"
 COM_COMPONENTBUILDER_NO_ACCESS_GRANTED="No Access Granted!"
 COM_COMPONENTBUILDER_NO_COMPONENTS_WERE_SELECTED_PLEASE_MAKE_A_SELECTION_AND_TRY_AGAIN="No components were selected, please make a selection and try again!"
 COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_FOR_S="No cronjob path found for (%s)"
 COM_COMPONENTBUILDER_NO_CRONJOB_PATH_FOUND_SINCE_INCORRECT_TYPE_REQUESTED="No cronjob path found since incorrect type requested."
 COM_COMPONENTBUILDER_NO_FILES_LINKED="No Files Linked"
+COM_COMPONENTBUILDER_NO_FOUND="No Found"
 COM_COMPONENTBUILDER_NO_ITEM_FOUND="No Item Found"
 COM_COMPONENTBUILDER_NO_KEYS_WERE_FOUND_TO_ADD_AN_EXPORT_KEY_SIMPLY_OPEN_THE_COMPONENT_GO_TO_THE_TAB_CALLED_SETTINGS_BOTTOM_RIGHT_THERE_IS_A_FIELD_CALLED_EXPORT_KEY="No keys were found. To add an export key simply open the component, go to the tab called settings, bottom right there is a field called Export Key."
 COM_COMPONENTBUILDER_NO_NEED_TO_GET_IT_SINCE_IT_IS_ALREADY_IN_SYNC_WITH_YOUR_LOCAL_VERSION="No need to get it since it is already in sync with your local version"
@ -5425,6 +5493,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
 COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL="Libraries"
 COM_COMPONENTBUILDER_SITE_VIEW_LINK="Link"
+COM_COMPONENTBUILDER_SITE_VIEW_LINKED_COMPONENTS="Linked - Components"
 COM_COMPONENTBUILDER_SITE_VIEW_LIST="List"
 COM_COMPONENTBUILDER_SITE_VIEW_LIST_TWO="List 2"
 COM_COMPONENTBUILDER_SITE_VIEW_LOCATION="Location"
@ -5469,6 +5538,8 @@ COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_LABEL="Add Language Stri
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_CUSTOM_TOOLBAR_PLACEHOLDER_DESCRIPTION="Use this placeholder in the body <code>[[[SITE_TOOLBAR]]]</code> to add the custom position of the toolbar."
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION="All libraries you select will dynamically be added to the header of the page according to the settings of the selected library. Each library will also get its respective buttons added to the component global options if it has any set. Please take a look at the <span id='open-libraries'>libraries</span> for more details."
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL="Select libraries you would like to use in your code"
+COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION="<div id='display_linked_to'>Searching the database.<span class='loading-dots'></span></div>"
+COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_LABEL="Linked To"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL="Snippet Usage"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL="Snippet Details"
 COM_COMPONENTBUILDER_SITE_VIEW_NOTIFICATION="Notification"
@ -5832,6 +5903,7 @@ COM_COMPONENTBUILDER_SUBMENU_DYNAMIC_GETS="Dynamic Gets"
 COM_COMPONENTBUILDER_SUBMENU_FIELDS="Fields"
 COM_COMPONENTBUILDER_SUBMENU_FIELDTYPES="Fieldtypes"
 COM_COMPONENTBUILDER_SUBMENU_FTPS="FTP's"
+COM_COMPONENTBUILDER_SUBMENU_GET_SNIPPETS="Get Snippets"
 COM_COMPONENTBUILDER_SUBMENU_HELP_DOCUMENTS="Help Documents"
 COM_COMPONENTBUILDER_SUBMENU_JOOMLA_COMPONENTS="Joomla Components"
 COM_COMPONENTBUILDER_SUBMENU_LANGUAGES="Languages"
@ -5985,6 +6057,8 @@ COM_COMPONENTBUILDER_THE_COMPONENT_MYSQL_TWEAKS="The component mysql tweaks"
 COM_COMPONENTBUILDER_THE_COMPONENT_SITE_VIEWS="The component site views"
 COM_COMPONENTBUILDER_THE_COMPONENT_UPDATES="The component updates"
 COM_COMPONENTBUILDER_THE_KEY_OF_THIS_PACKAGE="The key of this package."
+COM_COMPONENTBUILDER_THE_LIBRARY_CONFIG_FIELDS="The library config fields"
+COM_COMPONENTBUILDER_THE_LIBRARY_FILES_FOLDERS_URLS="The library files, folders & URLs"
 COM_COMPONENTBUILDER_THE_NAME_OF_THIS_LIBRARY_BSB_CAN_NOT_BE_CHANGED_TO_BSB_OR_THINGS_WILL_BREAK="The name of this library (<b>%s</b>) can not be changed to <b>%s</b> or things will break."
 COM_COMPONENTBUILDER_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
 COM_COMPONENTBUILDER_THE_PACKAGE_KEY_IS_CODESCODE="The package key is: <code>%s</code>"
@ -5994,7 +6068,7 @@ COM_COMPONENTBUILDER_THE_SEARCH_FOR_THE_SNIPPETS_ARE_CASE_SENSITIVE_SO_IF_YOU_CH
 COM_COMPONENTBUILDER_THE_SNIPPETS_WERE_SUCCESSFULLY_EXPORTED="The Snippets Were Successfully Exported!"
 COM_COMPONENTBUILDER_THE_SNIPPET_WAS_SUCCESSFULLY_EXPORTED="The Snippet Was Successfully Exported!"
 COM_COMPONENTBUILDER_THE_WIKI_IS_LOADING="The wiki is loading"
-COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_S="This <b>%s</b> is not linked to any (%s)!"
+COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME="This <b>%s</b> is not linked to any other areas of JCB at this time!"
 COM_COMPONENTBUILDER_THIS_PACKAGE_HAS_NO_KEY="This package has no key."
 COM_COMPONENTBUILDER_TITLE="Title"
 COM_COMPONENTBUILDER_TOTAL_DOWNLOADS="total downloads"
--- a/admin/layouts/admin_view/details_fullwidth.php
+++ b/admin/layouts/admin_view/details_fullwidth.php
@ -0,0 +1,48 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		details_fullwidth.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_linked_to_notice'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>
--- a/admin/layouts/custom_admin_view/linked_components_fullwidth.php
+++ b/admin/layouts/custom_admin_view/linked_components_fullwidth.php
@ -0,0 +1,48 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		linked_components_fullwidth.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_linked_to_notice'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>
--- a/admin/layouts/custom_admin_view/php_fullwidth.php
+++ b/admin/layouts/custom_admin_view/php_fullwidth.php
@ -30,6 +30,9 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();

 $fields = $displayData->get('fields') ?: array(
+	'add_php_ajax',
+	'php_ajaxmethod',
+	'ajax_input',
 	'add_php_document',
 	'php_document',
 	'add_php_view',
--- a/admin/layouts/dynamic_get/main_fullwidth.php
+++ b/admin/layouts/dynamic_get/main_fullwidth.php
@ -30,7 +30,8 @@ defined('_JEXEC') or die('Restricted access');
 $form = $displayData->getForm();

 $fields = $displayData->get('fields') ?: array(
-	'php_custom_get'
+	'php_custom_get',
+	'note_linked_to_notice'
 );

 ?>
--- a/admin/layouts/fieldtype/fields_fullwidth.php
+++ b/admin/layouts/fieldtype/fields_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vzyfields;
+$items	= $displayData->waafields;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=fields&task=field.edit";
--- a/admin/layouts/ftp/linked_components_fullwidth.php
+++ b/admin/layouts/ftp/linked_components_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vzzlinked_components;
+$items	= $displayData->wablinked_components;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=joomla_components&task=joomla_component.edit";
--- a/admin/layouts/joomla_component/libs_helpers_fullwidth.php
+++ b/admin/layouts/joomla_component/libs_helpers_fullwidth.php
@ -46,8 +46,10 @@ $fields = $displayData->get('fields') ?: array(
 	'php_site_event',
 	'add_javascript',
 	'javascript',
-	'add_css',
-	'css'
+	'add_css_admin',
+	'css_admin',
+	'add_css_site',
+	'css_site'
 );

 ?>
--- a/admin/layouts/joomla_component/translation_fullwidth.php
+++ b/admin/layouts/joomla_component/translation_fullwidth.php
@ -28,7 +28,7 @@
 defined('_JEXEC') or die('Restricted access');

 // set the defaults
-$items	= $displayData->vwmtranslation;
+$items	= $displayData->vwntranslation;
 $user	= JFactory::getUser();
 $id	= $displayData->item->id;
 $edit = "index.php?option=com_componentbuilder&view=language_translations&task=language_translation.edit";
--- a/admin/layouts/library/linked_fullwidth.php
+++ b/admin/layouts/library/linked_fullwidth.php
@ -0,0 +1,48 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		linked_fullwidth.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_linked_to_notice'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>
--- a/admin/layouts/site_view/linked_components_fullwidth.php
+++ b/admin/layouts/site_view/linked_components_fullwidth.php
@ -0,0 +1,48 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |                                                                 
+                                                        |_| 				
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		2.6.x
+	@created		30th April, 2015
+	@package		Component Builder
+	@subpackage		linked_components_fullwidth.php
+	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
+	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
+	
+	Builds Complex Joomla Components 
+                                                             
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+
+defined('_JEXEC') or die('Restricted access');
+
+$form = $displayData->getForm();
+
+$fields = $displayData->get('fields') ?: array(
+	'note_linked_to_notice'
+);
+
+?>
+<div class="form-vertical">
+<?php foreach($fields as $field): ?>
+    <div class="control-group">
+        <div class="control-label">
+            <?php echo $form->getLabel($field); ?>
+        </div>
+        <div class="controls">
+            <?php echo $form->getInput($field); ?>
+        </div>
+    </div>
+<?php endforeach; ?>
+</div>
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@ -166,12 +166,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_batchmove = base64_decode($item->php_batchmove);
 			}

-			if (!empty($item->php_getlistquery))
-			{
-				// base64 Decode php_getlistquery.
-				$item->php_getlistquery = base64_decode($item->php_getlistquery);
-			}
-
 			if (!empty($item->php_allowedit))
 			{
 				// base64 Decode php_allowedit.
@ -196,6 +190,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import = base64_decode($item->php_import);
 			}

+			if (!empty($item->php_getlistquery))
+			{
+				// base64 Decode php_getlistquery.
+				$item->php_getlistquery = base64_decode($item->php_getlistquery);
+			}
+
+			if (!empty($item->php_getitem))
+			{
+				// base64 Decode php_getitem.
+				$item->php_getitem = base64_decode($item->php_getitem);
+			}
+
 			if (!empty($item->php_getitems_after_all))
 			{
 				// base64 Decode php_getitems_after_all.
@ -250,12 +256,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 				$item->php_import_display = base64_decode($item->php_import_display);
 			}

-			if (!empty($item->php_getitem))
-			{
-				// base64 Decode php_getitem.
-				$item->php_getitem = base64_decode($item->php_getitem);
-			}
-
 			if (!empty($item->php_import_save))
 			{
 				// base64 Decode php_import_save.
@ -1282,12 +1282,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_batchmove'] = base64_encode($data['php_batchmove']);
 		}

-		// Set the php_getlistquery string to base64 string.
-		if (isset($data['php_getlistquery']))
-		{
-			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
-		}
-
 		// Set the php_allowedit string to base64 string.
 		if (isset($data['php_allowedit']))
 		{
@ -1312,6 +1306,18 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import'] = base64_encode($data['php_import']);
 		}

+		// Set the php_getlistquery string to base64 string.
+		if (isset($data['php_getlistquery']))
+		{
+			$data['php_getlistquery'] = base64_encode($data['php_getlistquery']);
+		}
+
+		// Set the php_getitem string to base64 string.
+		if (isset($data['php_getitem']))
+		{
+			$data['php_getitem'] = base64_encode($data['php_getitem']);
+		}
+
 		// Set the php_getitems_after_all string to base64 string.
 		if (isset($data['php_getitems_after_all']))
 		{
@ -1366,12 +1372,6 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 			$data['php_import_display'] = base64_encode($data['php_import_display']);
 		}

-		// Set the php_getitem string to base64 string.
-		if (isset($data['php_getitem']))
-		{
-			$data['php_getitem'] = base64_encode($data['php_getitem']);
-		}
-
 		// Set the php_import_save string to base64 string.
 		if (isset($data['php_import_save']))
 		{
--- a/admin/models/admin_views.php
+++ b/admin/models/admin_views.php
@ -268,8 +268,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->php_save = base64_decode($item->php_save);
 						// decode php_batchmove
 						$item->php_batchmove = base64_decode($item->php_batchmove);
-						// decode php_getlistquery
-						$item->php_getlistquery = base64_decode($item->php_getlistquery);
 						// decode php_allowedit
 						$item->php_allowedit = base64_decode($item->php_allowedit);
 						// decode php_after_publish
@ -278,6 +276,10 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->php_getitems = base64_decode($item->php_getitems);
 						// decode php_import
 						$item->php_import = base64_decode($item->php_import);
+						// decode php_getlistquery
+						$item->php_getlistquery = base64_decode($item->php_getlistquery);
+						// decode php_getitem
+						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_getitems_after_all
 						$item->php_getitems_after_all = base64_decode($item->php_getitems_after_all);
 						// decode php_before_save
@ -296,8 +298,6 @@ class ComponentbuilderModelAdmin_views extends JModelList
 						$item->sql = base64_decode($item->sql);
 						// decode php_import_display
 						$item->php_import_display = base64_decode($item->php_import_display);
-						// decode php_getitem
-						$item->php_getitem = base64_decode($item->php_getitem);
 						// decode php_import_save
 						$item->php_import_save = base64_decode($item->php_import_save);
 						// decode css_view
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@ -826,7 +826,7 @@ class ComponentbuilderModelAjax extends JModelList
 	protected function addEditLink($id, $view, $views)
 	{
 		// can edit
-		if ($this->canEdit($id))
+		if ($this->canEdit($id, $view))
 		{
 			$edit = "index.php?option=com_componentbuilder&view=".$views."&task=".$view.".edit&id=".$id.$this->ref;
 			return ' <a onclick="UIkit.modal.confirm(\''.JText::_('COM_COMPONENTBUILDER_ALL_UNSAVED_WORK_ON_THIS_PAGE_WILL_BE_LOST_ARE_YOU_SURE_YOU_WANT_TO_CONTINUE').'\', function(){ window.location.href = \''.$edit.'\' })"  href="javascript:void(0)" class="uk-icon-pencil"></a>';
@ -971,23 +971,20 @@ class ComponentbuilderModelAjax extends JModelList

 	public function getFieldSelectOptions($id)
 	{		 
-		// Get a db connection.
-		$db = JFactory::getDbo();
-		 
 		// Create a new query object.
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.xml', 'b.name')));
-		$query->from($db->quoteName('#__componentbuilder_field', 'a'));
-		$query->join('LEFT', $db->quoteName('#__componentbuilder_fieldtype', 'b') . ' ON (' . $db->quoteName('a.fieldtype') . ' = ' . $db->quoteName('b.id') . ')');
-		$query->where($db->quoteName('a.published') . ' = 1');
-		$query->where($db->quoteName('a.id') . ' = '. (int) $id);
+		$query = $this->_db->getQuery(true);
+		$query->select($this->_db->quoteName(array('a.xml', 'b.name')));
+		$query->from($this->_db->quoteName('#__componentbuilder_field', 'a'));
+		$query->join('LEFT', $this->_db->quoteName('#__componentbuilder_fieldtype', 'b') . ' ON (' . $this->_db->quoteName('a.fieldtype') . ' = ' . $this->_db->quoteName('b.id') . ')');
+		$query->where($this->_db->quoteName('a.published') . ' = 1');
+		$query->where($this->_db->quoteName('a.id') . ' = '. (int) $id);
 		 
 		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-		$db->execute();
-		if ($db->getNumRows())
+		$this->_db->setQuery($query);
+		$this->_db->execute();
+		if ($this->_db->getNumRows())
 		{
-			$result		= $db->loadObject();
+			$result		= $this->_db->loadObject();
 			$result->name	= strtolower($result->name);
 			if (ComponentbuilderHelper::typeField($result->name,'list'))
 			{
@ -1056,10 +1053,8 @@ class ComponentbuilderModelAjax extends JModelList
    
 	public function getTableColumns($tableName)
 	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
        	// get the columns
-		$columns = $db->getTableColumns("#__".$tableName);
+		$columns = $this->_db->getTableColumns("#__".$tableName);
 		if (ComponentbuilderHelper::checkArray($columns))
 		{
        	// build the return string
@ -1073,185 +1068,180 @@ class ComponentbuilderModelAjax extends JModelList
 		return false;
 	}

+	protected $linkedKeys = array(
+			'field' => array(
+				array('table' => 'component_config', 'tables' => 'components_config', 'fields' => array('addconfig' => 'field', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name'),
+				array('table' => 'admin_fields', 'tables' => 'admins_fields', 'fields' => array('addfields' => 'field', 'admin_view' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_ADMIN_VIEW', 'name' => 'system_name')
+			),
+			'admin_view' => array(
+				array('table' => 'component_admin_views', 'tables' => 'components_admin_views', 'fields' => array('addadmin_views' => 'adminview', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name')
+			),
+			'custom_admin_view' => array(
+				array('table' => 'component_custom_admin_views', 'tables' => 'components_custom_admin_views', 'fields' => array('addcustom_admin_views' => 'customadminview', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name')
+			),
+			'site_view' => array(
+				array('table' => 'component_site_views', 'tables' => 'components_site_views', 'fields' => array('addsite_views' => 'siteview', 'joomla_component' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_JOOMLA_COMPONENT', 'name' => 'system_name')
+			),
+			'library' => array(
+				array('table' => 'template', 'tables' => 'templates', 'fields' => array('libraries' => 'ARRAY', 'name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_TEMPLATE'),
+				array('table' => 'layout', 'tables' => 'layouts', 'fields' => array('libraries' => 'ARRAY', 'name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_LAYOUT'),
+				array('table' => 'site_view', 'tables' => 'site_views', 'fields' => array('libraries' => 'ARRAY', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_SITE_VIEW'),
+				array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('libraries' => 'ARRAY', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW')
+			),
+			'dynamic_get' => array(
+				array('table' => 'site_view', 'tables' => 'site_views', 'fields' => array('custom_get' => 'ARRAY', 'main_get' => 'INT', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_SITE_VIEW'),
+				array('table' => 'custom_admin_view', 'tables' => 'custom_admin_views', 'fields' => array('custom_get' => 'ARRAY', 'main_get' => 'INT', 'system_name' => 'NAME'), 'type' => 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW')
+			)
+		);
+
 	/**
-	 * Get Linked to
+	 * Get Linked
 	 * 
-	 * @param   string   $type  Item Name
-	 * @param   int        $id     Item ID
+	 * @param   int       $type    The display return type
 	 *
-	 * @return  string      The table of the linked to result
+	 * @return    string  The display return type on success
 	 * 
 	 */
-	protected function getLinked($to)
+	public function getLinked($type)
 	{
 		// get the view name & id
 		$values = $this->getViewID();
 		// check if item is set
 		if (!is_null($values['a_id']) && $values['a_id'] > 0 && strlen($values['a_view']))
 		{
-			// get linked to
-			$linkedToArray = (array) explode('__', $to);
-			// check if item is linked to component
-			if (in_array('component', $linkedToArray))
+			// check if we have any linked to config
+			if (isset($this->linkedKeys[$values['a_view']]))
 			{
-				if (!$components = getComponentLinked($values['a_view'], $values['a_id']))
+				// make sure the ref is set
+				$this->ref = '&ref=' . $values['a_view'] . '&refid=' . $values['a_id'];
+				// get the linked to
+				if ($linked = $this->getLinkedTo($values['a_view'], $values['a_id']))
 				{
-					$linkedToString =  implode(', ', array_map( function($name) { return ComponentbuilderHelper::safeString($name, 'w'); }, $linkedToArray));
-					return '<div class="control-group"><div class="alert alert-info"><h4>' . JText::sprintf('COM_COMPONENTBUILDER_S_NOT_LINKED', ComponentbuilderHelper::safeString($values['a_view'], 'Ww')) . '</h4><p>' . JText::sprintf('COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_S', $values['a_view'], $linkedToString) . '</p></div></div>';
+					// just return it for now as an unordered list
+					return  '<div class="control-group"><ul class="uk-list uk-list-striped"><li>' .implode('</li><li>', $linked) . '</li></ul></div></div>';
 				}
 			}
-			// if fields and components found get admin views
-			
+		}
+		// if not found but has session view name
+		if (strlen($values['a_view']))
+		{
+			return '<div class="control-group"><div class="alert alert-info"><h4>' . JText::sprintf('COM_COMPONENTBUILDER_S_NOT_LINKED', ComponentbuilderHelper::safeString($values['a_view'], 'Ww')) . '</h4><p>' . JText::sprintf('COM_COMPONENTBUILDER_THIS_BSB_IS_NOT_LINKED_TO_ANY_OTHER_AREAS_OF_JCB_AT_THIS_TIME', $values['a_view']) . '</p></div></div>';
 		}
 		// no view or id found in session, or view not allowed to access area
 		return '<div class="control-group"><div class="alert alert-error"><h4>' . JText::_('COM_COMPONENTBUILDER_ERROR') . '</h4><p>' . JText::_('COM_COMPONENTBUILDER_THERE_WAS_A_PROBLEM_BNO_VIEW_OR_ID_FOUND_IN_SESSION_OR_VIEW_NOT_ALLOWED_TO_ACCESS_AREAB_WE_COULD_NOT_LOAD_ANY_LINKED_TO_VALUES_PLEASE_INFORM_YOUR_SYSTEM_ADMINISTRATOR') . '</p></div></div>';
 	}

 	/**
-	 * Get Component Linked to Item
+	 * Get Linked to Items
 	 * 
-	 * @param   string   $type  Item Name
-	 * @param   int        $id     Item ID
+	 * @param   string   $view  View that is being searched for
+	 * @param   int        $id     ID
 	 *
-	 * @return  array       Components Id if found
+	 * @return  array     Found items
 	 * 
 	 */
-	protected function getComponentLinked($type, $id)
+	protected function getLinkedTo($view, $id)
 	{
 		// reset bucket
-		$componentsLinked = array();
-		// Create a new query object.
-		$query = $this->db->getQuery(true);
-		// get all history values
-		$query->select('h.*');
-		$query->from('#__ucm_history AS h');
-		$query->where($this->db->quoteName('h.ucm_item_id') . ' = ' . (int) $id);
-		// Join over the content type for the type id
-		$query->join('LEFT', '#__content_types AS ct ON ct.type_id = h.ucm_type_id');
-		$query->where('ct.type_alias = ' . $this->db->quote('com_componentbuilder.' . $type));
-		$this->db->setQuery($query);
-		$this->db->execute();
-		if ($this->db->getNumRows())
+		$linked = array();
+		// start search
+		foreach ($this->linkedKeys[$view] as $search)
 		{
-			// load all item history
-			$items = $db->loadObjectList();
-			// load the components ids
+			// Create a new query object.
+			$query = $this->_db->getQuery(true);
+			// get all history values
+			$selection = array_keys($search['fields']);
+			$selection[] = 'id';
+			$query->select($selection);
+			$query->from('#__componentbuilder_' . $search['table']);
+			$this->_db->setQuery($query);
+			$this->_db->execute();
+			if ($this->_db->getNumRows())
+			{
+				// load all items
+				$items = $this->_db->loadObjectList();
+				// search the items
 				foreach ($items as $item)
 				{
-				// only work with those who have notes
-				if (ComponentbuilderHelper::checkJson($item->version_note))
+					$found = false;
+					foreach ($search['fields'] as $key => $target)
 					{
-					$note = json_decode($item->version_note, true);
-					if (ComponentbuilderHelper::checkArray($note))
+						if ('NAME' === $target)
 						{
-						foreach($note as $ids)
+							$name = $item->{$key};
+							$nameTable = $key;
+							continue;
+						}
+						elseif (!$found)
 						{
-							if (ComponentbuilderHelper::checkArray($ids))
+							if ('INT' === $target)
 							{
-								foreach ($ids as $_id)
+								// check if ID match
+								if ($item->{$key} == $id)
 								{
-									$componentsLinked[(int) $_id] = array('component' => (int) $_id);
+									$found = true;
 								}
 							}
-							elseif (is_numeric($ids))
+							else
 							{
-								$componentsLinked[(int) $ids] = array('component' => (int) $ids);
+								// check if we have a json
+								if (ComponentbuilderHelper::checkJson($item->{$key}))
+								{
+									$item->{$key} = json_decode($item->{$key}, true);
 								}
+								// if array
+								if (ComponentbuilderHelper::checkArray($item->{$key}))
+								{
+									if ('ARRAY' === $target)
+									{
+										// check if ID match
+										foreach ($item->{$key} as $_id)
+										{
+											if ($_id == $id)
+											{
+												$found = true;
+											}
+										}
+									}
+									else
+									{
+										foreach ($item->{$key} as $row)
+										{
+											if (isset($row[$target]) && $row[$target] == $id)
+											{
+												$found = true;
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+					// check if found
+					if ($found)
+					{
+						// build the name
+						$edit = true;
+						if (is_numeric($name) && isset($search['name']))
+						{
+							if (!$name =  ComponentbuilderHelper::getVar($nameTable, (int) $name, 'id', $search['name']))
+							{
+								$name = JText::_('COM_COMPONENTBUILDER_NO_FOUND');
+								$edit = false;
+							}
+						}
+						// set edit link
+						$link = ($edit) ? $this->addEditLink($item->id, $search['table'], $search['tables']) : '';
+						// build the linked
+						$linked[] = JText::_($search['type']) . ' - ' . $name . ' ' . $link;
 					}
 				}
 			}
 		}
 		// check if we found any
-			if (ComponentbuilderHelper::checkArray($componentLinked))
+		if (ComponentbuilderHelper::checkArray($linked))
 		{
-				return $componentLinked;
-			}
-		}
-		return false;
-	}
-
-	// Used in site_view
-			
-	public function getSnippets($libraries)
-	{
-		if (ComponentbuilderHelper::checkJson($libraries))
-		{
-			$libraries = json_decode($libraries, true);
-		}
-		// check if we have an array
-		if (ComponentbuilderHelper::checkArray($libraries))
-		{
-			// insure we only have int values
-			if ($libraries = $this->checkLibraries($libraries))
-			{
-				// Get a db connection.
-				$db = JFactory::getDbo();
-				// Create a new query object.
-				$query = $db->getQuery(true);
-				$query->select($db->quoteName( array('a.id') ));
-				$query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
-				$query->where($db->quoteName('a.published') . ' = 1');
-				// check for country and region
-				$query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
-				$db->setQuery($query);
-				$db->execute();
-				if ($db->getNumRows())
-				{
-					return $db->loadColumn();
-				}
-			}
-		}
-		return false;
-	}
-
-	protected function checkLibraries($libraries)
-	{
-		$bucket = array();
-		$libraries = array_map( function($id) use (&$bucket) { 
-			// now get bundled libraries
-			$type = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'type');
-			if (2 == $type && $bundled = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'libraries'))
-			{
-				// make sure we have an array if it was json
-				if (ComponentbuilderHelper::checkJson($bundled))
-				{
-					$bundled = json_decode($bundled, true);
-				}
-				// load in the values if we have an array
-				if (ComponentbuilderHelper::checkArray($bundled))
-				{
-					foreach ($bundled as $lib)
-					{
-						$bucket[$lib] = $lib;
-					}
-				}
-				elseif (is_numeric($bundled))
-				{
-					$bucket[(int) $bundled] = (int) $bundled;
-				}
-			}
-			else
-			{
-				return (int) $id;
-			}
-		}, $libraries);
-		// check if we have any bundled libraries
-		if (ComponentbuilderHelper::checkArray($bucket))
-		{
-			foreach ($bucket as $lib)
-			{
-				$libraries[] = (int) $lib;
-			}
-		}
-		// check that we have libraries
-		if (ComponentbuilderHelper::checkArray($libraries))
-		{
-			$libraries = array_values(array_unique(array_filter($libraries, function($id){return is_int($id);})));
-			// check if we have any libraries remaining
-			if (ComponentbuilderHelper::checkArray($libraries))
-			{
-				return $libraries;
-			}
+			return $linked;
 		}
 		return false;
 	}
@ -1964,7 +1954,102 @@ class ComponentbuilderModelAjax extends JModelList
 		return false;
 	}

-	// Used in snippet
+	// Used in field
+	public function getFieldOptions($id)
+	{
+		if ($field = ComponentbuilderHelper::getFieldOptions($id, 'id'))
+		{
+			// return found field options
+			return $field;
+		}
+		return false;
+	}
+
+	// Used in get_snippets
+			
+	public function getSnippets($libraries)
+	{
+		if (ComponentbuilderHelper::checkJson($libraries))
+		{
+			$libraries = json_decode($libraries, true);
+		}
+		// check if we have an array
+		if (ComponentbuilderHelper::checkArray($libraries))
+		{
+			// insure we only have int values
+			if ($libraries = $this->checkLibraries($libraries))
+			{
+				// Get a db connection.
+				$db = JFactory::getDbo();
+				// Create a new query object.
+				$query = $db->getQuery(true);
+				$query->select($db->quoteName( array('a.id') ));
+				$query->from($db->quoteName('#__componentbuilder_snippet', 'a'));
+				$query->where($db->quoteName('a.published') . ' = 1');
+				// check for country and region
+				$query->where($db->quoteName('a.library') . ' IN ('. implode(',',$libraries) .')');
+				$db->setQuery($query);
+				$db->execute();
+				if ($db->getNumRows())
+				{
+					return $db->loadColumn();
+				}
+			}
+		}
+		return false;
+	}
+
+	protected function checkLibraries($libraries)
+	{
+		$bucket = array();
+		$libraries = array_map( function($id) use (&$bucket) { 
+			// now get bundled libraries
+			$type = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'type');
+			if (2 == $type && $bundled = ComponentbuilderHelper::getVar('library', (int) $id, 'id', 'libraries'))
+			{
+				// make sure we have an array if it was json
+				if (ComponentbuilderHelper::checkJson($bundled))
+				{
+					$bundled = json_decode($bundled, true);
+				}
+				// load in the values if we have an array
+				if (ComponentbuilderHelper::checkArray($bundled))
+				{
+					foreach ($bundled as $lib)
+					{
+						$bucket[$lib] = $lib;
+					}
+				}
+				elseif (is_numeric($bundled))
+				{
+					$bucket[(int) $bundled] = (int) $bundled;
+				}
+			}
+			else
+			{
+				return (int) $id;
+			}
+		}, $libraries);
+		// check if we have any bundled libraries
+		if (ComponentbuilderHelper::checkArray($bucket))
+		{
+			foreach ($bucket as $lib)
+			{
+				$libraries[] = (int) $lib;
+			}
+		}
+		// check that we have libraries
+		if (ComponentbuilderHelper::checkArray($libraries))
+		{
+			$libraries = array_values(array_unique(array_filter($libraries, function($id){return is_int($id);})));
+			// check if we have any libraries remaining
+			if (ComponentbuilderHelper::checkArray($libraries))
+			{
+				return $libraries;
+			}
+		}
+		return false;
+	}			
 	public function getSnippetDetails($id)
 	{
 		// Get a db connection.
@ -2127,15 +2212,4 @@ class ComponentbuilderModelAjax extends JModelList
 		}
 		return 0;
 	}
-
-	// Used in field
-	public function getFieldOptions($id)
-	{
-		if ($field = ComponentbuilderHelper::getFieldOptions($id, 'id'))
-		{
-			// return found field options
-			return $field;
-		}
-		return false;
-	}
 }
--- a/admin/models/componentbuilder.php
+++ b/admin/models/componentbuilder.php
@ -385,9 +385,9 @@ class ComponentbuilderModelComponentbuilder extends JModelList
 					// split versions in to array
 					var activeVersionArray = activeVersion.split(".");
 					var localVersionArray = manifest.version.split(".");					
-					if (localVersionArray[0] > activeVersionArray[0] || 
-					(localVersionArray[0] == activeVersionArray[0] && localVersionArray[1] > activeVersionArray[1]) || 
-					(localVersionArray[0] == activeVersionArray[0] && localVersionArray[1] == activeVersionArray[1] && localVersionArray[2] > activeVersionArray[2])) {
+					if ((+localVersionArray[0] > +activeVersionArray[0]) || 
+					(+localVersionArray[0] == +activeVersionArray[0] && +localVersionArray[1] > +activeVersionArray[1]) || 
+					(+localVersionArray[0] == +activeVersionArray[0] && +localVersionArray[1] == +activeVersionArray[1] && +localVersionArray[2] > +activeVersionArray[2])) {
 						// local version head latest release
 						jQuery(".update-notice").html("<small><span style=\'color:#F7B033;\'><span class=\'icon-wrench\'></span>'.JText::_('COM_COMPONENTBUILDER_BETA_RELEASE').'</span></small>");
 					} else {
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@ -66,6 +66,11 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}

+	public function getVDM()
+	{
+		return $this->vastDevMod;
+	}
+    
 	/**
 	 * Method to get a single record.
 	 *
@ -103,6 +108,14 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}

+			if (!empty($item->ajax_input))
+			{
+				// Convert the ajax_input field to an array.
+				$ajax_input = new Registry;
+				$ajax_input->loadString($item->ajax_input);
+				$item->ajax_input = $ajax_input->toArray();
+			}
+
 			if (!empty($item->custom_get))
 			{
 				// Convert the custom_get field to an array.
@ -119,10 +132,28 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}

-			if (!empty($item->php_controller))
+			if (!empty($item->php_document))
 			{
-				// base64 Decode php_controller.
-				$item->php_controller = base64_decode($item->php_controller);
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
+			if (!empty($item->php_jview_display))
+			{
+				// base64 Decode php_jview_display.
+				$item->php_jview_display = base64_decode($item->php_jview_display);
+			}
+
+			if (!empty($item->php_view))
+			{
+				// base64 Decode php_view.
+				$item->php_view = base64_decode($item->php_view);
+			}
+
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
 			}

 			if (!empty($item->default))
@ -131,12 +162,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->default = base64_decode($item->default);
 			}

-			if (!empty($item->php_model))
-			{
-				// base64 Decode php_model.
-				$item->php_model = base64_decode($item->php_model);
-			}
-
 			if (!empty($item->js_document))
 			{
 				// base64 Decode js_document.
@ -161,28 +186,43 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 				$item->css = base64_decode($item->css);
 			}

-			if (!empty($item->php_document))
+			if (!empty($item->php_ajaxmethod))
 			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
+				// base64 Decode php_ajaxmethod.
+				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}

-			if (!empty($item->php_view))
+			if (!empty($item->php_controller))
 			{
-				// base64 Decode php_view.
-				$item->php_view = base64_decode($item->php_view);
+				// base64 Decode php_controller.
+				$item->php_controller = base64_decode($item->php_controller);
 			}

-			if (!empty($item->php_jview_display))
+			if (!empty($item->php_model))
 			{
-				// base64 Decode php_jview_display.
-				$item->php_jview_display = base64_decode($item->php_jview_display);
+				// base64 Decode php_model.
+				$item->php_model = base64_decode($item->php_model);
 			}

-			if (!empty($item->php_jview))
+			
+			if (empty($item->id))
 			{
-				// base64 Decode php_jview.
-				$item->php_jview = base64_decode($item->php_jview);
+				$id = 0;
+			}
+			else
+			{
+				$id = $item->id;
+			}			
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('custom_admin_view__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'custom_admin_view__'.$id);
+				ComponentbuilderHelper::set('custom_admin_view__'.$id, $this->vastDevMod);
 			}			

 			// check what type of custom_button array we have here (should be subform... but just incase)
@ -945,6 +985,19 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['libraries'] = '';
 		}

+		// Set the ajax_input items to data.
+		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
+		{
+			$ajax_input = new JRegistry;
+			$ajax_input->loadArray($data['ajax_input']);
+			$data['ajax_input'] = (string) $ajax_input;
+		}
+		elseif (!isset($data['ajax_input']))
+		{
+			// Set the empty ajax_input to data
+			$data['ajax_input'] = '';
+		}
+
 		// Set the custom_get items to data.
 		if (isset($data['custom_get']) && is_array($data['custom_get']))
 		{
@ -971,10 +1024,28 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}

-		// Set the php_controller string to base64 string.
-		if (isset($data['php_controller']))
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
 		{
-			$data['php_controller'] = base64_encode($data['php_controller']);
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
+		// Set the php_jview_display string to base64 string.
+		if (isset($data['php_jview_display']))
+		{
+			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
+		}
+
+		// Set the php_view string to base64 string.
+		if (isset($data['php_view']))
+		{
+			$data['php_view'] = base64_encode($data['php_view']);
+		}
+
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
 		}

 		// Set the default string to base64 string.
@ -983,12 +1054,6 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['default'] = base64_encode($data['default']);
 		}

-		// Set the php_model string to base64 string.
-		if (isset($data['php_model']))
-		{
-			$data['php_model'] = base64_encode($data['php_model']);
-		}
-
 		// Set the js_document string to base64 string.
 		if (isset($data['js_document']))
 		{
@ -1013,28 +1078,22 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 			$data['css'] = base64_encode($data['css']);
 		}

-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
+		// Set the php_ajaxmethod string to base64 string.
+		if (isset($data['php_ajaxmethod']))
 		{
-			$data['php_document'] = base64_encode($data['php_document']);
+			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}

-		// Set the php_view string to base64 string.
-		if (isset($data['php_view']))
+		// Set the php_controller string to base64 string.
+		if (isset($data['php_controller']))
 		{
-			$data['php_view'] = base64_encode($data['php_view']);
+			$data['php_controller'] = base64_encode($data['php_controller']);
 		}

-		// Set the php_jview_display string to base64 string.
-		if (isset($data['php_jview_display']))
+		// Set the php_model string to base64 string.
+		if (isset($data['php_model']))
 		{
-			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
-		}
-
-		// Set the php_jview string to base64 string.
-		if (isset($data['php_jview']))
-		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
+			$data['php_model'] = base64_encode($data['php_model']);
 		}
        
 		// Set the Params Items to data
--- a/admin/models/custom_admin_views.php
+++ b/admin/models/custom_admin_views.php
@ -266,12 +266,16 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 							continue;
 						}

-						// decode php_controller
-						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
+						// decode php_jview_display
+						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_view
+						$item->php_view = base64_decode($item->php_view);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
 						// decode default
 						$item->default = base64_decode($item->default);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
 						// decode js_document
 						$item->js_document = base64_decode($item->js_document);
 						// decode javascript_file
@ -280,14 +284,12 @@ class ComponentbuilderModelCustom_admin_views extends JModelList
 						$item->css_document = base64_decode($item->css_document);
 						// decode css
 						$item->css = base64_decode($item->css);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
-						// decode php_jview
-						$item->php_jview = base64_decode($item->php_jview);
+						// decode php_ajaxmethod
+						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
+						// decode php_controller
+						$item->php_controller = base64_decode($item->php_controller);
+						// decode php_model
+						$item->php_model = base64_decode($item->php_model);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@ -66,6 +66,11 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}

+	public function getVDM()
+	{
+		return $this->vastDevMod;
+	}
+    
 	/**
 	 * Method to get a single record.
 	 *
@ -95,6 +100,22 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->metadata = $registry->toArray();
 			}

+			if (!empty($item->join_view_table))
+			{
+				// Convert the join_view_table field to an array.
+				$join_view_table = new Registry;
+				$join_view_table->loadString($item->join_view_table);
+				$item->join_view_table = $join_view_table->toArray();
+			}
+
+			if (!empty($item->join_db_table))
+			{
+				// Convert the join_db_table field to an array.
+				$join_db_table = new Registry;
+				$join_db_table->loadString($item->join_db_table);
+				$item->join_db_table = $join_db_table->toArray();
+			}
+
 			if (!empty($item->filter))
 			{
 				// Convert the filter field to an array.
@ -127,22 +148,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->global = $global->toArray();
 			}

-			if (!empty($item->join_db_table))
-			{
-				// Convert the join_db_table field to an array.
-				$join_db_table = new Registry;
-				$join_db_table->loadString($item->join_db_table);
-				$item->join_db_table = $join_db_table->toArray();
-			}
-
-			if (!empty($item->join_view_table))
-			{
-				// Convert the join_view_table field to an array.
-				$join_view_table = new Registry;
-				$join_view_table->loadString($item->join_view_table);
-				$item->join_view_table = $join_view_table->toArray();
-			}
-
 			if (!empty($item->php_custom_get))
 			{
 				// base64 Decode php_custom_get.
@ -185,6 +190,27 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 				$item->php_calculation = base64_decode($item->php_calculation);
 			}

+			
+			if (empty($item->id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $item->id;
+			}			
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('dynamic_get__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'dynamic_get__'.$id);
+				ComponentbuilderHelper::set('dynamic_get__'.$id, $this->vastDevMod);
+			}			
+
 			// update the fields
 			$objectUpdate = new stdClass();
 			$objectUpdate->id = (int) $item->id;
@ -944,6 +970,32 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['metadata'] = (string) $metadata;
 		} 

+		// Set the join_view_table items to data.
+		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
+		{
+			$join_view_table = new JRegistry;
+			$join_view_table->loadArray($data['join_view_table']);
+			$data['join_view_table'] = (string) $join_view_table;
+		}
+		elseif (!isset($data['join_view_table']))
+		{
+			// Set the empty join_view_table to data
+			$data['join_view_table'] = '';
+		}
+
+		// Set the join_db_table items to data.
+		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
+		{
+			$join_db_table = new JRegistry;
+			$join_db_table->loadArray($data['join_db_table']);
+			$data['join_db_table'] = (string) $join_db_table;
+		}
+		elseif (!isset($data['join_db_table']))
+		{
+			// Set the empty join_db_table to data
+			$data['join_db_table'] = '';
+		}
+
 		// Set the filter items to data.
 		if (isset($data['filter']) && is_array($data['filter']))
 		{
@ -996,32 +1048,6 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 			$data['global'] = '';
 		}

-		// Set the join_db_table items to data.
-		if (isset($data['join_db_table']) && is_array($data['join_db_table']))
-		{
-			$join_db_table = new JRegistry;
-			$join_db_table->loadArray($data['join_db_table']);
-			$data['join_db_table'] = (string) $join_db_table;
-		}
-		elseif (!isset($data['join_db_table']))
-		{
-			// Set the empty join_db_table to data
-			$data['join_db_table'] = '';
-		}
-
-		// Set the join_view_table items to data.
-		if (isset($data['join_view_table']) && is_array($data['join_view_table']))
-		{
-			$join_view_table = new JRegistry;
-			$join_view_table->loadArray($data['join_view_table']);
-			$data['join_view_table'] = (string) $join_view_table;
-		}
-		elseif (!isset($data['join_view_table']))
-		{
-			// Set the empty join_view_table to data
-			$data['join_view_table'] = '';
-		}
-
 		// Set the php_custom_get string to base64 string.
 		if (isset($data['php_custom_get']))
 		{
--- a/admin/models/field.php
+++ b/admin/models/field.php
@ -66,6 +66,11 @@ class ComponentbuilderModelField extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}

+	public function getVDM()
+	{
+		return $this->vastDevMod;
+	}
+    
 	/**
 	 * Method to get a single record.
 	 *
@ -125,6 +130,27 @@ class ComponentbuilderModelField extends JModelAdmin
 				$item->javascript_views_footer = base64_decode($item->javascript_views_footer);
 			}

+			
+			if (empty($item->id))
+			{
+				$id = 0;
+			}
+			else
+			{
+				$id = $item->id;
+			}			
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('field__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'field__'.$id);
+				ComponentbuilderHelper::set('field__'.$id, $this->vastDevMod);
+			}			
+			
 			if (!empty($item->id))
 			{
 				$item->tags = new JHelperTags;
--- a/admin/models/fields/ftps.php
+++ b/admin/models/fields/ftps.php
@ -1,171 +0,0 @@
-<?php
-/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
-    __      __       _     _____                 _                                  _     __  __      _   _               _
-    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
-     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
-      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
-       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
-        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
-                                                        | |                                                                 
-                                                        |_| 				
-/-------------------------------------------------------------------------------------------------------------------------------/
-
-	@version		2.6.x
-	@created		30th April, 2015
-	@package		Component Builder
-	@subpackage		ftps.php
-	@author			Llewellyn van der Merwe <http://joomlacomponentbuilder.com>	
-	@github			Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
-	@copyright		Copyright (C) 2015. All Rights Reserved
-	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html 
-	
-	Builds Complex Joomla Components 
-                                                             
-/-----------------------------------------------------------------------------------------------------------------------------*/
-
-// No direct access to this file
-defined('_JEXEC') or die('Restricted access');
-
-// import the list field type
-jimport('joomla.form.helper');
-JFormHelper::loadFieldClass('list');
-
-/**
- * Ftps Form Field class for the Componentbuilder component
- */
-class JFormFieldFtps extends JFormFieldList
-{
-	/**
-	 * The ftps field type.
-	 *
-	 * @var		string
-	 */
-	public $type = 'ftps'; 
-	/**
-	 * Override to add new button
-	 *
-	 * @return  string  The field input markup.
-	 *
-	 * @since   3.2
-	 */
-	protected function getInput()
-	{
-		// see if we should add buttons
-		$setButton = $this->getAttribute('button');
-		// get html
-		$html = parent::getInput();
-		// if true set button
-		if ($setButton === 'true')
-		{
-			$button = array();
-			$script = array();
-			$buttonName = $this->getAttribute('name');
-			// get the input from url
-			$app = JFactory::getApplication();
-			$jinput = $app->input;
-			// get the view name & id
-			$values = $jinput->getArray(array(
-				'id' => 'int',
-				'view' => 'word'
-			));
-			// check if new item
-			$ref = '';
-			$refJ = '';
-			if (!is_null($values['id']) && strlen($values['view']))
-			{
-				// only load referal if not new item.
-				$ref = '&amp;ref=' . $values['view'] . '&amp;refid=' . $values['id'];
-				$refJ = '&ref=' . $values['view'] . '&refid=' . $values['id'];
-			}
-			$user = JFactory::getUser();
-			// only add if user allowed to create ftp
-			if ($user->authorise('ftp.create', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build Create button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Create" class="btn btn-small btn-success hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_CREATE_NEW_S', $buttonNamee).'" style="border-radius: 0px 4px 4px 0px; padding: 4px 4px 4px 7px;"
-					href="index.php?option=com_componentbuilder&amp;view=ftp&amp;layout=edit'.$ref.'" >
-					<span class="icon-new icon-white"></span></a>';
-			}
-			// only add if user allowed to edit ftp
-			if (($buttonName === 'ftp' || $buttonName === 'ftps') && $user->authorise('ftp.edit', 'com_componentbuilder') && $app->isAdmin()) // TODO for now only in admin area.
-			{
-				// build edit button
-				$buttonNamee = trim($buttonName);
-				$buttonNamee = preg_replace('/_+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace('/\s+/', ' ', $buttonNamee);
-				$buttonNamee = preg_replace("/[^A-Za-z ]/", '', $buttonNamee);
-				$buttonNamee = ucfirst(strtolower($buttonNamee));
-				$button[] = '<a id="'.$buttonName.'Edit" class="btn btn-small hasTooltip" title="'.JText::sprintf('COM_COMPONENTBUILDER_EDIT_S', $buttonNamee).'" style="display: none; padding: 4px 4px 4px 7px;" href="#" >
-					<span class="icon-edit"></span></a>';
-				// build script
-				$script[] = "
-					jQuery(document).ready(function() {
-						jQuery('#adminForm').on('change', '#jform_".$buttonName."',function (e) {
-							e.preventDefault();
-							var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-							".$buttonName."Button(".$buttonName."Value);
-						});
-						var ".$buttonName."Value = jQuery('#jform_".$buttonName."').val();
-						".$buttonName."Button(".$buttonName."Value);
-					});
-					function ".$buttonName."Button(value) {
-						if (value > 0) {
-							// hide the create button
-							jQuery('#".$buttonName."Create').hide();
-							// show edit button
-							jQuery('#".$buttonName."Edit').show();
-							var url = 'index.php?option=com_componentbuilder&view=ftps&task=ftp.edit&id='+value+'".$refJ."';
-							jQuery('#".$buttonName."Edit').attr('href', url);
-						} else {
-							// show the create button
-							jQuery('#".$buttonName."Create').show();
-							// hide edit button
-							jQuery('#".$buttonName."Edit').hide();
-						}
-					}";
-			}
-			// check if button was created for ftp field.
-			if (is_array($button) && count($button) > 0)
-			{
-				// Load the needed script.
-				$document = JFactory::getDocument();
-				$document->addScriptDeclaration(implode(' ',$script));
-				// return the button attached to input field.
-				return '<div class="input-append">' .$html . implode('',$button).'</div>';
-			}
-		}
-		return $html;
-	}
-
-	/**
-	 * Method to get a list of options for a list input.
-	 *
-	 * @return	array		An array of JHtml options.
-	 */
-	public function getOptions()
-	{
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-		$query->select($db->quoteName(array('a.id','a.name'),array('id','sales_server_ftp_name')));
-		$query->from($db->quoteName('#__componentbuilder_ftp', 'a'));
-		$query->where($db->quoteName('a.published') . ' >= 1');
-		$query->order('a.name ASC');
-		$db->setQuery((string)$query);
-		$items = $db->loadObjectList();
-		$options = array();
-		if ($items)
-		{
-			$options[] = JHtml::_('select.option', '', 'Select an option');
-			foreach($items as $item)
-			{
-				$options[] = JHtml::_('select.option', $item->id, $item->sales_server_ftp_name);
-			}
-		}
-		return $options;
-	}
-}
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@ -139,7 +139,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVzyfields()
+	public function getWaafields()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -223,13 +223,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 				foreach ($items as $nr => &$item)
 				{
 					// convert datatype
-					$item->datatype = $this->selectionTranslationVzyfields($item->datatype, 'datatype');
+					$item->datatype = $this->selectionTranslationWaafields($item->datatype, 'datatype');
 					// convert indexes
-					$item->indexes = $this->selectionTranslationVzyfields($item->indexes, 'indexes');
+					$item->indexes = $this->selectionTranslationWaafields($item->indexes, 'indexes');
 					// convert null_switch
-					$item->null_switch = $this->selectionTranslationVzyfields($item->null_switch, 'null_switch');
+					$item->null_switch = $this->selectionTranslationWaafields($item->null_switch, 'null_switch');
 					// convert store
-					$item->store = $this->selectionTranslationVzyfields($item->store, 'store');
+					$item->store = $this->selectionTranslationWaafields($item->store, 'store');
 				}
 			}

@ -243,7 +243,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 	*
 	* @return translatable string
 	*/
-	public function selectionTranslationVzyfields($value,$name)
+	public function selectionTranslationWaafields($value,$name)
 	{
 		// Array of datatype language strings
 		if ($name === 'datatype')
--- a/admin/models/forms/admin_view.js
+++ b/admin/models/forms/admin_view.js
--- a/admin/models/forms/admin_view.xml
+++ b/admin/models/forms/admin_view.xml
@ -170,6 +170,24 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_SAVE_HINT"
                       required="true" />
+                <!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_advanced_import"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-success note_advanced_import" />
+                <!-- Php_batchmove Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_batchmove"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_HINT"
+                       required="true" />
                <!-- Type Field. Type: List. (joomla)-->
                <field type="list"
                       name="type"
@ -182,28 +200,6 @@
                        <option value="1">COM_COMPONENTBUILDER_ADMIN_VIEW_READWRITE</option>
                        <option value="2">COM_COMPONENTBUILDER_ADMIN_VIEW_READONLY</option>
                </field>
-                <!-- Php_batchmove Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_batchmove"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHMOVE_HINT"
-                       required="true" />
-                <!-- Php_getlistquery Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_getlistquery"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT"
-                       required="true" />
                <!-- Description Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="description"
@ -247,13 +243,13 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_AFTER_PUBLISH_HINT"
                       required="true" />
-                <!-- Note_advanced_import Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_advanced_import"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ADVANCED_IMPORT_DESCRIPTION"
+                       name="note_linked_to_notice"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-success note_advanced_import" />
+                       class="note_linked_to_notice" />
                <!-- Source Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="source"
@ -286,17 +282,32 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_HINT"
                       required="true" />
+                <!-- Php_getlistquery Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_getlistquery"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETLISTQUERY_HINT"
+                       required="true" />
+                <!-- Php_getitem Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_getitem"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT"
+                       required="true" />
                <!-- Not_required Field. Type: Hidden. (joomla)-->
                <field type="hidden"
                       name="not_required"
                       default="[]" />
-                <!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_permissions"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_permissions" />
                <!-- Php_getitems_after_all Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_getitems_after_all"
@ -308,6 +319,24 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEMS_AFTER_ALL_HINT"
                       required="true" />
+                <!-- Note_on_permissions Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_permissions"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_permissions" />
+                <!-- Php_before_save Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_before_save"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_HINT"
+                       required="true" />
                <!-- Addpermissions Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="addpermissions"
@ -363,24 +392,6 @@
                                </field>
                        </form>
                </field>
-                <!-- Php_before_save Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_before_save"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_SAVE_HINT"
-                       required="true" />
-                <!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_tabs"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_tabs" />
                <!-- Php_postsavehook Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_postsavehook"
@ -392,6 +403,24 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_POSTSAVEHOOK_HINT"
                       required="true" />
+                <!-- Note_on_tabs Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_tabs"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_TABS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_tabs" />
+                <!-- Php_batchcopy Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_batchcopy"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT"
+                       required="true" />
                <!-- Addtabs Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="addtabs"
@ -420,24 +449,6 @@
                                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_NAME_HINT" />
                        </form>
                </field>
-                <!-- Php_batchcopy Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_batchcopy"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BATCHCOPY_HINT"
-                       required="true" />
-                <!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_on_linked_views"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_on_linked_views" />
                <!-- Php_before_publish Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_before_publish"
@ -449,6 +460,24 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_PUBLISH_HINT"
                       required="true" />
+                <!-- Note_on_linked_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_on_linked_views"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_LINKED_VIEWS_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_on_linked_views" />
+                <!-- Php_before_delete Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_before_delete"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT"
+                       required="true" />
                <!-- Addlinked_views Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="addlinked_views"
@ -527,24 +556,6 @@
                                </field>
                        </form>
                </field>
-                <!-- Php_before_delete Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_before_delete"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_BEFORE_DELETE_HINT"
-                       required="true" />
-                <!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_create_edit_notice"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_create_edit_notice" />
                <!-- Php_document Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_document"
@ -556,11 +567,13 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_DOCUMENT_HINT"
                       required="true" />
-                <!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_create_edit_notice Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_create_edit_buttons"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION"
-                       class="note_create_edit_buttons" />
+                       name="note_create_edit_notice"
+                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_create_edit_notice" />
                <!-- Sql Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="sql"
@ -572,11 +585,11 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_SQL_HINT"
                       required="true" />
-                <!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_create_edit_buttons Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_create_edit_display"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION"
-                       class="note_create_edit_display" />
+                       name="note_create_edit_buttons"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_BUTTONS_DESCRIPTION"
+                       class="note_create_edit_buttons" />
                <!-- Php_import_display Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_import_display"
@ -588,17 +601,11 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_IMPORT_DISPLAY_HINT"
                       required="true" />
-                <!-- Php_getitem Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_getitem"
-                       label="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_ADMIN_VIEW_PHP_GETITEM_HINT"
-                       required="true" />
+                <!-- Note_create_edit_display Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_create_edit_display"
+                       description="COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_DISPLAY_DESCRIPTION"
+                       class="note_create_edit_display" />
                <!-- Php_import_save Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_import_save"
--- a/admin/models/forms/custom_admin_view.js
+++ b/admin/models/forms/custom_admin_view.js
@ -23,7 +23,6 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyavxv_required = false;
 jform_vvvvvybvxw_required = false;
 jform_vvvvvycvxx_required = false;
 jform_vvvvvydvxy_required = false;
@ -31,282 +30,287 @@ jform_vvvvvyevxz_required = false;
 jform_vvvvvyfvya_required = false;
 jform_vvvvvygvyb_required = false;
 jform_vvvvvyhvyc_required = false;
-jform_vvvvvyhvyd_required = false;
+jform_vvvvvyivyd_required = false;
 jform_vvvvvyivye_required = false;
+jform_vvvvvyjvyf_required = false;
+jform_vvvvvykvyg_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvya = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvya(add_php_view_vvvvvya);
+	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyb(add_php_view_vvvvvyb);

-	var add_php_jview_display_vvvvvyb = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyb(add_php_jview_display_vvvvvyb);
+	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyc(add_php_jview_display_vvvvvyc);

-	var add_php_jview_vvvvvyc = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_vvvvvyc);
+	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyd(add_php_jview_vvvvvyd);

-	var add_php_document_vvvvvyd = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyd(add_php_document_vvvvvyd);
+	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvye(add_php_document_vvvvvye);

-	var add_css_document_vvvvvye = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvye(add_css_document_vvvvvye);
+	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyf(add_css_document_vvvvvyf);

-	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyf(add_javascript_file_vvvvvyf);
+	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyg(add_javascript_file_vvvvvyg);

-	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyg(add_js_document_vvvvvyg);
+	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyh(add_js_document_vvvvvyh);

-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);

-	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyi(add_css_vvvvvyi);
+	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyj(add_css_vvvvvyj);
+
+	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyk(add_php_ajax_vvvvvyk);
 });

-// the vvvvvya function
-function vvvvvya(add_php_view_vvvvvya)
+// the vvvvvyb function
+function vvvvvyb(add_php_view_vvvvvyb)
 {
 	// set the function logic
-	if (add_php_view_vvvvvya == 1)
+	if (add_php_view_vvvvvyb == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyavxv_required)
+		if (jform_vvvvvybvxw_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyavxv_required = false;
+			jform_vvvvvybvxw_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyavxv_required)
+		if (!jform_vvvvvybvxw_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyavxv_required = true;
-		}
-	}
-}
-
-// the vvvvvyb function
-function vvvvvyb(add_php_jview_display_vvvvvyb)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyb == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvybvxw_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvybvxw_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvybvxw_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvybvxw_required = true;
 		}
 	}
 }

 // the vvvvvyc function
-function vvvvvyc(add_php_jview_vvvvvyc)
+function vvvvvyc(add_php_jview_display_vvvvvyc)
 {
 	// set the function logic
-	if (add_php_jview_vvvvvyc == 1)
+	if (add_php_jview_display_vvvvvyc == 1)
 	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
+		jQuery('#jform_php_jview_display').closest('.control-group').show();
 		if (jform_vvvvvycvxx_required)
 		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvycvxx_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display').closest('.control-group').hide();
 		if (!jform_vvvvvycvxx_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvycvxx_required = true;
 		}
 	}
 }

 // the vvvvvyd function
-function vvvvvyd(add_php_document_vvvvvyd)
+function vvvvvyd(add_php_jview_vvvvvyd)
 {
 	// set the function logic
-	if (add_php_document_vvvvvyd == 1)
+	if (add_php_jview_vvvvvyd == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview').closest('.control-group').show();
 		if (jform_vvvvvydvxy_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvydvxy_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview').closest('.control-group').hide();
 		if (!jform_vvvvvydvxy_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvydvxy_required = true;
 		}
 	}
 }

 // the vvvvvye function
-function vvvvvye(add_css_document_vvvvvye)
+function vvvvvye(add_php_document_vvvvvye)
 {
 	// set the function logic
-	if (add_css_document_vvvvvye == 1)
+	if (add_php_document_vvvvvye == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_document').closest('.control-group').show();
 		if (jform_vvvvvyevxz_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyevxz_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_document').closest('.control-group').hide();
 		if (!jform_vvvvvyevxz_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyevxz_required = true;
 		}
 	}
 }

 // the vvvvvyf function
-function vvvvvyf(add_javascript_file_vvvvvyf)
+function vvvvvyf(add_css_document_vvvvvyf)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyf == 1)
+	if (add_css_document_vvvvvyf == 1)
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').show();
+		jQuery('#jform_css_document').closest('.control-group').show();
 		if (jform_vvvvvyfvya_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvyfvya_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').hide();
+		jQuery('#jform_css_document').closest('.control-group').hide();
 		if (!jform_vvvvvyfvya_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvyfvya_required = true;
 		}
 	}
 }

 // the vvvvvyg function
-function vvvvvyg(add_js_document_vvvvvyg)
+function vvvvvyg(add_javascript_file_vvvvvyg)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyg == 1)
+	if (add_javascript_file_vvvvvyg == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvygvyb_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvygvyb_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvygvyb_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvygvyb_required = true;
 		}
 	}
 }

 // the vvvvvyh function
-function vvvvvyh(add_custom_button_vvvvvyh)
+function vvvvvyh(add_js_document_vvvvvyh)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvyh == 1)
+	if (add_js_document_vvvvvyh == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvyhvyc_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvyhvyc_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvyhvyc_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvyhvyc_required = true;
+		}
+	}
+}
+
+// the vvvvvyi function
+function vvvvvyi(add_custom_button_vvvvvyi)
+{
+	// set the function logic
+	if (add_custom_button_vvvvvyi == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvyhvyc_required)
+		if (jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvyhvyc_required = false;
+			jform_vvvvvyivyd_required = false;
 		}

 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvyhvyd_required)
+		if (jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvyhvyd_required = false;
+			jform_vvvvvyivye_required = false;
 		}

 	}
@ -314,53 +318,86 @@ function vvvvvyh(add_custom_button_vvvvvyh)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyc_required)
+		if (!jform_vvvvvyivyd_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvyhvyc_required = true;
+			jform_vvvvvyivyd_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvyhvyd_required)
+		if (!jform_vvvvvyivye_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvyhvyd_required = true;
+			jform_vvvvvyivye_required = true;
 		}
 	}
 }

-// the vvvvvyi function
-function vvvvvyi(add_css_vvvvvyi)
+// the vvvvvyj function
+function vvvvvyj(add_css_vvvvvyj)
 {
 	// set the function logic
-	if (add_css_vvvvvyi == 1)
+	if (add_css_vvvvvyj == 1)
 	{
 		jQuery('#jform_css').closest('.control-group').show();
-		if (jform_vvvvvyivye_required)
+		if (jform_vvvvvyjvyf_required)
 		{
 			updateFieldRequired('css',0);
 			jQuery('#jform_css').prop('required','required');
 			jQuery('#jform_css').attr('aria-required',true);
 			jQuery('#jform_css').addClass('required');
-			jform_vvvvvyivye_required = false;
+			jform_vvvvvyjvyf_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_css').closest('.control-group').hide();
-		if (!jform_vvvvvyivye_required)
+		if (!jform_vvvvvyjvyf_required)
 		{
 			updateFieldRequired('css',1);
 			jQuery('#jform_css').removeAttr('required');
 			jQuery('#jform_css').removeAttr('aria-required');
 			jQuery('#jform_css').removeClass('required');
-			jform_vvvvvyivye_required = true;
+			jform_vvvvvyjvyf_required = true;
+		}
+	}
+}
+
+// the vvvvvyk function
+function vvvvvyk(add_php_ajax_vvvvvyk)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyk == 1)
+	{
+		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
+		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
+		if (jform_vvvvvykvyg_required)
+		{
+			updateFieldRequired('php_ajaxmethod',0);
+			jQuery('#jform_php_ajaxmethod').prop('required','required');
+			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
+			jQuery('#jform_php_ajaxmethod').addClass('required');
+			jform_vvvvvykvyg_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
+		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
+		if (!jform_vvvvvykvyg_required)
+		{
+			updateFieldRequired('php_ajaxmethod',1);
+			jQuery('#jform_php_ajaxmethod').removeAttr('required');
+			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
+			jQuery('#jform_php_ajaxmethod').removeClass('required');
+			jform_vvvvvykvyg_required = true;
 		}
 	}
 }
@ -401,6 +438,33 @@ function isSet(val)
 	return false;
 }

+jQuery(document).ready(function()
+{
+	// get the linked details
+	getLinked();
+});
+			
+function getLinked_server(type){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && type > 0){
+		var request = 'token='+token+'&type='+type;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+function getLinked(){
+	getLinked_server(1).done(function(result) {
+		if(result){
+			jQuery('#display_linked_to').html(result);
+		}
+	});
+}			
 			
 function getSnippetDetails_server(snippetId){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
--- a/admin/models/forms/custom_admin_view.xml
+++ b/admin/models/forms/custom_admin_view.xml
@ -155,21 +155,20 @@
                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_LABEL"
                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ICON_DESCRIPTION"
                       directory="" />
-                <!-- Add_js_document Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_js_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
-                       class="btn-group btn-group-yesno"
+                <!-- Libraries Field. Type: Libraries. (custom)-->
+                <field type="libraries"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
-                <!-- Add_php_document Field. Type: Radio. (joomla)-->
+                       required="false"
+                       button="true" />
+                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_php_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+                       name="add_php_ajax"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_AJAX_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -184,17 +183,17 @@
                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
                       heading="h4"
                       class="note_add_language_string" />
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_jview_display"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
-                </field>
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_libraries_selection"
@ -202,16 +201,17 @@
                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info note_libraries_selection" />
-                <!-- Libraries Field. Type: Libraries. (custom)-->
-                <field type="libraries"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview_display"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
+                       required="true" />
                <!-- Add_css Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_css"
@ -229,38 +229,112 @@
                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
                       heading="h4"
                       class="snippet-code note_uikit_snippet" />
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
+                <!-- Ajax_input Field. Type: Subform. (joomla)-->
+                <field type="subform"
+                       name="ajax_input"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_AJAX_INPUT_LABEL"
+                       layout="joomla.form.field.subform.repeatable-table"
+                       multiple="true"
+                       icon="list"
+                       maximum="150">
+                        <form hidden="true"
+                              name="list_ajax_input_modal"
+                              repeat="true">
+                                <!-- Value_name Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="value_name"
+                                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_DESCRIPTION"
+                                       class="text_area"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="STRING"
+                                       message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_VALUE_NAME_HINT" />
+                                <!-- Task_name Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="task_name"
+                                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_DESCRIPTION"
+                                       class="text_area"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="WORD"
+                                       message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_TASK_NAME_HINT" />
+                                <!-- Input_default Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="input_default"
+                                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       default="NULL"
+                                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_DESCRIPTION"
+                                       class="text_area"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="STRING"
+                                       message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_DEFAULT_HINT" />
+                                <!-- Input_filter Field. Type: List. (joomla)-->
+                                <field type="list"
+                                       name="input_filter"
+                                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_LABEL"
+                                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INPUT_FILTER_DESCRIPTION"
+                                       class="list_class"
+                                       multiple="false"
+                                       filter="WORD"
+                                       required="false"
+                                       default="INT">
                                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                                        <option value="INT">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_INT</option>
+                                        <option value="UINT">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UINT</option>
+                                        <option value="FLOAT">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FLOAT</option>
+                                        <option value="BOOLEAN">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BOOLEAN</option>
+                                        <option value="WORD">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_WORD</option>
+                                        <option value="ALNUM">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ALNUM</option>
+                                        <option value="CMD">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_CMD</option>
+                                        <option value="BASE64">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_BASESIXTY_FOUR</option>
+                                        <option value="STRING">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_STRING</option>
+                                        <option value="HTML">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HTML</option>
+                                        <option value="ARRAY">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ARRAY</option>
+                                        <option value="PATH">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PATH</option>
+                                        <option value="USERNAME">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USERNAME</option>
+                                        <option value="RAW">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_RAW</option>
+                                        <option value="unknown">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_UNKNOWN</option>
                                </field>
-                <!-- Php_controller Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_controller"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
-                       required="false" />
-                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_jview"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                                <!-- Method_name Field. Type: Text. (joomla)-->
+                                <field type="text"
+                                       name="method_name"
+                                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_LABEL"
+                                       size="40"
+                                       maxlength="150"
+                                       default="getValueNow"
+                                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_DESCRIPTION"
+                                       class="text_area"
+                                       readonly="false"
+                                       disabled="false"
+                                       required="false"
+                                       filter="WORD"
+                                       message="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_MESSAGE"
+                                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_METHOD_NAME_HINT" />
+                                <!-- User_check Field. Type: Checkbox. (joomla)-->
+                                <field type="checkbox"
+                                       name="user_check"
+                                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_LABEL"
+                                       value="1"
+                                       default="1"
+                                       required="false"
+                                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_USER_CHECK_DESCRIPTION"
+                                       class="inputbox" />
+                        </form>
                </field>
                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
@ -268,6 +342,39 @@
                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_SNIPPET_USAGE_LABEL"
                       heading="h4"
                       class="snippet-usage note_snippet_usage" />
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_view"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
+                       required="true" />
+                <!-- Add_js_document Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_js_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_JS_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_jview Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT"
+                       required="true" />
                <!-- Default Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="default"
@ -278,17 +385,6 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DEFAULT_HINT"
                       required="true" />
-                <!-- Php_model Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_model"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
-                       required="false" />
                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_javascript_file"
@ -370,16 +466,16 @@
                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_GET_DESCRIPTION"
                       multiple="false"
                       required="false" />
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <!-- Php_ajaxmethod Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       name="php_ajaxmethod"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_DOCUMENT_HINT"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_AJAXMETHOD_HINT"
                       required="true" />
                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
@ -388,17 +484,17 @@
                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_DYNAMIC_VALUES_DESCRIPTION"
                       heading="h4"
                       class="dynamic_values" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_VIEW_HINT"
-                       required="true" />
+                <!-- Add_php_document Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_document"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_custom_button"
@ -410,17 +506,17 @@
                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
                </field>
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
+                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_view"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_VIEW_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
                <!-- Custom_button Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="custom_button"
@ -708,17 +804,57 @@
                                </field>
                        </form>
                </field>
-                <!-- Php_jview Field. Type: Textarea. (joomla)-->
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_jview_display"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_controller Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="php_jview"
-                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_DESCRIPTION"
+                       name="php_controller"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_JVIEW_HINT"
-                       required="true" />
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_CONTROLLER_HINT"
+                       required="false" />
+                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_jview"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_ADD_PHP_JVIEW_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NO</option>
+                </field>
+                <!-- Php_model Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_model"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PHP_MODEL_HINT"
+                       required="false" />
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_linked_to_notice"
+                       label="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
+                       description="COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
+                       heading="h4"
+                       class="note_linked_to_notice" />
        </fieldset>
 	
 	<!-- Access Control Fields. -->
--- a/admin/models/forms/custom_code.js
+++ b/admin/models/forms/custom_code.js
@ -23,43 +23,43 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzsvzk_required = false;
-jform_vvvvvztvzl_required = false;
-jform_vvvvvztvzm_required = false;
-jform_vvvvvztvzn_required = false;
+jform_vvvvvzuvzm_required = false;
+jform_vvvvvzvvzn_required = false;
+jform_vvvvvzvvzo_required = false;
+jform_vvvvvzvvzp_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs);
-
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(target_vvvvvzt);
-
 	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+	vvvvvzu(target_vvvvvzu);

-	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+	vvvvvzv(target_vvvvvzv);
+
+	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
+
+	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
 });

-// the vvvvvzs function
-function vvvvvzs(target_vvvvvzs)
+// the vvvvvzu function
+function vvvvvzu(target_vvvvvzu)
 {
 	// set the function logic
-	if (target_vvvvvzs == 2)
+	if (target_vvvvvzu == 2)
 	{
 		jQuery('#jform_function_name').closest('.control-group').show();
-		if (jform_vvvvvzsvzk_required)
+		if (jform_vvvvvzuvzm_required)
 		{
 			updateFieldRequired('function_name',0);
 			jQuery('#jform_function_name').prop('required','required');
 			jQuery('#jform_function_name').attr('aria-required',true);
 			jQuery('#jform_function_name').addClass('required');
-			jform_vvvvvzsvzk_required = false;
+			jform_vvvvvzuvzm_required = false;
 		}

 		jQuery('.note_jcb_placeholder').closest('.control-group').show();
@ -68,99 +68,99 @@ function vvvvvzs(target_vvvvvzs)
 	else
 	{
 		jQuery('#jform_function_name').closest('.control-group').hide();
-		if (!jform_vvvvvzsvzk_required)
+		if (!jform_vvvvvzuvzm_required)
 		{
 			updateFieldRequired('function_name',1);
 			jQuery('#jform_function_name').removeAttr('required');
 			jQuery('#jform_function_name').removeAttr('aria-required');
 			jQuery('#jform_function_name').removeClass('required');
-			jform_vvvvvzsvzk_required = true;
+			jform_vvvvvzuvzm_required = true;
 		}
 		jQuery('.note_jcb_placeholder').closest('.control-group').hide();
 		jQuery('#jform_system_name').closest('.control-group').hide();
 	}
 }

-// the vvvvvzt function
-function vvvvvzt(target_vvvvvzt)
+// the vvvvvzv function
+function vvvvvzv(target_vvvvvzv)
 {
 	// set the function logic
-	if (target_vvvvvzt == 1)
+	if (target_vvvvvzv == 1)
 	{
 		jQuery('#jform_component').closest('.control-group').show();
-		if (jform_vvvvvztvzl_required)
+		if (jform_vvvvvzvvzn_required)
 		{
 			updateFieldRequired('component',0);
 			jQuery('#jform_component').prop('required','required');
 			jQuery('#jform_component').attr('aria-required',true);
 			jQuery('#jform_component').addClass('required');
-			jform_vvvvvztvzl_required = false;
+			jform_vvvvvzvvzn_required = false;
 		}

 		jQuery('#jform_path').closest('.control-group').show();
-		if (jform_vvvvvztvzm_required)
+		if (jform_vvvvvzvvzo_required)
 		{
 			updateFieldRequired('path',0);
 			jQuery('#jform_path').prop('required','required');
 			jQuery('#jform_path').attr('aria-required',true);
 			jQuery('#jform_path').addClass('required');
-			jform_vvvvvztvzm_required = false;
+			jform_vvvvvzvvzo_required = false;
 		}

 		jQuery('#jform_from_line').closest('.control-group').show();
 		jQuery('#jform_hashtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
 		jQuery('#jform_type').closest('.control-group').show();
-		if (jform_vvvvvztvzn_required)
+		if (jform_vvvvvzvvzp_required)
 		{
 			updateFieldRequired('type',0);
 			jQuery('#jform_type').prop('required','required');
 			jQuery('#jform_type').attr('aria-required',true);
 			jQuery('#jform_type').addClass('required');
-			jform_vvvvvztvzn_required = false;
+			jform_vvvvvzvvzp_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_component').closest('.control-group').hide();
-		if (!jform_vvvvvztvzl_required)
+		if (!jform_vvvvvzvvzn_required)
 		{
 			updateFieldRequired('component',1);
 			jQuery('#jform_component').removeAttr('required');
 			jQuery('#jform_component').removeAttr('aria-required');
 			jQuery('#jform_component').removeClass('required');
-			jform_vvvvvztvzl_required = true;
+			jform_vvvvvzvvzn_required = true;
 		}
 		jQuery('#jform_path').closest('.control-group').hide();
-		if (!jform_vvvvvztvzm_required)
+		if (!jform_vvvvvzvvzo_required)
 		{
 			updateFieldRequired('path',1);
 			jQuery('#jform_path').removeAttr('required');
 			jQuery('#jform_path').removeAttr('aria-required');
 			jQuery('#jform_path').removeClass('required');
-			jform_vvvvvztvzm_required = true;
+			jform_vvvvvzvvzo_required = true;
 		}
 		jQuery('#jform_from_line').closest('.control-group').hide();
 		jQuery('#jform_hashtarget').closest('.control-group').hide();
 		jQuery('#jform_to_line').closest('.control-group').hide();
 		jQuery('#jform_type').closest('.control-group').hide();
-		if (!jform_vvvvvztvzn_required)
+		if (!jform_vvvvvzvvzp_required)
 		{
 			updateFieldRequired('type',1);
 			jQuery('#jform_type').removeAttr('required');
 			jQuery('#jform_type').removeAttr('aria-required');
 			jQuery('#jform_type').removeClass('required');
-			jform_vvvvvztvzn_required = true;
+			jform_vvvvvzvvzp_required = true;
 		}
 	}
 }

-// the vvvvvzu function
-function vvvvvzu(target_vvvvvzu,type_vvvvvzu)
+// the vvvvvzw function
+function vvvvvzw(target_vvvvvzw,type_vvvvvzw)
 {
 	// set the function logic
-	if (target_vvvvvzu == 1 && type_vvvvvzu == 1)
+	if (target_vvvvvzw == 1 && type_vvvvvzw == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
@ -172,11 +172,11 @@ function vvvvvzu(target_vvvvvzu,type_vvvvvzu)
 	}
 }

-// the vvvvvzv function
-function vvvvvzv(type_vvvvvzv,target_vvvvvzv)
+// the vvvvvzx function
+function vvvvvzx(type_vvvvvzx,target_vvvvvzx)
 {
 	// set the function logic
-	if (type_vvvvvzv == 1 && target_vvvvvzv == 1)
+	if (type_vvvvvzx == 1 && target_vvvvvzx == 1)
 	{
 		jQuery('#jform_hashendtarget').closest('.control-group').show();
 		jQuery('#jform_to_line').closest('.control-group').show();
--- a/admin/models/forms/dynamic_get.js
+++ b/admin/models/forms/dynamic_get.js
--- a/admin/models/forms/dynamic_get.xml
+++ b/admin/models/forms/dynamic_get.xml
--- a/admin/models/forms/field.js
+++ b/admin/models/forms/field.js
@ -23,210 +23,96 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwaevzq_required = false;
-jform_vvvvwafvzr_required = false;
 jform_vvvvwagvzs_required = false;
 jform_vvvvwahvzt_required = false;
-jform_vvvvwakvzu_required = false;
-jform_vvvvwalvzv_required = false;
+jform_vvvvwaivzu_required = false;
+jform_vvvvwajvzv_required = false;
 jform_vvvvwamvzw_required = false;
 jform_vvvvwanvzx_required = false;
+jform_vvvvwaovzy_required = false;
+jform_vvvvwapvzz_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwae(datalenght_vvvvwae);
+	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
+	vvvvwag(datalenght_vvvvwag);

-	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwaf(datadefault_vvvvwaf);
+	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
+	vvvvwah(datadefault_vvvvwah);

-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(datatype_vvvvwag);
-
-	var datatype_vvvvwah = jQuery("#jform_datatype").val();
-	vvvvwah(datatype_vvvvwah);
-
-	var store_vvvvwai = jQuery("#jform_store").val();
 	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+	vvvvwai(datatype_vvvvwai);

-	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwak(add_css_view_vvvvwak);
+	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
+	vvvvwaj(datatype_vvvvwaj);

-	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwal(add_css_views_vvvvwal);
+	var store_vvvvwak = jQuery("#jform_store").val();
+	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	vvvvwak(store_vvvvwak,datatype_vvvvwak);

-	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwam(add_javascript_view_footer_vvvvwam);
+	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwam(add_css_view_vvvvwam);

-	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwan(add_javascript_views_footer_vvvvwan);
+	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwan(add_css_views_vvvvwan);
+
+	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwao(add_javascript_view_footer_vvvvwao);
+
+	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwap(add_javascript_views_footer_vvvvwap);
 });

-// the vvvvwae function
-function vvvvwae(datalenght_vvvvwae)
+// the vvvvwag function
+function vvvvwag(datalenght_vvvvwag)
 {
-	if (isSet(datalenght_vvvvwae) && datalenght_vvvvwae.constructor !== Array)
+	if (isSet(datalenght_vvvvwag) && datalenght_vvvvwag.constructor !== Array)
 	{
-		var temp_vvvvwae = datalenght_vvvvwae;
-		var datalenght_vvvvwae = [];
-		datalenght_vvvvwae.push(temp_vvvvwae);
+		var temp_vvvvwag = datalenght_vvvvwag;
+		var datalenght_vvvvwag = [];
+		datalenght_vvvvwag.push(temp_vvvvwag);
 	}
-	else if (!isSet(datalenght_vvvvwae))
+	else if (!isSet(datalenght_vvvvwag))
 	{
-		var datalenght_vvvvwae = [];
+		var datalenght_vvvvwag = [];
 	}
-	var datalenght = datalenght_vvvvwae.some(datalenght_vvvvwae_SomeFunc);
+	var datalenght = datalenght_vvvvwag.some(datalenght_vvvvwag_SomeFunc);


 	// set this function logic
 	if (datalenght)
 	{
 		jQuery('#jform_datalenght_other').closest('.control-group').show();
-		if (jform_vvvvwaevzq_required)
+		if (jform_vvvvwagvzs_required)
 		{
 			updateFieldRequired('datalenght_other',0);
 			jQuery('#jform_datalenght_other').prop('required','required');
 			jQuery('#jform_datalenght_other').attr('aria-required',true);
 			jQuery('#jform_datalenght_other').addClass('required');
-			jform_vvvvwaevzq_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datalenght_other').closest('.control-group').hide();
-		if (!jform_vvvvwaevzq_required)
-		{
-			updateFieldRequired('datalenght_other',1);
-			jQuery('#jform_datalenght_other').removeAttr('required');
-			jQuery('#jform_datalenght_other').removeAttr('aria-required');
-			jQuery('#jform_datalenght_other').removeClass('required');
-			jform_vvvvwaevzq_required = true;
-		}
-	}
-}
-
-// the vvvvwae Some function
-function datalenght_vvvvwae_SomeFunc(datalenght_vvvvwae)
-{
-	// set the function logic
-	if (datalenght_vvvvwae == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwaf function
-function vvvvwaf(datadefault_vvvvwaf)
-{
-	if (isSet(datadefault_vvvvwaf) && datadefault_vvvvwaf.constructor !== Array)
-	{
-		var temp_vvvvwaf = datadefault_vvvvwaf;
-		var datadefault_vvvvwaf = [];
-		datadefault_vvvvwaf.push(temp_vvvvwaf);
-	}
-	else if (!isSet(datadefault_vvvvwaf))
-	{
-		var datadefault_vvvvwaf = [];
-	}
-	var datadefault = datadefault_vvvvwaf.some(datadefault_vvvvwaf_SomeFunc);
-
-
-	// set this function logic
-	if (datadefault)
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').show();
-		if (jform_vvvvwafvzr_required)
-		{
-			updateFieldRequired('datadefault_other',0);
-			jQuery('#jform_datadefault_other').prop('required','required');
-			jQuery('#jform_datadefault_other').attr('aria-required',true);
-			jQuery('#jform_datadefault_other').addClass('required');
-			jform_vvvvwafvzr_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_datadefault_other').closest('.control-group').hide();
-		if (!jform_vvvvwafvzr_required)
-		{
-			updateFieldRequired('datadefault_other',1);
-			jQuery('#jform_datadefault_other').removeAttr('required');
-			jQuery('#jform_datadefault_other').removeAttr('aria-required');
-			jQuery('#jform_datadefault_other').removeClass('required');
-			jform_vvvvwafvzr_required = true;
-		}
-	}
-}
-
-// the vvvvwaf Some function
-function datadefault_vvvvwaf_SomeFunc(datadefault_vvvvwaf)
-{
-	// set the function logic
-	if (datadefault_vvvvwaf == 'Other')
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwag function
-function vvvvwag(datatype_vvvvwag)
-{
-	if (isSet(datatype_vvvvwag) && datatype_vvvvwag.constructor !== Array)
-	{
-		var temp_vvvvwag = datatype_vvvvwag;
-		var datatype_vvvvwag = [];
-		datatype_vvvvwag.push(temp_vvvvwag);
-	}
-	else if (!isSet(datatype_vvvvwag))
-	{
-		var datatype_vvvvwag = [];
-	}
-	var datatype = datatype_vvvvwag.some(datatype_vvvvwag_SomeFunc);
-
-
-	// set this function logic
-	if (datatype)
-	{
-		jQuery('#jform_datadefault').closest('.control-group').show();
-		jQuery('#jform_datalenght').closest('.control-group').show();
-		jQuery('#jform_indexes').closest('.control-group').show();
-		if (jform_vvvvwagvzs_required)
-		{
-			updateFieldRequired('indexes',0);
-			jQuery('#jform_indexes').prop('required','required');
-			jQuery('#jform_indexes').attr('aria-required',true);
-			jQuery('#jform_indexes').addClass('required');
 			jform_vvvvwagvzs_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_datadefault').closest('.control-group').hide();
-		jQuery('#jform_datalenght').closest('.control-group').hide();
-		jQuery('#jform_indexes').closest('.control-group').hide();
+		jQuery('#jform_datalenght_other').closest('.control-group').hide();
 		if (!jform_vvvvwagvzs_required)
 		{
-			updateFieldRequired('indexes',1);
-			jQuery('#jform_indexes').removeAttr('required');
-			jQuery('#jform_indexes').removeAttr('aria-required');
-			jQuery('#jform_indexes').removeClass('required');
+			updateFieldRequired('datalenght_other',1);
+			jQuery('#jform_datalenght_other').removeAttr('required');
+			jQuery('#jform_datalenght_other').removeAttr('aria-required');
+			jQuery('#jform_datalenght_other').removeClass('required');
 			jform_vvvvwagvzs_required = true;
 		}
 	}
 }

 // the vvvvwag Some function
-function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
+function datalenght_vvvvwag_SomeFunc(datalenght_vvvvwag)
 {
 	// set the function logic
-	if (datatype_vvvvwag == 'CHAR' || datatype_vvvvwag == 'VARCHAR' || datatype_vvvvwag == 'DATETIME' || datatype_vvvvwag == 'DATE' || datatype_vvvvwag == 'TIME' || datatype_vvvvwag == 'INT' || datatype_vvvvwag == 'TINYINT' || datatype_vvvvwag == 'BIGINT' || datatype_vvvvwag == 'FLOAT' || datatype_vvvvwag == 'DECIMAL' || datatype_vvvvwag == 'DOUBLE')
+	if (datalenght_vvvvwag == 'Other')
 	{
 		return true;
 	}
@ -234,54 +120,54 @@ function datatype_vvvvwag_SomeFunc(datatype_vvvvwag)
 }

 // the vvvvwah function
-function vvvvwah(datatype_vvvvwah)
+function vvvvwah(datadefault_vvvvwah)
 {
-	if (isSet(datatype_vvvvwah) && datatype_vvvvwah.constructor !== Array)
+	if (isSet(datadefault_vvvvwah) && datadefault_vvvvwah.constructor !== Array)
 	{
-		var temp_vvvvwah = datatype_vvvvwah;
-		var datatype_vvvvwah = [];
-		datatype_vvvvwah.push(temp_vvvvwah);
+		var temp_vvvvwah = datadefault_vvvvwah;
+		var datadefault_vvvvwah = [];
+		datadefault_vvvvwah.push(temp_vvvvwah);
 	}
-	else if (!isSet(datatype_vvvvwah))
+	else if (!isSet(datadefault_vvvvwah))
 	{
-		var datatype_vvvvwah = [];
+		var datadefault_vvvvwah = [];
 	}
-	var datatype = datatype_vvvvwah.some(datatype_vvvvwah_SomeFunc);
+	var datadefault = datadefault_vvvvwah.some(datadefault_vvvvwah_SomeFunc);


 	// set this function logic
-	if (datatype)
+	if (datadefault)
 	{
-		jQuery('#jform_store').closest('.control-group').show();
+		jQuery('#jform_datadefault_other').closest('.control-group').show();
 		if (jform_vvvvwahvzt_required)
 		{
-			updateFieldRequired('store',0);
-			jQuery('#jform_store').prop('required','required');
-			jQuery('#jform_store').attr('aria-required',true);
-			jQuery('#jform_store').addClass('required');
+			updateFieldRequired('datadefault_other',0);
+			jQuery('#jform_datadefault_other').prop('required','required');
+			jQuery('#jform_datadefault_other').attr('aria-required',true);
+			jQuery('#jform_datadefault_other').addClass('required');
 			jform_vvvvwahvzt_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_store').closest('.control-group').hide();
+		jQuery('#jform_datadefault_other').closest('.control-group').hide();
 		if (!jform_vvvvwahvzt_required)
 		{
-			updateFieldRequired('store',1);
-			jQuery('#jform_store').removeAttr('required');
-			jQuery('#jform_store').removeAttr('aria-required');
-			jQuery('#jform_store').removeClass('required');
+			updateFieldRequired('datadefault_other',1);
+			jQuery('#jform_datadefault_other').removeAttr('required');
+			jQuery('#jform_datadefault_other').removeAttr('aria-required');
+			jQuery('#jform_datadefault_other').removeClass('required');
 			jform_vvvvwahvzt_required = true;
 		}
 	}
 }

 // the vvvvwah Some function
-function datatype_vvvvwah_SomeFunc(datatype_vvvvwah)
+function datadefault_vvvvwah_SomeFunc(datadefault_vvvvwah)
 {
 	// set the function logic
-	if (datatype_vvvvwah == 'CHAR' || datatype_vvvvwah == 'VARCHAR' || datatype_vvvvwah == 'TEXT' || datatype_vvvvwah == 'MEDIUMTEXT' || datatype_vvvvwah == 'LONGTEXT')
+	if (datadefault_vvvvwah == 'Other')
 	{
 		return true;
 	}
@ -289,20 +175,8 @@ function datatype_vvvvwah_SomeFunc(datatype_vvvvwah)
 }

 // the vvvvwai function
-function vvvvwai(store_vvvvwai,datatype_vvvvwai)
+function vvvvwai(datatype_vvvvwai)
 {
-	if (isSet(store_vvvvwai) && store_vvvvwai.constructor !== Array)
-	{
-		var temp_vvvvwai = store_vvvvwai;
-		var store_vvvvwai = [];
-		store_vvvvwai.push(temp_vvvvwai);
-	}
-	else if (!isSet(store_vvvvwai))
-	{
-		var store_vvvvwai = [];
-	}
-	var store = store_vvvvwai.some(store_vvvvwai_SomeFunc);
-
 	if (isSet(datatype_vvvvwai) && datatype_vvvvwai.constructor !== Array)
 	{
 		var temp_vvvvwai = datatype_vvvvwai;
@ -316,6 +190,132 @@ function vvvvwai(store_vvvvwai,datatype_vvvvwai)
 	var datatype = datatype_vvvvwai.some(datatype_vvvvwai_SomeFunc);


+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_datadefault').closest('.control-group').show();
+		jQuery('#jform_datalenght').closest('.control-group').show();
+		jQuery('#jform_indexes').closest('.control-group').show();
+		if (jform_vvvvwaivzu_required)
+		{
+			updateFieldRequired('indexes',0);
+			jQuery('#jform_indexes').prop('required','required');
+			jQuery('#jform_indexes').attr('aria-required',true);
+			jQuery('#jform_indexes').addClass('required');
+			jform_vvvvwaivzu_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_datadefault').closest('.control-group').hide();
+		jQuery('#jform_datalenght').closest('.control-group').hide();
+		jQuery('#jform_indexes').closest('.control-group').hide();
+		if (!jform_vvvvwaivzu_required)
+		{
+			updateFieldRequired('indexes',1);
+			jQuery('#jform_indexes').removeAttr('required');
+			jQuery('#jform_indexes').removeAttr('aria-required');
+			jQuery('#jform_indexes').removeClass('required');
+			jform_vvvvwaivzu_required = true;
+		}
+	}
+}
+
+// the vvvvwai Some function
+function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
+{
+	// set the function logic
+	if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'DATETIME' || datatype_vvvvwai == 'DATE' || datatype_vvvvwai == 'TIME' || datatype_vvvvwai == 'INT' || datatype_vvvvwai == 'TINYINT' || datatype_vvvvwai == 'BIGINT' || datatype_vvvvwai == 'FLOAT' || datatype_vvvvwai == 'DECIMAL' || datatype_vvvvwai == 'DOUBLE')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwaj function
+function vvvvwaj(datatype_vvvvwaj)
+{
+	if (isSet(datatype_vvvvwaj) && datatype_vvvvwaj.constructor !== Array)
+	{
+		var temp_vvvvwaj = datatype_vvvvwaj;
+		var datatype_vvvvwaj = [];
+		datatype_vvvvwaj.push(temp_vvvvwaj);
+	}
+	else if (!isSet(datatype_vvvvwaj))
+	{
+		var datatype_vvvvwaj = [];
+	}
+	var datatype = datatype_vvvvwaj.some(datatype_vvvvwaj_SomeFunc);
+
+
+	// set this function logic
+	if (datatype)
+	{
+		jQuery('#jform_store').closest('.control-group').show();
+		if (jform_vvvvwajvzv_required)
+		{
+			updateFieldRequired('store',0);
+			jQuery('#jform_store').prop('required','required');
+			jQuery('#jform_store').attr('aria-required',true);
+			jQuery('#jform_store').addClass('required');
+			jform_vvvvwajvzv_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_store').closest('.control-group').hide();
+		if (!jform_vvvvwajvzv_required)
+		{
+			updateFieldRequired('store',1);
+			jQuery('#jform_store').removeAttr('required');
+			jQuery('#jform_store').removeAttr('aria-required');
+			jQuery('#jform_store').removeClass('required');
+			jform_vvvvwajvzv_required = true;
+		}
+	}
+}
+
+// the vvvvwaj Some function
+function datatype_vvvvwaj_SomeFunc(datatype_vvvvwaj)
+{
+	// set the function logic
+	if (datatype_vvvvwaj == 'CHAR' || datatype_vvvvwaj == 'VARCHAR' || datatype_vvvvwaj == 'TEXT' || datatype_vvvvwaj == 'MEDIUMTEXT' || datatype_vvvvwaj == 'LONGTEXT')
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwak function
+function vvvvwak(store_vvvvwak,datatype_vvvvwak)
+{
+	if (isSet(store_vvvvwak) && store_vvvvwak.constructor !== Array)
+	{
+		var temp_vvvvwak = store_vvvvwak;
+		var store_vvvvwak = [];
+		store_vvvvwak.push(temp_vvvvwak);
+	}
+	else if (!isSet(store_vvvvwak))
+	{
+		var store_vvvvwak = [];
+	}
+	var store = store_vvvvwak.some(store_vvvvwak_SomeFunc);
+
+	if (isSet(datatype_vvvvwak) && datatype_vvvvwak.constructor !== Array)
+	{
+		var temp_vvvvwak = datatype_vvvvwak;
+		var datatype_vvvvwak = [];
+		datatype_vvvvwak.push(temp_vvvvwak);
+	}
+	else if (!isSet(datatype_vvvvwak))
+	{
+		var datatype_vvvvwak = [];
+	}
+	var datatype = datatype_vvvvwak.some(datatype_vvvvwak_SomeFunc);
+
+
 	// set this function logic
 	if (store && datatype)
 	{
@ -327,148 +327,148 @@ function vvvvwai(store_vvvvwai,datatype_vvvvwai)
 	}
 }

-// the vvvvwai Some function
-function store_vvvvwai_SomeFunc(store_vvvvwai)
+// the vvvvwak Some function
+function store_vvvvwak_SomeFunc(store_vvvvwak)
 {
 	// set the function logic
-	if (store_vvvvwai == 4)
+	if (store_vvvvwak == 4)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwai Some function
-function datatype_vvvvwai_SomeFunc(datatype_vvvvwai)
+// the vvvvwak Some function
+function datatype_vvvvwak_SomeFunc(datatype_vvvvwak)
 {
 	// set the function logic
-	if (datatype_vvvvwai == 'CHAR' || datatype_vvvvwai == 'VARCHAR' || datatype_vvvvwai == 'TEXT' || datatype_vvvvwai == 'MEDIUMTEXT' || datatype_vvvvwai == 'LONGTEXT')
+	if (datatype_vvvvwak == 'CHAR' || datatype_vvvvwak == 'VARCHAR' || datatype_vvvvwak == 'TEXT' || datatype_vvvvwak == 'MEDIUMTEXT' || datatype_vvvvwak == 'LONGTEXT')
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwak function
-function vvvvwak(add_css_view_vvvvwak)
+// the vvvvwam function
+function vvvvwam(add_css_view_vvvvwam)
 {
 	// set the function logic
-	if (add_css_view_vvvvwak == 1)
+	if (add_css_view_vvvvwam == 1)
 	{
 		jQuery('#jform_css_view').closest('.control-group').show();
-		if (jform_vvvvwakvzu_required)
+		if (jform_vvvvwamvzw_required)
 		{
 			updateFieldRequired('css_view',0);
 			jQuery('#jform_css_view').prop('required','required');
 			jQuery('#jform_css_view').attr('aria-required',true);
 			jQuery('#jform_css_view').addClass('required');
-			jform_vvvvwakvzu_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_view').closest('.control-group').hide();
-		if (!jform_vvvvwakvzu_required)
-		{
-			updateFieldRequired('css_view',1);
-			jQuery('#jform_css_view').removeAttr('required');
-			jQuery('#jform_css_view').removeAttr('aria-required');
-			jQuery('#jform_css_view').removeClass('required');
-			jform_vvvvwakvzu_required = true;
-		}
-	}
-}
-
-// the vvvvwal function
-function vvvvwal(add_css_views_vvvvwal)
-{
-	// set the function logic
-	if (add_css_views_vvvvwal == 1)
-	{
-		jQuery('#jform_css_views').closest('.control-group').show();
-		if (jform_vvvvwalvzv_required)
-		{
-			updateFieldRequired('css_views',0);
-			jQuery('#jform_css_views').prop('required','required');
-			jQuery('#jform_css_views').attr('aria-required',true);
-			jQuery('#jform_css_views').addClass('required');
-			jform_vvvvwalvzv_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_css_views').closest('.control-group').hide();
-		if (!jform_vvvvwalvzv_required)
-		{
-			updateFieldRequired('css_views',1);
-			jQuery('#jform_css_views').removeAttr('required');
-			jQuery('#jform_css_views').removeAttr('aria-required');
-			jQuery('#jform_css_views').removeClass('required');
-			jform_vvvvwalvzv_required = true;
-		}
-	}
-}
-
-// the vvvvwam function
-function vvvvwam(add_javascript_view_footer_vvvvwam)
-{
-	// set the function logic
-	if (add_javascript_view_footer_vvvvwam == 1)
-	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
-		if (jform_vvvvwamvzw_required)
-		{
-			updateFieldRequired('javascript_view_footer',0);
-			jQuery('#jform_javascript_view_footer').prop('required','required');
-			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_view_footer').addClass('required');
 			jform_vvvvwamvzw_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		jQuery('#jform_css_view').closest('.control-group').hide();
 		if (!jform_vvvvwamvzw_required)
 		{
-			updateFieldRequired('javascript_view_footer',1);
-			jQuery('#jform_javascript_view_footer').removeAttr('required');
-			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
-			jQuery('#jform_javascript_view_footer').removeClass('required');
+			updateFieldRequired('css_view',1);
+			jQuery('#jform_css_view').removeAttr('required');
+			jQuery('#jform_css_view').removeAttr('aria-required');
+			jQuery('#jform_css_view').removeClass('required');
 			jform_vvvvwamvzw_required = true;
 		}
 	}
 }

 // the vvvvwan function
-function vvvvwan(add_javascript_views_footer_vvvvwan)
+function vvvvwan(add_css_views_vvvvwan)
 {
 	// set the function logic
-	if (add_javascript_views_footer_vvvvwan == 1)
+	if (add_css_views_vvvvwan == 1)
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		jQuery('#jform_css_views').closest('.control-group').show();
 		if (jform_vvvvwanvzx_required)
 		{
-			updateFieldRequired('javascript_views_footer',0);
-			jQuery('#jform_javascript_views_footer').prop('required','required');
-			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
-			jQuery('#jform_javascript_views_footer').addClass('required');
+			updateFieldRequired('css_views',0);
+			jQuery('#jform_css_views').prop('required','required');
+			jQuery('#jform_css_views').attr('aria-required',true);
+			jQuery('#jform_css_views').addClass('required');
 			jform_vvvvwanvzx_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		jQuery('#jform_css_views').closest('.control-group').hide();
 		if (!jform_vvvvwanvzx_required)
+		{
+			updateFieldRequired('css_views',1);
+			jQuery('#jform_css_views').removeAttr('required');
+			jQuery('#jform_css_views').removeAttr('aria-required');
+			jQuery('#jform_css_views').removeClass('required');
+			jform_vvvvwanvzx_required = true;
+		}
+	}
+}
+
+// the vvvvwao function
+function vvvvwao(add_javascript_view_footer_vvvvwao)
+{
+	// set the function logic
+	if (add_javascript_view_footer_vvvvwao == 1)
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').show();
+		if (jform_vvvvwaovzy_required)
+		{
+			updateFieldRequired('javascript_view_footer',0);
+			jQuery('#jform_javascript_view_footer').prop('required','required');
+			jQuery('#jform_javascript_view_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_view_footer').addClass('required');
+			jform_vvvvwaovzy_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
+		if (!jform_vvvvwaovzy_required)
+		{
+			updateFieldRequired('javascript_view_footer',1);
+			jQuery('#jform_javascript_view_footer').removeAttr('required');
+			jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
+			jQuery('#jform_javascript_view_footer').removeClass('required');
+			jform_vvvvwaovzy_required = true;
+		}
+	}
+}
+
+// the vvvvwap function
+function vvvvwap(add_javascript_views_footer_vvvvwap)
+{
+	// set the function logic
+	if (add_javascript_views_footer_vvvvwap == 1)
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').show();
+		if (jform_vvvvwapvzz_required)
+		{
+			updateFieldRequired('javascript_views_footer',0);
+			jQuery('#jform_javascript_views_footer').prop('required','required');
+			jQuery('#jform_javascript_views_footer').attr('aria-required',true);
+			jQuery('#jform_javascript_views_footer').addClass('required');
+			jform_vvvvwapvzz_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
+		if (!jform_vvvvwapvzz_required)
 		{
 			updateFieldRequired('javascript_views_footer',1);
 			jQuery('#jform_javascript_views_footer').removeAttr('required');
 			jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
 			jQuery('#jform_javascript_views_footer').removeClass('required');
-			jform_vvvvwanvzx_required = true;
+			jform_vvvvwapvzz_required = true;
 		}
 	}
 }
@ -509,6 +509,34 @@ function isSet(val)
 	return false;
 }

+jQuery(document).ready(function()
+{
+	// get the linked details
+	getLinked();
+});
+			
+function getLinked_server(type){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && type > 0){
+		var request = 'token='+token+'&type='+type;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+function getLinked(){
+	getLinked_server(1).done(function(result) {
+		if(result){
+			jQuery('#display_linked_to').html(result);
+		}
+	});
+}			
+
 function getFieldOptions_server(fieldId){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.fieldOptions&format=json";
 	if(token.length > 0 && fieldId > 0){
--- a/admin/models/forms/field.xml
+++ b/admin/models/forms/field.xml
@ -208,7 +208,6 @@
                <!-- Note_filter_information Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_filter_information"
-                       label="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_LABEL"
                       description="COM_COMPONENTBUILDER_FIELD_NOTE_FILTER_INFORMATION_DESCRIPTION"
                       class="note_filter_information" />
                <!-- Datalenght Field. Type: List. (joomla)-->
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@ -23,207 +23,97 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvwaowaa_required = false;
-jform_vvvvwapwab_required = false;
 jform_vvvvwaqwac_required = false;
 jform_vvvvwarwad_required = false;
 jform_vvvvwaswae_required = false;
 jform_vvvvwatwaf_required = false;
+jform_vvvvwauwag_required = false;
+jform_vvvvwavwah_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var location_vvvvwao = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwao(location_vvvvwao);
+	var location_vvvvwaq = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwaq(location_vvvvwaq);

-	var location_vvvvwap = jQuery("#jform_location input[type='radio']:checked").val();
-	vvvvwap(location_vvvvwap);
-
-	var type_vvvvwaq = jQuery("#jform_type").val();
-	vvvvwaq(type_vvvvwaq);
-
-	var type_vvvvwar = jQuery("#jform_type").val();
-	vvvvwar(type_vvvvwar);
+	var location_vvvvwar = jQuery("#jform_location input[type='radio']:checked").val();
+	vvvvwar(location_vvvvwar);

 	var type_vvvvwas = jQuery("#jform_type").val();
 	vvvvwas(type_vvvvwas);

-	var target_vvvvwat = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvwat(target_vvvvwat);
+	var type_vvvvwat = jQuery("#jform_type").val();
+	vvvvwat(type_vvvvwat);
+
+	var type_vvvvwau = jQuery("#jform_type").val();
+	vvvvwau(type_vvvvwau);
+
+	var target_vvvvwav = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvwav(target_vvvvwav);
 });

-// the vvvvwao function
-function vvvvwao(location_vvvvwao)
+// the vvvvwaq function
+function vvvvwaq(location_vvvvwaq)
 {
 	// set the function logic
-	if (location_vvvvwao == 1)
+	if (location_vvvvwaq == 1)
 	{
 		jQuery('#jform_admin_view').closest('.control-group').show();
-		if (jform_vvvvwaowaa_required)
+		if (jform_vvvvwaqwac_required)
 		{
 			updateFieldRequired('admin_view',0);
 			jQuery('#jform_admin_view').prop('required','required');
 			jQuery('#jform_admin_view').attr('aria-required',true);
 			jQuery('#jform_admin_view').addClass('required');
-			jform_vvvvwaowaa_required = false;
+			jform_vvvvwaqwac_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_admin_view').closest('.control-group').hide();
-		if (!jform_vvvvwaowaa_required)
+		if (!jform_vvvvwaqwac_required)
 		{
 			updateFieldRequired('admin_view',1);
 			jQuery('#jform_admin_view').removeAttr('required');
 			jQuery('#jform_admin_view').removeAttr('aria-required');
 			jQuery('#jform_admin_view').removeClass('required');
-			jform_vvvvwaowaa_required = true;
-		}
-	}
-}
-
-// the vvvvwap function
-function vvvvwap(location_vvvvwap)
-{
-	// set the function logic
-	if (location_vvvvwap == 2)
-	{
-		jQuery('#jform_site_view').closest('.control-group').show();
-		if (jform_vvvvwapwab_required)
-		{
-			updateFieldRequired('site_view',0);
-			jQuery('#jform_site_view').prop('required','required');
-			jQuery('#jform_site_view').attr('aria-required',true);
-			jQuery('#jform_site_view').addClass('required');
-			jform_vvvvwapwab_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_site_view').closest('.control-group').hide();
-		if (!jform_vvvvwapwab_required)
-		{
-			updateFieldRequired('site_view',1);
-			jQuery('#jform_site_view').removeAttr('required');
-			jQuery('#jform_site_view').removeAttr('aria-required');
-			jQuery('#jform_site_view').removeClass('required');
-			jform_vvvvwapwab_required = true;
-		}
-	}
-}
-
-// the vvvvwaq function
-function vvvvwaq(type_vvvvwaq)
-{
-	if (isSet(type_vvvvwaq) && type_vvvvwaq.constructor !== Array)
-	{
-		var temp_vvvvwaq = type_vvvvwaq;
-		var type_vvvvwaq = [];
-		type_vvvvwaq.push(temp_vvvvwaq);
-	}
-	else if (!isSet(type_vvvvwaq))
-	{
-		var type_vvvvwaq = [];
-	}
-	var type = type_vvvvwaq.some(type_vvvvwaq_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_url').closest('.control-group').show();
-		if (jform_vvvvwaqwac_required)
-		{
-			updateFieldRequired('url',0);
-			jQuery('#jform_url').prop('required','required');
-			jQuery('#jform_url').attr('aria-required',true);
-			jQuery('#jform_url').addClass('required');
-			jform_vvvvwaqwac_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_url').closest('.control-group').hide();
-		if (!jform_vvvvwaqwac_required)
-		{
-			updateFieldRequired('url',1);
-			jQuery('#jform_url').removeAttr('required');
-			jQuery('#jform_url').removeAttr('aria-required');
-			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwaqwac_required = true;
 		}
 	}
 }

-// the vvvvwaq Some function
-function type_vvvvwaq_SomeFunc(type_vvvvwaq)
+// the vvvvwar function
+function vvvvwar(location_vvvvwar)
 {
 	// set the function logic
-	if (type_vvvvwaq == 3)
+	if (location_vvvvwar == 2)
 	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvwar function
-function vvvvwar(type_vvvvwar)
-{
-	if (isSet(type_vvvvwar) && type_vvvvwar.constructor !== Array)
-	{
-		var temp_vvvvwar = type_vvvvwar;
-		var type_vvvvwar = [];
-		type_vvvvwar.push(temp_vvvvwar);
-	}
-	else if (!isSet(type_vvvvwar))
-	{
-		var type_vvvvwar = [];
-	}
-	var type = type_vvvvwar.some(type_vvvvwar_SomeFunc);
-
-
-	// set this function logic
-	if (type)
-	{
-		jQuery('#jform_article').closest('.control-group').show();
+		jQuery('#jform_site_view').closest('.control-group').show();
 		if (jform_vvvvwarwad_required)
 		{
-			updateFieldRequired('article',0);
-			jQuery('#jform_article').prop('required','required');
-			jQuery('#jform_article').attr('aria-required',true);
-			jQuery('#jform_article').addClass('required');
+			updateFieldRequired('site_view',0);
+			jQuery('#jform_site_view').prop('required','required');
+			jQuery('#jform_site_view').attr('aria-required',true);
+			jQuery('#jform_site_view').addClass('required');
 			jform_vvvvwarwad_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_article').closest('.control-group').hide();
+		jQuery('#jform_site_view').closest('.control-group').hide();
 		if (!jform_vvvvwarwad_required)
 		{
-			updateFieldRequired('article',1);
-			jQuery('#jform_article').removeAttr('required');
-			jQuery('#jform_article').removeAttr('aria-required');
-			jQuery('#jform_article').removeClass('required');
+			updateFieldRequired('site_view',1);
+			jQuery('#jform_site_view').removeAttr('required');
+			jQuery('#jform_site_view').removeAttr('aria-required');
+			jQuery('#jform_site_view').removeClass('required');
 			jform_vvvvwarwad_required = true;
 		}
 	}
 }

-// the vvvvwar Some function
-function type_vvvvwar_SomeFunc(type_vvvvwar)
-{
-	// set the function logic
-	if (type_vvvvwar == 1)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvwas function
 function vvvvwas(type_vvvvwas)
 {
@ -243,26 +133,26 @@ function vvvvwas(type_vvvvwas)
 	// set this function logic
 	if (type)
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').show();
+		jQuery('#jform_url').closest('.control-group').show();
 		if (jform_vvvvwaswae_required)
 		{
-			updateFieldRequired('content',0);
-			jQuery('#jform_content').prop('required','required');
-			jQuery('#jform_content').attr('aria-required',true);
-			jQuery('#jform_content').addClass('required');
+			updateFieldRequired('url',0);
+			jQuery('#jform_url').prop('required','required');
+			jQuery('#jform_url').attr('aria-required',true);
+			jQuery('#jform_url').addClass('required');
 			jform_vvvvwaswae_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		jQuery('#jform_url').closest('.control-group').hide();
 		if (!jform_vvvvwaswae_required)
 		{
-			updateFieldRequired('content',1);
-			jQuery('#jform_content').removeAttr('required');
-			jQuery('#jform_content').removeAttr('aria-required');
-			jQuery('#jform_content').removeClass('required');
+			updateFieldRequired('url',1);
+			jQuery('#jform_url').removeAttr('required');
+			jQuery('#jform_url').removeAttr('aria-required');
+			jQuery('#jform_url').removeClass('required');
 			jform_vvvvwaswae_required = true;
 		}
 	}
@ -272,7 +162,7 @@ function vvvvwas(type_vvvvwas)
 function type_vvvvwas_SomeFunc(type_vvvvwas)
 {
 	// set the function logic
-	if (type_vvvvwas == 2)
+	if (type_vvvvwas == 3)
 	{
 		return true;
 	}
@ -280,32 +170,142 @@ function type_vvvvwas_SomeFunc(type_vvvvwas)
 }

 // the vvvvwat function
-function vvvvwat(target_vvvvwat)
+function vvvvwat(type_vvvvwat)
 {
-	// set the function logic
-	if (target_vvvvwat == 1)
+	if (isSet(type_vvvvwat) && type_vvvvwat.constructor !== Array)
 	{
-		jQuery('#jform_groups').closest('.control-group').show();
+		var temp_vvvvwat = type_vvvvwat;
+		var type_vvvvwat = [];
+		type_vvvvwat.push(temp_vvvvwat);
+	}
+	else if (!isSet(type_vvvvwat))
+	{
+		var type_vvvvwat = [];
+	}
+	var type = type_vvvvwat.some(type_vvvvwat_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_article').closest('.control-group').show();
 		if (jform_vvvvwatwaf_required)
 		{
-			updateFieldRequired('groups',0);
-			jQuery('#jform_groups').prop('required','required');
-			jQuery('#jform_groups').attr('aria-required',true);
-			jQuery('#jform_groups').addClass('required');
+			updateFieldRequired('article',0);
+			jQuery('#jform_article').prop('required','required');
+			jQuery('#jform_article').attr('aria-required',true);
+			jQuery('#jform_article').addClass('required');
 			jform_vvvvwatwaf_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_groups').closest('.control-group').hide();
+		jQuery('#jform_article').closest('.control-group').hide();
 		if (!jform_vvvvwatwaf_required)
+		{
+			updateFieldRequired('article',1);
+			jQuery('#jform_article').removeAttr('required');
+			jQuery('#jform_article').removeAttr('aria-required');
+			jQuery('#jform_article').removeClass('required');
+			jform_vvvvwatwaf_required = true;
+		}
+	}
+}
+
+// the vvvvwat Some function
+function type_vvvvwat_SomeFunc(type_vvvvwat)
+{
+	// set the function logic
+	if (type_vvvvwat == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwau function
+function vvvvwau(type_vvvvwau)
+{
+	if (isSet(type_vvvvwau) && type_vvvvwau.constructor !== Array)
+	{
+		var temp_vvvvwau = type_vvvvwau;
+		var type_vvvvwau = [];
+		type_vvvvwau.push(temp_vvvvwau);
+	}
+	else if (!isSet(type_vvvvwau))
+	{
+		var type_vvvvwau = [];
+	}
+	var type = type_vvvvwau.some(type_vvvvwau_SomeFunc);
+
+
+	// set this function logic
+	if (type)
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').show();
+		if (jform_vvvvwauwag_required)
+		{
+			updateFieldRequired('content',0);
+			jQuery('#jform_content').prop('required','required');
+			jQuery('#jform_content').attr('aria-required',true);
+			jQuery('#jform_content').addClass('required');
+			jform_vvvvwauwag_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_content-lbl').closest('.control-group').hide();
+		if (!jform_vvvvwauwag_required)
+		{
+			updateFieldRequired('content',1);
+			jQuery('#jform_content').removeAttr('required');
+			jQuery('#jform_content').removeAttr('aria-required');
+			jQuery('#jform_content').removeClass('required');
+			jform_vvvvwauwag_required = true;
+		}
+	}
+}
+
+// the vvvvwau Some function
+function type_vvvvwau_SomeFunc(type_vvvvwau)
+{
+	// set the function logic
+	if (type_vvvvwau == 2)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwav function
+function vvvvwav(target_vvvvwav)
+{
+	// set the function logic
+	if (target_vvvvwav == 1)
+	{
+		jQuery('#jform_groups').closest('.control-group').show();
+		if (jform_vvvvwavwah_required)
+		{
+			updateFieldRequired('groups',0);
+			jQuery('#jform_groups').prop('required','required');
+			jQuery('#jform_groups').attr('aria-required',true);
+			jQuery('#jform_groups').addClass('required');
+			jform_vvvvwavwah_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_groups').closest('.control-group').hide();
+		if (!jform_vvvvwavwah_required)
 		{
 			updateFieldRequired('groups',1);
 			jQuery('#jform_groups').removeAttr('required');
 			jQuery('#jform_groups').removeAttr('aria-required');
 			jQuery('#jform_groups').removeClass('required');
-			jform_vvvvwatwaf_required = true;
+			jform_vvvvwavwah_required = true;
 		}
 	}
 }
--- a/admin/models/forms/joomla_component.js
+++ b/admin/models/forms/joomla_component.js
@ -29,17 +29,18 @@ jform_vvvvvvxvvx_required = false;
 jform_vvvvvvyvvy_required = false;
 jform_vvvvvvzvvz_required = false;
 jform_vvvvvwavwa_required = false;
-jform_vvvvvwcvwb_required = false;
+jform_vvvvvwbvwb_required = false;
 jform_vvvvvwdvwc_required = false;
 jform_vvvvvwevwd_required = false;
 jform_vvvvvwfvwe_required = false;
-jform_vvvvvwjvwf_required = false;
+jform_vvvvvwgvwf_required = false;
 jform_vvvvvwkvwg_required = false;
 jform_vvvvvwlvwh_required = false;
 jform_vvvvvwmvwi_required = false;
 jform_vvvvvwnvwj_required = false;
-jform_vvvvvwuvwk_required = false;
+jform_vvvvvwovwk_required = false;
 jform_vvvvvwvvwl_required = false;
+jform_vvvvvwwvwm_required = false;

 // Initial Script
 jQuery(document).ready(function()
@ -53,75 +54,78 @@ jQuery(document).ready(function()
 	var add_php_helper_both_vvvvvvx = jQuery("#jform_add_php_helper_both input[type='radio']:checked").val();
 	vvvvvvx(add_php_helper_both_vvvvvvx);

-	var add_css_vvvvvvy = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvvy(add_css_vvvvvvy);
+	var add_css_admin_vvvvvvy = jQuery("#jform_add_css_admin input[type='radio']:checked").val();
+	vvvvvvy(add_css_admin_vvvvvvy);

-	var add_javascript_vvvvvvz = jQuery("#jform_add_javascript input[type='radio']:checked").val();
-	vvvvvvz(add_javascript_vvvvvvz);
+	var add_css_site_vvvvvvz = jQuery("#jform_add_css_site input[type='radio']:checked").val();
+	vvvvvvz(add_css_site_vvvvvvz);

-	var add_sql_vvvvvwa = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvwa(add_sql_vvvvvwa);
+	var add_javascript_vvvvvwa = jQuery("#jform_add_javascript input[type='radio']:checked").val();
+	vvvvvwa(add_javascript_vvvvvwa);

-	var emptycontributors_vvvvvwb = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
-	vvvvvwb(emptycontributors_vvvvvwb);
+	var add_sql_vvvvvwb = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvwb(add_sql_vvvvvwb);

-	var add_license_vvvvvwc = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwc(add_license_vvvvvwc);
+	var emptycontributors_vvvvvwc = jQuery("#jform_emptycontributors input[type='radio']:checked").val();
+	vvvvvwc(emptycontributors_vvvvvwc);

-	var add_admin_event_vvvvvwd = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
-	vvvvvwd(add_admin_event_vvvvvwd);
+	var add_license_vvvvvwd = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwd(add_license_vvvvvwd);

-	var add_site_event_vvvvvwe = jQuery("#jform_add_site_event input[type='radio']:checked").val();
-	vvvvvwe(add_site_event_vvvvvwe);
+	var add_admin_event_vvvvvwe = jQuery("#jform_add_admin_event input[type='radio']:checked").val();
+	vvvvvwe(add_admin_event_vvvvvwe);

-	var addreadme_vvvvvwf = jQuery("#jform_addreadme input[type='radio']:checked").val();
-	vvvvvwf(addreadme_vvvvvwf);
+	var add_site_event_vvvvvwf = jQuery("#jform_add_site_event input[type='radio']:checked").val();
+	vvvvvwf(add_site_event_vvvvvwf);

-	var add_update_server_vvvvvwg = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwg(add_update_server_vvvvvwg);
+	var addreadme_vvvvvwg = jQuery("#jform_addreadme input[type='radio']:checked").val();
+	vvvvvwg(addreadme_vvvvvwg);

-	var add_sales_server_vvvvvwh = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
-	vvvvvwh(add_sales_server_vvvvvwh);
+	var add_update_server_vvvvvwh = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwh(add_update_server_vvvvvwh);

-	var add_license_vvvvvwi = jQuery("#jform_add_license input[type='radio']:checked").val();
-	vvvvvwi(add_license_vvvvvwi);
+	var add_sales_server_vvvvvwi = jQuery("#jform_add_sales_server input[type='radio']:checked").val();
+	vvvvvwi(add_sales_server_vvvvvwi);

-	var add_php_postflight_install_vvvvvwj = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
-	vvvvvwj(add_php_postflight_install_vvvvvwj);
+	var add_license_vvvvvwj = jQuery("#jform_add_license input[type='radio']:checked").val();
+	vvvvvwj(add_license_vvvvvwj);

-	var add_php_postflight_update_vvvvvwk = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
-	vvvvvwk(add_php_postflight_update_vvvvvwk);
+	var add_php_postflight_install_vvvvvwk = jQuery("#jform_add_php_postflight_install input[type='radio']:checked").val();
+	vvvvvwk(add_php_postflight_install_vvvvvwk);

-	var add_php_method_uninstall_vvvvvwl = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
-	vvvvvwl(add_php_method_uninstall_vvvvvwl);
+	var add_php_postflight_update_vvvvvwl = jQuery("#jform_add_php_postflight_update input[type='radio']:checked").val();
+	vvvvvwl(add_php_postflight_update_vvvvvwl);

-	var add_php_preflight_install_vvvvvwm = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
-	vvvvvwm(add_php_preflight_install_vvvvvwm);
+	var add_php_method_uninstall_vvvvvwm = jQuery("#jform_add_php_method_uninstall input[type='radio']:checked").val();
+	vvvvvwm(add_php_method_uninstall_vvvvvwm);

-	var add_php_preflight_update_vvvvvwn = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
-	vvvvvwn(add_php_preflight_update_vvvvvwn);
+	var add_php_preflight_install_vvvvvwn = jQuery("#jform_add_php_preflight_install input[type='radio']:checked").val();
+	vvvvvwn(add_php_preflight_install_vvvvvwn);

-	var update_server_target_vvvvvwo = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvwo = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwo(update_server_target_vvvvvwo,add_update_server_vvvvvwo);
+	var add_php_preflight_update_vvvvvwo = jQuery("#jform_add_php_preflight_update input[type='radio']:checked").val();
+	vvvvvwo(add_php_preflight_update_vvvvvwo);

-	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
 	var update_server_target_vvvvvwp = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	vvvvvwp(add_update_server_vvvvvwp,update_server_target_vvvvvwp);
+	var add_update_server_vvvvvwp = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp);

-	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
 	var add_update_server_vvvvvwq = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq);
+	var update_server_target_vvvvvwq = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq);

-	var update_server_target_vvvvvws = jQuery("#jform_update_server_target input[type='radio']:checked").val();
-	var add_update_server_vvvvvws = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws);
+	var update_server_target_vvvvvwr = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwr = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr);

-	var add_update_server_vvvvvwu = jQuery("#jform_add_update_server input[type='radio']:checked").val();
-	vvvvvwu(add_update_server_vvvvvwu);
+	var update_server_target_vvvvvwt = jQuery("#jform_update_server_target input[type='radio']:checked").val();
+	var add_update_server_vvvvvwt = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt);

-	var buildcomp_vvvvvwv = jQuery("#jform_buildcomp input[type='radio']:checked").val();
-	vvvvvwv(buildcomp_vvvvvwv);
+	var add_update_server_vvvvvwv = jQuery("#jform_add_update_server input[type='radio']:checked").val();
+	vvvvvwv(add_update_server_vvvvvwv);
+
+	var buildcomp_vvvvvww = jQuery("#jform_buildcomp input[type='radio']:checked").val();
+	vvvvvww(buildcomp_vvvvvww);
 });

 // the vvvvvvv function
@ -218,103 +222,134 @@ function vvvvvvx(add_php_helper_both_vvvvvvx)
 }

 // the vvvvvvy function
-function vvvvvvy(add_css_vvvvvvy)
+function vvvvvvy(add_css_admin_vvvvvvy)
 {
 	// set the function logic
-	if (add_css_vvvvvvy == 1)
+	if (add_css_admin_vvvvvvy == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_css_admin').closest('.control-group').show();
 		if (jform_vvvvvvyvvy_required)
 		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			updateFieldRequired('css_admin',0);
+			jQuery('#jform_css_admin').prop('required','required');
+			jQuery('#jform_css_admin').attr('aria-required',true);
+			jQuery('#jform_css_admin').addClass('required');
 			jform_vvvvvvyvvy_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_css_admin').closest('.control-group').hide();
 		if (!jform_vvvvvvyvvy_required)
 		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			updateFieldRequired('css_admin',1);
+			jQuery('#jform_css_admin').removeAttr('required');
+			jQuery('#jform_css_admin').removeAttr('aria-required');
+			jQuery('#jform_css_admin').removeClass('required');
 			jform_vvvvvvyvvy_required = true;
 		}
 	}
 }

 // the vvvvvvz function
-function vvvvvvz(add_javascript_vvvvvvz)
+function vvvvvvz(add_css_site_vvvvvvz)
 {
 	// set the function logic
-	if (add_javascript_vvvvvvz == 1)
+	if (add_css_site_vvvvvvz == 1)
 	{
-		jQuery('#jform_javascript').closest('.control-group').show();
+		jQuery('#jform_css_site').closest('.control-group').show();
 		if (jform_vvvvvvzvvz_required)
 		{
-			updateFieldRequired('javascript',0);
-			jQuery('#jform_javascript').prop('required','required');
-			jQuery('#jform_javascript').attr('aria-required',true);
-			jQuery('#jform_javascript').addClass('required');
+			updateFieldRequired('css_site',0);
+			jQuery('#jform_css_site').prop('required','required');
+			jQuery('#jform_css_site').attr('aria-required',true);
+			jQuery('#jform_css_site').addClass('required');
 			jform_vvvvvvzvvz_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript').closest('.control-group').hide();
+		jQuery('#jform_css_site').closest('.control-group').hide();
 		if (!jform_vvvvvvzvvz_required)
 		{
-			updateFieldRequired('javascript',1);
-			jQuery('#jform_javascript').removeAttr('required');
-			jQuery('#jform_javascript').removeAttr('aria-required');
-			jQuery('#jform_javascript').removeClass('required');
+			updateFieldRequired('css_site',1);
+			jQuery('#jform_css_site').removeAttr('required');
+			jQuery('#jform_css_site').removeAttr('aria-required');
+			jQuery('#jform_css_site').removeClass('required');
 			jform_vvvvvvzvvz_required = true;
 		}
 	}
 }

 // the vvvvvwa function
-function vvvvvwa(add_sql_vvvvvwa)
+function vvvvvwa(add_javascript_vvvvvwa)
 {
 	// set the function logic
-	if (add_sql_vvvvvwa == 1)
+	if (add_javascript_vvvvvwa == 1)
 	{
-		jQuery('#jform_sql').closest('.control-group').show();
+		jQuery('#jform_javascript').closest('.control-group').show();
 		if (jform_vvvvvwavwa_required)
 		{
-			updateFieldRequired('sql',0);
-			jQuery('#jform_sql').prop('required','required');
-			jQuery('#jform_sql').attr('aria-required',true);
-			jQuery('#jform_sql').addClass('required');
+			updateFieldRequired('javascript',0);
+			jQuery('#jform_javascript').prop('required','required');
+			jQuery('#jform_javascript').attr('aria-required',true);
+			jQuery('#jform_javascript').addClass('required');
 			jform_vvvvvwavwa_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_sql').closest('.control-group').hide();
+		jQuery('#jform_javascript').closest('.control-group').hide();
 		if (!jform_vvvvvwavwa_required)
 		{
-			updateFieldRequired('sql',1);
-			jQuery('#jform_sql').removeAttr('required');
-			jQuery('#jform_sql').removeAttr('aria-required');
-			jQuery('#jform_sql').removeClass('required');
+			updateFieldRequired('javascript',1);
+			jQuery('#jform_javascript').removeAttr('required');
+			jQuery('#jform_javascript').removeAttr('aria-required');
+			jQuery('#jform_javascript').removeClass('required');
 			jform_vvvvvwavwa_required = true;
 		}
 	}
 }

 // the vvvvvwb function
-function vvvvvwb(emptycontributors_vvvvvwb)
+function vvvvvwb(add_sql_vvvvvwb)
 {
 	// set the function logic
-	if (emptycontributors_vvvvvwb == 1)
+	if (add_sql_vvvvvwb == 1)
+	{
+		jQuery('#jform_sql').closest('.control-group').show();
+		if (jform_vvvvvwbvwb_required)
+		{
+			updateFieldRequired('sql',0);
+			jQuery('#jform_sql').prop('required','required');
+			jQuery('#jform_sql').attr('aria-required',true);
+			jQuery('#jform_sql').addClass('required');
+			jform_vvvvvwbvwb_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_sql').closest('.control-group').hide();
+		if (!jform_vvvvvwbvwb_required)
+		{
+			updateFieldRequired('sql',1);
+			jQuery('#jform_sql').removeAttr('required');
+			jQuery('#jform_sql').removeAttr('aria-required');
+			jQuery('#jform_sql').removeClass('required');
+			jform_vvvvvwbvwb_required = true;
+		}
+	}
+}
+
+// the vvvvvwc function
+function vvvvvwc(emptycontributors_vvvvvwc)
+{
+	// set the function logic
+	if (emptycontributors_vvvvvwc == 1)
 	{
 		jQuery('#jform_number').closest('.control-group').show();
 	}
@ -324,114 +359,114 @@ function vvvvvwb(emptycontributors_vvvvvwb)
 	}
 }

-// the vvvvvwc function
-function vvvvvwc(add_license_vvvvvwc)
+// the vvvvvwd function
+function vvvvvwd(add_license_vvvvvwd)
 {
 	// set the function logic
-	if (add_license_vvvvvwc == 1)
+	if (add_license_vvvvvwd == 1)
 	{
 		jQuery('#jform_license_type').closest('.control-group').show();
-		if (jform_vvvvvwcvwb_required)
+		if (jform_vvvvvwdvwc_required)
 		{
 			updateFieldRequired('license_type',0);
 			jQuery('#jform_license_type').prop('required','required');
 			jQuery('#jform_license_type').attr('aria-required',true);
 			jQuery('#jform_license_type').addClass('required');
-			jform_vvvvvwcvwb_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_license_type').closest('.control-group').hide();
-		if (!jform_vvvvvwcvwb_required)
-		{
-			updateFieldRequired('license_type',1);
-			jQuery('#jform_license_type').removeAttr('required');
-			jQuery('#jform_license_type').removeAttr('aria-required');
-			jQuery('#jform_license_type').removeClass('required');
-			jform_vvvvvwcvwb_required = true;
-		}
-	}
-}
-
-// the vvvvvwd function
-function vvvvvwd(add_admin_event_vvvvvwd)
-{
-	// set the function logic
-	if (add_admin_event_vvvvvwd == 1)
-	{
-		jQuery('#jform_php_admin_event').closest('.control-group').show();
-		if (jform_vvvvvwdvwc_required)
-		{
-			updateFieldRequired('php_admin_event',0);
-			jQuery('#jform_php_admin_event').prop('required','required');
-			jQuery('#jform_php_admin_event').attr('aria-required',true);
-			jQuery('#jform_php_admin_event').addClass('required');
 			jform_vvvvvwdvwc_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_admin_event').closest('.control-group').hide();
+		jQuery('#jform_license_type').closest('.control-group').hide();
 		if (!jform_vvvvvwdvwc_required)
 		{
-			updateFieldRequired('php_admin_event',1);
-			jQuery('#jform_php_admin_event').removeAttr('required');
-			jQuery('#jform_php_admin_event').removeAttr('aria-required');
-			jQuery('#jform_php_admin_event').removeClass('required');
+			updateFieldRequired('license_type',1);
+			jQuery('#jform_license_type').removeAttr('required');
+			jQuery('#jform_license_type').removeAttr('aria-required');
+			jQuery('#jform_license_type').removeClass('required');
 			jform_vvvvvwdvwc_required = true;
 		}
 	}
 }

 // the vvvvvwe function
-function vvvvvwe(add_site_event_vvvvvwe)
+function vvvvvwe(add_admin_event_vvvvvwe)
 {
 	// set the function logic
-	if (add_site_event_vvvvvwe == 1)
+	if (add_admin_event_vvvvvwe == 1)
 	{
-		jQuery('#jform_php_site_event').closest('.control-group').show();
+		jQuery('#jform_php_admin_event').closest('.control-group').show();
 		if (jform_vvvvvwevwd_required)
 		{
-			updateFieldRequired('php_site_event',0);
-			jQuery('#jform_php_site_event').prop('required','required');
-			jQuery('#jform_php_site_event').attr('aria-required',true);
-			jQuery('#jform_php_site_event').addClass('required');
+			updateFieldRequired('php_admin_event',0);
+			jQuery('#jform_php_admin_event').prop('required','required');
+			jQuery('#jform_php_admin_event').attr('aria-required',true);
+			jQuery('#jform_php_admin_event').addClass('required');
 			jform_vvvvvwevwd_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_site_event').closest('.control-group').hide();
+		jQuery('#jform_php_admin_event').closest('.control-group').hide();
 		if (!jform_vvvvvwevwd_required)
 		{
-			updateFieldRequired('php_site_event',1);
-			jQuery('#jform_php_site_event').removeAttr('required');
-			jQuery('#jform_php_site_event').removeAttr('aria-required');
-			jQuery('#jform_php_site_event').removeClass('required');
+			updateFieldRequired('php_admin_event',1);
+			jQuery('#jform_php_admin_event').removeAttr('required');
+			jQuery('#jform_php_admin_event').removeAttr('aria-required');
+			jQuery('#jform_php_admin_event').removeClass('required');
 			jform_vvvvvwevwd_required = true;
 		}
 	}
 }

 // the vvvvvwf function
-function vvvvvwf(addreadme_vvvvvwf)
+function vvvvvwf(add_site_event_vvvvvwf)
 {
 	// set the function logic
-	if (addreadme_vvvvvwf == 1)
+	if (add_site_event_vvvvvwf == 1)
+	{
+		jQuery('#jform_php_site_event').closest('.control-group').show();
+		if (jform_vvvvvwfvwe_required)
+		{
+			updateFieldRequired('php_site_event',0);
+			jQuery('#jform_php_site_event').prop('required','required');
+			jQuery('#jform_php_site_event').attr('aria-required',true);
+			jQuery('#jform_php_site_event').addClass('required');
+			jform_vvvvvwfvwe_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_php_site_event').closest('.control-group').hide();
+		if (!jform_vvvvvwfvwe_required)
+		{
+			updateFieldRequired('php_site_event',1);
+			jQuery('#jform_php_site_event').removeAttr('required');
+			jQuery('#jform_php_site_event').removeAttr('aria-required');
+			jQuery('#jform_php_site_event').removeClass('required');
+			jform_vvvvvwfvwe_required = true;
+		}
+	}
+}
+
+// the vvvvvwg function
+function vvvvvwg(addreadme_vvvvvwg)
+{
+	// set the function logic
+	if (addreadme_vvvvvwg == 1)
 	{
 		jQuery('.note_readme').closest('.control-group').show();
 		jQuery('#jform_readme-lbl').closest('.control-group').show();
-		if (jform_vvvvvwfvwe_required)
+		if (jform_vvvvvwgvwf_required)
 		{
 			updateFieldRequired('readme',0);
 			jQuery('#jform_readme').prop('required','required');
 			jQuery('#jform_readme').attr('aria-required',true);
 			jQuery('#jform_readme').addClass('required');
-			jform_vvvvvwfvwe_required = false;
+			jform_vvvvvwgvwf_required = false;
 		}

 	}
@ -439,22 +474,22 @@ function vvvvvwf(addreadme_vvvvvwf)
 	{
 		jQuery('.note_readme').closest('.control-group').hide();
 		jQuery('#jform_readme-lbl').closest('.control-group').hide();
-		if (!jform_vvvvvwfvwe_required)
+		if (!jform_vvvvvwgvwf_required)
 		{
 			updateFieldRequired('readme',1);
 			jQuery('#jform_readme').removeAttr('required');
 			jQuery('#jform_readme').removeAttr('aria-required');
 			jQuery('#jform_readme').removeClass('required');
-			jform_vvvvvwfvwe_required = true;
+			jform_vvvvvwgvwf_required = true;
 		}
 	}
 }

-// the vvvvvwg function
-function vvvvvwg(add_update_server_vvvvvwg)
+// the vvvvvwh function
+function vvvvvwh(add_update_server_vvvvvwh)
 {
 	// set the function logic
-	if (add_update_server_vvvvvwg == 1)
+	if (add_update_server_vvvvvwh == 1)
 	{
 		jQuery('#jform_update_server').closest('.control-group').show();
 	}
@ -464,11 +499,11 @@ function vvvvvwg(add_update_server_vvvvvwg)
 	}
 }

-// the vvvvvwh function
-function vvvvvwh(add_sales_server_vvvvvwh)
+// the vvvvvwi function
+function vvvvvwi(add_sales_server_vvvvvwi)
 {
 	// set the function logic
-	if (add_sales_server_vvvvvwh == 1)
+	if (add_sales_server_vvvvvwi == 1)
 	{
 		jQuery('#jform_sales_server_ftp').closest('.control-group').show();
 	}
@ -478,11 +513,11 @@ function vvvvvwh(add_sales_server_vvvvvwh)
 	}
 }

-// the vvvvvwi function
-function vvvvvwi(add_license_vvvvvwi)
+// the vvvvvwj function
+function vvvvvwj(add_license_vvvvvwj)
 {
 	// set the function logic
-	if (add_license_vvvvvwi == 1)
+	if (add_license_vvvvvwj == 1)
 	{
 		jQuery('.note_whmcs_lisencing_note').closest('.control-group').show();
 		jQuery('#jform_whmcs_key').closest('.control-group').show();
@ -496,182 +531,166 @@ function vvvvvwi(add_license_vvvvvwi)
 	}
 }

-// the vvvvvwj function
-function vvvvvwj(add_php_postflight_install_vvvvvwj)
+// the vvvvvwk function
+function vvvvvwk(add_php_postflight_install_vvvvvwk)
 {
 	// set the function logic
-	if (add_php_postflight_install_vvvvvwj == 1)
+	if (add_php_postflight_install_vvvvvwk == 1)
 	{
 		jQuery('#jform_php_postflight_install').closest('.control-group').show();
-		if (jform_vvvvvwjvwf_required)
+		if (jform_vvvvvwkvwg_required)
 		{
 			updateFieldRequired('php_postflight_install',0);
 			jQuery('#jform_php_postflight_install').prop('required','required');
 			jQuery('#jform_php_postflight_install').attr('aria-required',true);
 			jQuery('#jform_php_postflight_install').addClass('required');
-			jform_vvvvvwjvwf_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_postflight_install').closest('.control-group').hide();
-		if (!jform_vvvvvwjvwf_required)
-		{
-			updateFieldRequired('php_postflight_install',1);
-			jQuery('#jform_php_postflight_install').removeAttr('required');
-			jQuery('#jform_php_postflight_install').removeAttr('aria-required');
-			jQuery('#jform_php_postflight_install').removeClass('required');
-			jform_vvvvvwjvwf_required = true;
-		}
-	}
-}
-
-// the vvvvvwk function
-function vvvvvwk(add_php_postflight_update_vvvvvwk)
-{
-	// set the function logic
-	if (add_php_postflight_update_vvvvvwk == 1)
-	{
-		jQuery('#jform_php_postflight_update').closest('.control-group').show();
-		if (jform_vvvvvwkvwg_required)
-		{
-			updateFieldRequired('php_postflight_update',0);
-			jQuery('#jform_php_postflight_update').prop('required','required');
-			jQuery('#jform_php_postflight_update').attr('aria-required',true);
-			jQuery('#jform_php_postflight_update').addClass('required');
 			jform_vvvvvwkvwg_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_postflight_update').closest('.control-group').hide();
+		jQuery('#jform_php_postflight_install').closest('.control-group').hide();
 		if (!jform_vvvvvwkvwg_required)
 		{
-			updateFieldRequired('php_postflight_update',1);
-			jQuery('#jform_php_postflight_update').removeAttr('required');
-			jQuery('#jform_php_postflight_update').removeAttr('aria-required');
-			jQuery('#jform_php_postflight_update').removeClass('required');
+			updateFieldRequired('php_postflight_install',1);
+			jQuery('#jform_php_postflight_install').removeAttr('required');
+			jQuery('#jform_php_postflight_install').removeAttr('aria-required');
+			jQuery('#jform_php_postflight_install').removeClass('required');
 			jform_vvvvvwkvwg_required = true;
 		}
 	}
 }

 // the vvvvvwl function
-function vvvvvwl(add_php_method_uninstall_vvvvvwl)
+function vvvvvwl(add_php_postflight_update_vvvvvwl)
 {
 	// set the function logic
-	if (add_php_method_uninstall_vvvvvwl == 1)
+	if (add_php_postflight_update_vvvvvwl == 1)
 	{
-		jQuery('#jform_php_method_uninstall').closest('.control-group').show();
+		jQuery('#jform_php_postflight_update').closest('.control-group').show();
 		if (jform_vvvvvwlvwh_required)
 		{
-			updateFieldRequired('php_method_uninstall',0);
-			jQuery('#jform_php_method_uninstall').prop('required','required');
-			jQuery('#jform_php_method_uninstall').attr('aria-required',true);
-			jQuery('#jform_php_method_uninstall').addClass('required');
+			updateFieldRequired('php_postflight_update',0);
+			jQuery('#jform_php_postflight_update').prop('required','required');
+			jQuery('#jform_php_postflight_update').attr('aria-required',true);
+			jQuery('#jform_php_postflight_update').addClass('required');
 			jform_vvvvvwlvwh_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
+		jQuery('#jform_php_postflight_update').closest('.control-group').hide();
 		if (!jform_vvvvvwlvwh_required)
 		{
-			updateFieldRequired('php_method_uninstall',1);
-			jQuery('#jform_php_method_uninstall').removeAttr('required');
-			jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
-			jQuery('#jform_php_method_uninstall').removeClass('required');
+			updateFieldRequired('php_postflight_update',1);
+			jQuery('#jform_php_postflight_update').removeAttr('required');
+			jQuery('#jform_php_postflight_update').removeAttr('aria-required');
+			jQuery('#jform_php_postflight_update').removeClass('required');
 			jform_vvvvvwlvwh_required = true;
 		}
 	}
 }

 // the vvvvvwm function
-function vvvvvwm(add_php_preflight_install_vvvvvwm)
+function vvvvvwm(add_php_method_uninstall_vvvvvwm)
 {
 	// set the function logic
-	if (add_php_preflight_install_vvvvvwm == 1)
+	if (add_php_method_uninstall_vvvvvwm == 1)
 	{
-		jQuery('#jform_php_preflight_install').closest('.control-group').show();
+		jQuery('#jform_php_method_uninstall').closest('.control-group').show();
 		if (jform_vvvvvwmvwi_required)
 		{
-			updateFieldRequired('php_preflight_install',0);
-			jQuery('#jform_php_preflight_install').prop('required','required');
-			jQuery('#jform_php_preflight_install').attr('aria-required',true);
-			jQuery('#jform_php_preflight_install').addClass('required');
+			updateFieldRequired('php_method_uninstall',0);
+			jQuery('#jform_php_method_uninstall').prop('required','required');
+			jQuery('#jform_php_method_uninstall').attr('aria-required',true);
+			jQuery('#jform_php_method_uninstall').addClass('required');
 			jform_vvvvvwmvwi_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_preflight_install').closest('.control-group').hide();
+		jQuery('#jform_php_method_uninstall').closest('.control-group').hide();
 		if (!jform_vvvvvwmvwi_required)
 		{
-			updateFieldRequired('php_preflight_install',1);
-			jQuery('#jform_php_preflight_install').removeAttr('required');
-			jQuery('#jform_php_preflight_install').removeAttr('aria-required');
-			jQuery('#jform_php_preflight_install').removeClass('required');
+			updateFieldRequired('php_method_uninstall',1);
+			jQuery('#jform_php_method_uninstall').removeAttr('required');
+			jQuery('#jform_php_method_uninstall').removeAttr('aria-required');
+			jQuery('#jform_php_method_uninstall').removeClass('required');
 			jform_vvvvvwmvwi_required = true;
 		}
 	}
 }

 // the vvvvvwn function
-function vvvvvwn(add_php_preflight_update_vvvvvwn)
+function vvvvvwn(add_php_preflight_install_vvvvvwn)
 {
 	// set the function logic
-	if (add_php_preflight_update_vvvvvwn == 1)
+	if (add_php_preflight_install_vvvvvwn == 1)
 	{
-		jQuery('#jform_php_preflight_update').closest('.control-group').show();
+		jQuery('#jform_php_preflight_install').closest('.control-group').show();
 		if (jform_vvvvvwnvwj_required)
 		{
-			updateFieldRequired('php_preflight_update',0);
-			jQuery('#jform_php_preflight_update').prop('required','required');
-			jQuery('#jform_php_preflight_update').attr('aria-required',true);
-			jQuery('#jform_php_preflight_update').addClass('required');
+			updateFieldRequired('php_preflight_install',0);
+			jQuery('#jform_php_preflight_install').prop('required','required');
+			jQuery('#jform_php_preflight_install').attr('aria-required',true);
+			jQuery('#jform_php_preflight_install').addClass('required');
 			jform_vvvvvwnvwj_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+		jQuery('#jform_php_preflight_install').closest('.control-group').hide();
 		if (!jform_vvvvvwnvwj_required)
 		{
-			updateFieldRequired('php_preflight_update',1);
-			jQuery('#jform_php_preflight_update').removeAttr('required');
-			jQuery('#jform_php_preflight_update').removeAttr('aria-required');
-			jQuery('#jform_php_preflight_update').removeClass('required');
+			updateFieldRequired('php_preflight_install',1);
+			jQuery('#jform_php_preflight_install').removeAttr('required');
+			jQuery('#jform_php_preflight_install').removeAttr('aria-required');
+			jQuery('#jform_php_preflight_install').removeClass('required');
 			jform_vvvvvwnvwj_required = true;
 		}
 	}
 }

 // the vvvvvwo function
-function vvvvvwo(update_server_target_vvvvvwo,add_update_server_vvvvvwo)
+function vvvvvwo(add_php_preflight_update_vvvvvwo)
 {
 	// set the function logic
-	if (update_server_target_vvvvvwo == 1 && add_update_server_vvvvvwo == 1)
+	if (add_php_preflight_update_vvvvvwo == 1)
 	{
-		jQuery('#jform_update_server_ftp').closest('.control-group').show();
-		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+		jQuery('#jform_php_preflight_update').closest('.control-group').show();
+		if (jform_vvvvvwovwk_required)
+		{
+			updateFieldRequired('php_preflight_update',0);
+			jQuery('#jform_php_preflight_update').prop('required','required');
+			jQuery('#jform_php_preflight_update').attr('aria-required',true);
+			jQuery('#jform_php_preflight_update').addClass('required');
+			jform_vvvvvwovwk_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('#jform_update_server_ftp').closest('.control-group').hide();
-		jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+		jQuery('#jform_php_preflight_update').closest('.control-group').hide();
+		if (!jform_vvvvvwovwk_required)
+		{
+			updateFieldRequired('php_preflight_update',1);
+			jQuery('#jform_php_preflight_update').removeAttr('required');
+			jQuery('#jform_php_preflight_update').removeAttr('aria-required');
+			jQuery('#jform_php_preflight_update').removeClass('required');
+			jform_vvvvvwovwk_required = true;
+		}
 	}
 }

 // the vvvvvwp function
-function vvvvvwp(add_update_server_vvvvvwp,update_server_target_vvvvvwp)
+function vvvvvwp(update_server_target_vvvvvwp,add_update_server_vvvvvwp)
 {
 	// set the function logic
-	if (add_update_server_vvvvvwp == 1 && update_server_target_vvvvvwp == 1)
+	if (update_server_target_vvvvvwp == 1 && add_update_server_vvvvvwp == 1)
 	{
 		jQuery('#jform_update_server_ftp').closest('.control-group').show();
 		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
@ -684,10 +703,26 @@ function vvvvvwp(add_update_server_vvvvvwp,update_server_target_vvvvvwp)
 }

 // the vvvvvwq function
-function vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq)
+function vvvvvwq(add_update_server_vvvvvwq,update_server_target_vvvvvwq)
 {
 	// set the function logic
-	if (update_server_target_vvvvvwq == 2 && add_update_server_vvvvvwq == 1)
+	if (add_update_server_vvvvvwq == 1 && update_server_target_vvvvvwq == 1)
+	{
+		jQuery('#jform_update_server_ftp').closest('.control-group').show();
+		jQuery('.note_update_server_note_ftp').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('#jform_update_server_ftp').closest('.control-group').hide();
+		jQuery('.note_update_server_note_ftp').closest('.control-group').hide();
+	}
+}
+
+// the vvvvvwr function
+function vvvvvwr(update_server_target_vvvvvwr,add_update_server_vvvvvwr)
+{
+	// set the function logic
+	if (update_server_target_vvvvvwr == 2 && add_update_server_vvvvvwr == 1)
 	{
 		jQuery('.note_update_server_note_zip').closest('.control-group').show();
 	}
@ -697,11 +732,11 @@ function vvvvvwq(update_server_target_vvvvvwq,add_update_server_vvvvvwq)
 	}
 }

-// the vvvvvws function
-function vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws)
+// the vvvvvwt function
+function vvvvvwt(update_server_target_vvvvvwt,add_update_server_vvvvvwt)
 {
 	// set the function logic
-	if (update_server_target_vvvvvws == 3 && add_update_server_vvvvvws == 1)
+	if (update_server_target_vvvvvwt == 3 && add_update_server_vvvvvwt == 1)
 	{
 		jQuery('.note_update_server_note_other').closest('.control-group').show();
 	}
@ -711,64 +746,64 @@ function vvvvvws(update_server_target_vvvvvws,add_update_server_vvvvvws)
 	}
 }

-// the vvvvvwu function
-function vvvvvwu(add_update_server_vvvvvwu)
+// the vvvvvwv function
+function vvvvvwv(add_update_server_vvvvvwv)
 {
 	// set the function logic
-	if (add_update_server_vvvvvwu == 1)
+	if (add_update_server_vvvvvwv == 1)
 	{
 		jQuery('#jform_update_server_target').closest('.control-group').show();
-		if (jform_vvvvvwuvwk_required)
+		if (jform_vvvvvwvvwl_required)
 		{
 			updateFieldRequired('update_server_target',0);
 			jQuery('#jform_update_server_target').prop('required','required');
 			jQuery('#jform_update_server_target').attr('aria-required',true);
 			jQuery('#jform_update_server_target').addClass('required');
-			jform_vvvvvwuvwk_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_update_server_target').closest('.control-group').hide();
-		if (!jform_vvvvvwuvwk_required)
-		{
-			updateFieldRequired('update_server_target',1);
-			jQuery('#jform_update_server_target').removeAttr('required');
-			jQuery('#jform_update_server_target').removeAttr('aria-required');
-			jQuery('#jform_update_server_target').removeClass('required');
-			jform_vvvvvwuvwk_required = true;
-		}
-	}
-}
-
-// the vvvvvwv function
-function vvvvvwv(buildcomp_vvvvvwv)
-{
-	// set the function logic
-	if (buildcomp_vvvvvwv == 1)
-	{
-		jQuery('#jform_buildcompsql').closest('.control-group').show();
-		if (jform_vvvvvwvvwl_required)
-		{
-			updateFieldRequired('buildcompsql',0);
-			jQuery('#jform_buildcompsql').prop('required','required');
-			jQuery('#jform_buildcompsql').attr('aria-required',true);
-			jQuery('#jform_buildcompsql').addClass('required');
 			jform_vvvvvwvvwl_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_buildcompsql').closest('.control-group').hide();
+		jQuery('#jform_update_server_target').closest('.control-group').hide();
 		if (!jform_vvvvvwvvwl_required)
+		{
+			updateFieldRequired('update_server_target',1);
+			jQuery('#jform_update_server_target').removeAttr('required');
+			jQuery('#jform_update_server_target').removeAttr('aria-required');
+			jQuery('#jform_update_server_target').removeClass('required');
+			jform_vvvvvwvvwl_required = true;
+		}
+	}
+}
+
+// the vvvvvww function
+function vvvvvww(buildcomp_vvvvvww)
+{
+	// set the function logic
+	if (buildcomp_vvvvvww == 1)
+	{
+		jQuery('#jform_buildcompsql').closest('.control-group').show();
+		if (jform_vvvvvwwvwm_required)
+		{
+			updateFieldRequired('buildcompsql',0);
+			jQuery('#jform_buildcompsql').prop('required','required');
+			jQuery('#jform_buildcompsql').attr('aria-required',true);
+			jQuery('#jform_buildcompsql').addClass('required');
+			jform_vvvvvwwvwm_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_buildcompsql').closest('.control-group').hide();
+		if (!jform_vvvvvwwvwm_required)
 		{
 			updateFieldRequired('buildcompsql',1);
 			jQuery('#jform_buildcompsql').removeAttr('required');
 			jQuery('#jform_buildcompsql').removeAttr('aria-required');
 			jQuery('#jform_buildcompsql').removeClass('required');
-			jform_vvvvvwvvwl_required = true;
+			jform_vvvvvwwvwm_required = true;
 		}
 	}
 }
--- a/admin/models/forms/joomla_component.xml
+++ b/admin/models/forms/joomla_component.xml
@ -169,10 +169,27 @@
                       filter="HTML"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_HINT" />
-                <!-- Add_update_server Field. Type: Radio. (joomla)-->
+                <!-- Readme Field. Type: Editor. (joomla)-->
+                <field type="editor"
+                       name="readme"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL"
+                       default="You can use all the normal markdown, including the place-holders."
+                       width="100%"
+                       height="1200px"
+                       buttons="false"
+                       editor="none"
+                       filter="raw"
+                       required="true" />
+                <!-- Note_version_options_two Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_version_options_two"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_TWO_DESCRIPTION"
+                       class="alert alert-info note_version_options_two"
+                       showon="mvc_versiondate:2" />
+                <!-- Add_css_site Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_update_server"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL"
+                       name="add_css_site"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_SITE_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -180,19 +197,6 @@
                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
                </field>
-                <!-- Note_version_options_two Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_version_options_two"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_VERSION_OPTIONS_TWO_DESCRIPTION"
-                       class="alert alert-info note_version_options_two"
-                       showon="mvc_versiondate:2" />
-                <!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_botton_component_dashboard"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_botton_component_dashboard" />
                <!-- Note_version_options_three Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_version_options_three"
@ -222,16 +226,16 @@
                        <option value="2">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_TWO_NUMBER_OF_GLOBAL_VERSION_ONEZEROX</option>
                        <option value="3">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_USE_ONLY_FIRST_NUMBER_OF_GLOBAL_VERSION_ONEXX</option>
                </field>
-                <!-- Php_postflight_update Field. Type: Textarea. (joomla)-->
+                <!-- Php_postflight_install Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="php_postflight_update"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL"
+                       name="php_postflight_install"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL"
                       rows="17"
                       cols="5"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_HINT"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_HINT"
                       required="true" />
                <!-- Description Field. Type: Textarea. (joomla)-->
                <field type="textarea"
@ -243,11 +247,11 @@
                       class="text_area span12"
                       filter="HTML"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DESCRIPTION_HINT" />
-                <!-- Sales_server_ftp Field. Type: Ftps. (custom)-->
+                <!-- Update_server_ftp Field. Type: Ftps. (custom)-->
                <field type="ftps"
-                       name="sales_server_ftp"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_DESCRIPTION"
+                       name="update_server_ftp"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_DESCRIPTION"
                       class="list_class"
                       multiple="false"
                       default="0"
@ -282,16 +286,16 @@
                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
                </field>
-                <!-- Php_preflight_update Field. Type: Textarea. (joomla)-->
+                <!-- Php_preflight_install Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="php_preflight_update"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL"
+                       name="php_preflight_install"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL"
                       rows="17"
                       cols="5"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_HINT"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_HINT"
                       required="true" />
                <!-- Addfootable Field. Type: List. (joomla)-->
                <field type="list"
@ -307,16 +311,16 @@
                        <option value="3">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTHREE</option>
                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_FOOTABLE_VTWO</option>
                </field>
-                <!-- Sql Field. Type: Textarea. (joomla)-->
+                <!-- Php_method_uninstall Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="sql"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_DESCRIPTION"
+                       name="php_method_uninstall"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_HINT"
                       required="true" />
                <!-- Add_php_helper_admin Field. Type: Radio. (joomla)-->
                <field type="radio"
@ -329,13 +333,19 @@
                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
                </field>
-                <!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_update_server_note_zip"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_update_server_note_zip" />
+                <!-- Update_server_target Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="update_server_target"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_TARGET_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_TARGET_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="1"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FTP</option>
+                        <option value="2">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZIP</option>
+                        <option value="3">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER</option>
+                </field>
                <!-- Add_php_helper_site Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_php_helper_site"
@ -468,10 +478,10 @@
                        <option value="3">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LOCK_DOWN_USE_USED_TO_VERIFY_OWNERSHIP</option>
                        <option value="4">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CUSTOM_USED_IN_CUSTOM_CODE</option>
                </field>
-                <!-- Add_css Field. Type: Radio. (joomla)-->
+                <!-- Add_css_admin Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_css"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_LABEL"
+                       name="add_css_admin"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_CSS_ADMIN_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -486,17 +496,13 @@
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_WHMCS_LISENCING_NOTE_DESCRIPTION"
                       heading="h4"
                       class="alert alert-success note_whmcs_lisencing_note" />
-                <!-- Php_preflight_install Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_preflight_install"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_INSTALL_HINT"
-                       required="true" />
+                <!-- Note_botton_component_dashboard Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_botton_component_dashboard"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BOTTON_COMPONENT_DASHBOARD_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_botton_component_dashboard" />
                <!-- Whmcs_key Field. Type: Text. (joomla)-->
                <field type="text"
                       name="whmcs_key"
@ -508,16 +514,16 @@
                       filter="STRING"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_KEY_HINT" />
-                <!-- Php_postflight_install Field. Type: Textarea. (joomla)-->
+                <!-- Php_preflight_update Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="php_postflight_install"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_LABEL"
+                       name="php_preflight_update"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_LABEL"
                       rows="17"
                       cols="5"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_INSTALL_HINT"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_PREFLIGHT_UPDATE_HINT"
                       required="true" />
                <!-- Whmcs_url Field. Type: Url. (joomla)-->
                <field type="url"
@ -531,16 +537,16 @@
                       validated="url"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_URL_HINT" />
-                <!-- Php_method_uninstall Field. Type: Textarea. (joomla)-->
+                <!-- Php_postflight_update Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="php_method_uninstall"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_LABEL"
+                       name="php_postflight_update"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_LABEL"
                       rows="17"
                       cols="5"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_METHOD_UNINSTALL_HINT"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PHP_POSTFLIGHT_UPDATE_HINT"
                       required="true" />
                <!-- License Field. Type: Textarea. (joomla)-->
                <field type="textarea"
@ -554,16 +560,16 @@
                       filter="HTML"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_LICENSE_HINT"
                       required="true" />
-                <!-- Readme Field. Type: Editor. (joomla)-->
-                <field type="editor"
-                       name="readme"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL"
-                       default="You can use all the normal markdown, including the place-holders."
-                       width="100%"
-                       height="1200px"
-                       buttons="false"
-                       editor="none"
+                <!-- Sql Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="sql"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_DESCRIPTION"
+                       class="text_area span12"
                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SQL_HINT"
                       required="true" />
                <!-- Bom Field. Type: Filelist. (joomla)-->
                <field type="filelist"
@ -573,18 +579,16 @@
                       default="default.txt"
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION"
                       hide_default="true" />
-                <!-- Update_server_target Field. Type: Radio. (joomla)-->
+                <!-- Add_update_server Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="update_server_target"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_TARGET_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_TARGET_DESCRIPTION"
+                       name="add_update_server"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_UPDATE_SERVER_LABEL"
                       class="btn-group btn-group-yesno"
-                       default="1"
+                       default="0"
                       required="true">
                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_FTP</option>
-                        <option value="2">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ZIP</option>
-                        <option value="3">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_OTHER</option>
+                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
                </field>
                <!-- Image Field. Type: Media. (joomla)-->
                <field type="media"
@ -592,15 +596,38 @@
                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL"
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION"
                       directory="" />
-                <!-- Update_server_ftp Field. Type: Ftps. (custom)-->
+                <!-- Note_update_server_note_zip Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_update_server_note_zip"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_ZIP_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_update_server_note_zip" />
+                <!-- Buildcomp Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="buildcomp"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+                </field>
+                <!-- Sales_server_ftp Field. Type: Ftps. (custom)-->
                <field type="ftps"
-                       name="update_server_ftp"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_FTP_DESCRIPTION"
+                       name="sales_server_ftp"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_FTP_DESCRIPTION"
                       class="list_class"
                       multiple="false"
                       default="0"
                       button="true" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
                <!-- Name Field. Type: Text. (joomla)-->
                <field type="text"
                       name="name"
@ -615,27 +642,6 @@
                       filter="STRING"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT" />
-                <!-- Buildcomp Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="buildcomp"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-                </field>
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Note_display_component_site_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_display_component_site_views"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION"
-                       class="note_display_component_site_views" />
                <!-- Note_moved_views Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_moved_views"
@ -794,16 +800,16 @@
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TO_IGNORE_NOTE_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info to_ignore_note" />
-                <!-- Css Field. Type: Textarea. (joomla)-->
+                <!-- Css_admin Field. Type: Textarea. (joomla)-->
                <field type="textarea"
-                       name="css"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_LABEL"
+                       name="css_admin"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_LABEL"
                       rows="30"
                       cols="15"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_DESCRIPTION"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_DESCRIPTION"
                       class="text_area span12"
                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_HINT"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_ADMIN_HINT"
                       required="true" />
                <!-- Toignore Field. Type: Text. (joomla)-->
                <field type="text"
@ -817,26 +823,26 @@
                       filter="STRING"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_TOIGNORE_HINT"
                       autocomplete="on" />
-                <!-- Add_php_preflight_install Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_preflight_install"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-                </field>
+                <!-- Css_site Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css_site"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CSS_SITE_HINT"
+                       required="true" />
                <!-- Spacer_hr_e Field. Type: Spacer. A None Database Field. (joomla)-->
                <field type="spacer"
                       name="spacer_hr_e"
                       hr="true"
                       class="spacer_hr_e" />
-                <!-- Add_php_preflight_update Field. Type: Radio. (joomla)-->
+                <!-- Add_php_preflight_install Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_php_preflight_update"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL"
+                       name="add_php_preflight_install"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_INSTALL_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -851,10 +857,10 @@
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JCB_EXPORT_PACKAGE_NOTE_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info jcb_export_package_note" />
-                <!-- Add_php_postflight_install Field. Type: Radio. (joomla)-->
+                <!-- Add_php_preflight_update Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_php_postflight_install"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
+                       name="add_php_preflight_update"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_PREFLIGHT_UPDATE_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -874,10 +880,10 @@
                       filter="STRING"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT" />
-                <!-- Add_php_postflight_update Field. Type: Radio. (joomla)-->
+                <!-- Add_php_postflight_install Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_php_postflight_update"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
+                       name="add_php_postflight_install"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_INSTALL_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -898,10 +904,10 @@
                       validated="url"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_PACKAGE_LINK_HINT" />
-                <!-- Add_php_method_uninstall Field. Type: Radio. (joomla)-->
+                <!-- Add_php_postflight_update Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_php_method_uninstall"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_METHOD_UNINSTALL_LABEL"
+                       name="add_php_postflight_update"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_POSTFLIGHT_UPDATE_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -922,10 +928,10 @@
                       validated="url"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT" />
-                <!-- Add_sql Field. Type: Radio. (joomla)-->
+                <!-- Add_php_method_uninstall Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_sql"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL"
+                       name="add_php_method_uninstall"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_PHP_METHOD_UNINSTALL_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -938,12 +944,13 @@
                       name="spacer_hr_f"
                       hr="true"
                       class="spacer_hr_f" />
-                <!-- Addreadme Field. Type: Radio. (joomla)-->
+                <!-- Add_sql Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="addreadme"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
+                       name="add_sql"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADD_SQL_LABEL"
                       class="btn-group btn-group-yesno"
-                       default="0">
+                       default="0"
+                       required="true">
                        <!-- Option Set.-->
                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
@ -955,13 +962,16 @@
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info note_on_contributors" />
-                <!-- Note_readme Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_readme"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_DESCRIPTION"
-                       heading="h4"
-                       class="note_readme" />
+                <!-- Addreadme Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="addreadme"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_ADDREADME_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+                </field>
                <!-- Addcontributors Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="addcontributors"
@ -1059,6 +1069,24 @@
                                </field>
                        </form>
                </field>
+                <!-- Note_readme Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_readme"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_README_DESCRIPTION"
+                       heading="h4"
+                       class="note_readme" />
+                <!-- Emptycontributors Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="emptycontributors"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
+                </field>
                <!-- Update_server Field. Type: Url. (joomla)-->
                <field type="url"
                       name="update_server"
@ -1071,24 +1099,6 @@
                       validated="url"
                       message="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_MESSAGE"
                       hint="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_UPDATE_SERVER_HINT" />
-                <!-- Emptycontributors Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="emptycontributors"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION"
-                       class="btn-group btn-group-yesno"
-                       default="0">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
-                </field>
-                <!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_update_server_note_ftp"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-success note_update_server_note_ftp" />
                <!-- Number Field. Type: Number. (joomla)-->
                <field type="number"
                       name="number"
@ -1098,13 +1108,13 @@
                       min="1"
                       max="40"
                       step="1" />
-                <!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_update_server_note_ftp Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_update_server_note_other"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION"
+                       name="note_update_server_note_ftp"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_FTP_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-success note_update_server_note_other" />
+                       class="alert alert-success note_update_server_note_ftp" />
                <!-- Note_on_admin_views Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_on_admin_views"
@ -1112,6 +1122,18 @@
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info note_on_admin_views" />
+                <!-- Note_update_server_note_other Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_update_server_note_other"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_UPDATE_SERVER_NOTE_OTHER_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-success note_update_server_note_other" />
+                <!-- Note_display_component_admin_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_display_component_admin_views"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION"
+                       class="note_display_component_admin_views" />
                <!-- Add_sales_server Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_sales_server"
@ -1123,18 +1145,6 @@
                        <option value="1">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO</option>
                </field>
-                <!-- Note_display_component_admin_views Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_display_component_admin_views"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_ADMIN_VIEWS_DESCRIPTION"
-                       class="note_display_component_admin_views" />
-                <!-- Note_buildcomp_dynamic_mysql Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_buildcomp_dynamic_mysql"
-                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL"
-                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_buildcomp_dynamic_mysql" />
                <!-- Note_on_site_views Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_on_site_views"
@ -1142,6 +1152,18 @@
                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_SITE_VIEWS_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info note_on_site_views" />
+                <!-- Note_buildcomp_dynamic_mysql Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_buildcomp_dynamic_mysql"
+                       label="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_buildcomp_dynamic_mysql" />
+                <!-- Note_display_component_site_views Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_display_component_site_views"
+                       description="COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DISPLAY_COMPONENT_SITE_VIEWS_DESCRIPTION"
+                       class="note_display_component_site_views" />
                <!-- Buildcompsql Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="buildcompsql"
--- a/admin/models/forms/layout.js
+++ b/admin/models/forms/layout.js
@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyvvyr_required = false;
+jform_vvvvvyxvyt_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyv = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyv(add_php_view_vvvvvyv);
+	var add_php_view_vvvvvyx = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyx(add_php_view_vvvvvyx);
 });

-// the vvvvvyv function
-function vvvvvyv(add_php_view_vvvvvyv)
+// the vvvvvyx function
+function vvvvvyx(add_php_view_vvvvvyx)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyv == 1)
+	if (add_php_view_vvvvvyx == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyvvyr_required)
+		if (jform_vvvvvyxvyt_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyvvyr_required = false;
+			jform_vvvvvyxvyt_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyvvyr_required)
+		if (!jform_vvvvvyxvyt_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyvvyr_required = true;
+			jform_vvvvvyxvyt_required = true;
 		}
 	}
 }
--- a/admin/models/forms/library.js
+++ b/admin/models/forms/library.js
@ -23,18 +23,12 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvzxvzo_required = false;
-jform_vvvvwadvzp_required = false;
+jform_vvvvvzzvzq_required = false;
+jform_vvvvwafvzr_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var how_vvvvvzw = jQuery("#jform_how").val();
-	vvvvvzw(how_vvvvvzw);
-
-	var how_vvvvvzx = jQuery("#jform_how").val();
-	vvvvvzx(how_vvvvvzx);
-
 	var how_vvvvvzy = jQuery("#jform_how").val();
 	vvvvvzy(how_vvvvvzy);

@ -50,103 +44,16 @@ jQuery(document).ready(function()
 	var how_vvvvwac = jQuery("#jform_how").val();
 	vvvvwac(how_vvvvwac);

-	var type_vvvvwad = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvwad(type_vvvvwad);
+	var how_vvvvwad = jQuery("#jform_how").val();
+	vvvvwad(how_vvvvwad);
+
+	var how_vvvvwae = jQuery("#jform_how").val();
+	vvvvwae(how_vvvvwae);
+
+	var type_vvvvwaf = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvwaf(type_vvvvwaf);
 });

-// the vvvvvzw function
-function vvvvvzw(how_vvvvvzw)
-{
-	if (isSet(how_vvvvvzw) && how_vvvvvzw.constructor !== Array)
-	{
-		var temp_vvvvvzw = how_vvvvvzw;
-		var how_vvvvvzw = [];
-		how_vvvvvzw.push(temp_vvvvvzw);
-	}
-	else if (!isSet(how_vvvvvzw))
-	{
-		var how_vvvvvzw = [];
-	}
-	var how = how_vvvvvzw.some(how_vvvvvzw_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
-	}
-	else
-	{
-		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
-	}
-}
-
-// the vvvvvzw Some function
-function how_vvvvvzw_SomeFunc(how_vvvvvzw)
-{
-	// set the function logic
-	if (how_vvvvvzw == 2)
-	{
-		return true;
-	}
-	return false;
-}
-
-// the vvvvvzx function
-function vvvvvzx(how_vvvvvzx)
-{
-	if (isSet(how_vvvvvzx) && how_vvvvvzx.constructor !== Array)
-	{
-		var temp_vvvvvzx = how_vvvvvzx;
-		var how_vvvvvzx = [];
-		how_vvvvvzx.push(temp_vvvvvzx);
-	}
-	else if (!isSet(how_vvvvvzx))
-	{
-		var how_vvvvvzx = [];
-	}
-	var how = how_vvvvvzx.some(how_vvvvvzx_SomeFunc);
-
-
-	// set this function logic
-	if (how)
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').show();
-		if (jform_vvvvvzxvzo_required)
-		{
-			updateFieldRequired('php_setdocument',0);
-			jQuery('#jform_php_setdocument').prop('required','required');
-			jQuery('#jform_php_setdocument').attr('aria-required',true);
-			jQuery('#jform_php_setdocument').addClass('required');
-			jform_vvvvvzxvzo_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_setdocument').closest('.control-group').hide();
-		if (!jform_vvvvvzxvzo_required)
-		{
-			updateFieldRequired('php_setdocument',1);
-			jQuery('#jform_php_setdocument').removeAttr('required');
-			jQuery('#jform_php_setdocument').removeAttr('aria-required');
-			jQuery('#jform_php_setdocument').removeClass('required');
-			jform_vvvvvzxvzo_required = true;
-		}
-	}
-}
-
-// the vvvvvzx Some function
-function how_vvvvvzx_SomeFunc(how_vvvvvzx)
-{
-	// set the function logic
-	if (how_vvvvvzx == 3)
-	{
-		return true;
-	}
-	return false;
-}
-
 // the vvvvvzy function
 function vvvvvzy(how_vvvvvzy)
 {
@ -166,11 +73,11 @@ function vvvvvzy(how_vvvvvzy)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_config').closest('.control-group').show();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_display_library_config').closest('.control-group').hide();
+		jQuery('#jform_addconditions-lbl').closest('.control-group').hide();
 	}
 }

@ -178,7 +85,7 @@ function vvvvvzy(how_vvvvvzy)
 function how_vvvvvzy_SomeFunc(how_vvvvvzy)
 {
 	// set the function logic
-	if (how_vvvvvzy == 2 || how_vvvvvzy == 3)
+	if (how_vvvvvzy == 2)
 	{
 		return true;
 	}
@ -204,11 +111,28 @@ function vvvvvzz(how_vvvvvzz)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
+		jQuery('#jform_php_setdocument').closest('.control-group').show();
+		if (jform_vvvvvzzvzq_required)
+		{
+			updateFieldRequired('php_setdocument',0);
+			jQuery('#jform_php_setdocument').prop('required','required');
+			jQuery('#jform_php_setdocument').attr('aria-required',true);
+			jQuery('#jform_php_setdocument').addClass('required');
+			jform_vvvvvzzvzq_required = false;
+		}
+
 	}
 	else
 	{
-		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
+		jQuery('#jform_php_setdocument').closest('.control-group').hide();
+		if (!jform_vvvvvzzvzq_required)
+		{
+			updateFieldRequired('php_setdocument',1);
+			jQuery('#jform_php_setdocument').removeAttr('required');
+			jQuery('#jform_php_setdocument').removeAttr('aria-required');
+			jQuery('#jform_php_setdocument').removeClass('required');
+			jform_vvvvvzzvzq_required = true;
+		}
 	}
 }

@ -216,7 +140,7 @@ function vvvvvzz(how_vvvvvzz)
 function how_vvvvvzz_SomeFunc(how_vvvvvzz)
 {
 	// set the function logic
-	if (how_vvvvvzz == 1 || how_vvvvvzz == 2 || how_vvvvvzz == 3)
+	if (how_vvvvvzz == 3)
 	{
 		return true;
 	}
@ -242,15 +166,11 @@ function vvvvwaa(how_vvvvwaa)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').show();
-		jQuery('.note_no_behaviour_three').closest('.control-group').show();
-		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_config').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
-		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_config').closest('.control-group').hide();
 	}
 }

@ -258,7 +178,7 @@ function vvvvwaa(how_vvvvwaa)
 function how_vvvvwaa_SomeFunc(how_vvvvwaa)
 {
 	// set the function logic
-	if (how_vvvvwaa == 0)
+	if (how_vvvvwaa == 2 || how_vvvvwaa == 3)
 	{
 		return true;
 	}
@ -284,13 +204,11 @@ function vvvvwab(how_vvvvwab)
 	// set this function logic
 	if (how)
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').show();
 	}
 	else
 	{
-		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
-		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+		jQuery('.note_display_library_files_folders_urls').closest('.control-group').hide();
 	}
 }

@ -298,7 +216,7 @@ function vvvvwab(how_vvvvwab)
 function how_vvvvwab_SomeFunc(how_vvvvwab)
 {
 	// set the function logic
-	if (how_vvvvwab == 1)
+	if (how_vvvvwab == 1 || how_vvvvwab == 2 || how_vvvvwab == 3)
 	{
 		return true;
 	}
@ -321,6 +239,88 @@ function vvvvwac(how_vvvvwac)
 	var how = how_vvvvwac.some(how_vvvvwac_SomeFunc);


+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').show();
+		jQuery('.note_no_behaviour_three').closest('.control-group').show();
+		jQuery('.note_no_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_no_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_three').closest('.control-group').hide();
+		jQuery('.note_no_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwac Some function
+function how_vvvvwac_SomeFunc(how_vvvvwac)
+{
+	// set the function logic
+	if (how_vvvvwac == 0)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwad function
+function vvvvwad(how_vvvvwad)
+{
+	if (isSet(how_vvvvwad) && how_vvvvwad.constructor !== Array)
+	{
+		var temp_vvvvwad = how_vvvvwad;
+		var how_vvvvwad = [];
+		how_vvvvwad.push(temp_vvvvwad);
+	}
+	else if (!isSet(how_vvvvwad))
+	{
+		var how_vvvvwad = [];
+	}
+	var how = how_vvvvwad.some(how_vvvvwad_SomeFunc);
+
+
+	// set this function logic
+	if (how)
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').show();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').show();
+	}
+	else
+	{
+		jQuery('.note_yes_behaviour_one').closest('.control-group').hide();
+		jQuery('.note_yes_behaviour_two').closest('.control-group').hide();
+	}
+}
+
+// the vvvvwad Some function
+function how_vvvvwad_SomeFunc(how_vvvvwad)
+{
+	// set the function logic
+	if (how_vvvvwad == 1)
+	{
+		return true;
+	}
+	return false;
+}
+
+// the vvvvwae function
+function vvvvwae(how_vvvvwae)
+{
+	if (isSet(how_vvvvwae) && how_vvvvwae.constructor !== Array)
+	{
+		var temp_vvvvwae = how_vvvvwae;
+		var how_vvvvwae = [];
+		how_vvvvwae.push(temp_vvvvwae);
+	}
+	else if (!isSet(how_vvvvwae))
+	{
+		var how_vvvvwae = [];
+	}
+	var how = how_vvvvwae.some(how_vvvvwae_SomeFunc);
+
+
 	// set this function logic
 	if (how)
 	{
@ -336,44 +336,44 @@ function vvvvwac(how_vvvvwac)
 	}
 }

-// the vvvvwac Some function
-function how_vvvvwac_SomeFunc(how_vvvvwac)
+// the vvvvwae Some function
+function how_vvvvwae_SomeFunc(how_vvvvwae)
 {
 	// set the function logic
-	if (how_vvvvwac == 4)
+	if (how_vvvvwae == 4)
 	{
 		return true;
 	}
 	return false;
 }

-// the vvvvwad function
-function vvvvwad(type_vvvvwad)
+// the vvvvwaf function
+function vvvvwaf(type_vvvvwaf)
 {
 	// set the function logic
-	if (type_vvvvwad == 2)
+	if (type_vvvvwaf == 2)
 	{
 		jQuery('#jform_libraries').closest('.control-group').show();
-		if (jform_vvvvwadvzp_required)
+		if (jform_vvvvwafvzr_required)
 		{
 			updateFieldRequired('libraries',0);
 			jQuery('#jform_libraries').prop('required','required');
 			jQuery('#jform_libraries').attr('aria-required',true);
 			jQuery('#jform_libraries').addClass('required');
-			jform_vvvvwadvzp_required = false;
+			jform_vvvvwafvzr_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_libraries').closest('.control-group').hide();
-		if (!jform_vvvvwadvzp_required)
+		if (!jform_vvvvwafvzr_required)
 		{
 			updateFieldRequired('libraries',1);
 			jQuery('#jform_libraries').removeAttr('required');
 			jQuery('#jform_libraries').removeAttr('aria-required');
 			jQuery('#jform_libraries').removeClass('required');
-			jform_vvvvwadvzp_required = true;
+			jform_vvvvwafvzr_required = true;
 		}
 	}
 }
@ -416,6 +416,8 @@ function isSet(val)

 jQuery(document).ready(function()
 {
+	// get the linked details
+	getLinked();
 	// now load the displays
 	getAjaxDisplay('library_config');
 	getAjaxDisplay('library_files_folders_urls');
@ -471,6 +473,28 @@ function addButton(type,where){
 	})
 }			
 			
+function getLinked_server(type){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && type > 0){
+		var request = 'token='+token+'&type='+type;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+function getLinked(){
+	getLinked_server(1).done(function(result) {
+		if(result){
+			jQuery('#display_linked_to').html(result);
+		}
+	});
+}			
+
 function getAjaxDisplay(type){
 	getAjaxDisplay_server(type).done(function(result) {
 		if (result) {
--- a/admin/models/forms/library.xml
+++ b/admin/models/forms/library.xml
@ -136,6 +136,11 @@
                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_ONE_DESCRIPTION"
                       heading="h4"
                       class="alert alert-success note_yes_behaviour_one" />
+                <!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_display_library_files_folders_urls"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION"
+                       class="note_display_library_files_folders_urls" />
                <!-- Note_build_in_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_build_in_behaviour_one"
@ -143,13 +148,13 @@
                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_ONE_DESCRIPTION"
                       heading="h4"
                       class="alert alert-success note_build_in_behaviour_one" />
-                <!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_no_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION"
+                       name="note_no_behaviour_three"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-error note_no_behaviour_two" />
+                       class="alert alert-error note_no_behaviour_three" />
                <!-- Addconditions Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="addconditions"
@ -244,13 +249,13 @@
                                       required="false" />
                        </form>
                </field>
-                <!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_build_in_behaviour_three"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION"
+                       name="note_yes_behaviour_two"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-success note_build_in_behaviour_three" />
+                       class="alert alert-success note_yes_behaviour_two" />
                <!-- Php_setdocument Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_setdocument"
@ -262,13 +267,13 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_LIBRARY_PHP_SETDOCUMENT_HINT"
                       required="true" />
-                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_build_in_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
+                       name="note_no_behaviour_one"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-success note_build_in_behaviour_two" />
+                       class="alert alert-error note_no_behaviour_one" />
                <!-- Libraries Field. Type: Librariesx. (custom)-->
                <field type="librariesx"
                       name="libraries"
@ -279,13 +284,13 @@
                       default="0"
                       required="false"
                       button="true" />
-                <!-- Note_no_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_build_in_behaviour_three Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_no_behaviour_three"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_THREE_DESCRIPTION"
+                       name="note_build_in_behaviour_three"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_THREE_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-error note_no_behaviour_three" />
+                       class="alert alert-success note_build_in_behaviour_three" />
                <!-- Note_library_instruction Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_library_instruction"
@ -293,34 +298,36 @@
                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LIBRARY_INSTRUCTION_DESCRIPTION"
                       heading="h4"
                       class="alert alert-info note_library_instruction" />
-                <!-- Note_display_library_files_folders_urls Field. Type: Note. A None Database Field. (joomla)-->
+                <!-- Note_no_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
-                       name="note_display_library_files_folders_urls"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_FILES_FOLDERS_URLS_DESCRIPTION"
-                       class="note_display_library_files_folders_urls" />
-                <!-- Note_no_behaviour_one Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_no_behaviour_one"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_ONE_DESCRIPTION"
+                       name="note_no_behaviour_two"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_NO_BEHAVIOUR_TWO_DESCRIPTION"
                       heading="h4"
-                       class="alert alert-error note_no_behaviour_one" />
-                <!-- Note_yes_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_yes_behaviour_two"
-                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_LABEL"
-                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_YES_BEHAVIOUR_TWO_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-success note_yes_behaviour_two" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
+                       class="alert alert-error note_no_behaviour_two" />
                <!-- Note_display_library_config Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_display_library_config"
                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_DISPLAY_LIBRARY_CONFIG_DESCRIPTION"
                       class="note_display_library_config" />
+                <!-- Note_build_in_behaviour_two Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_build_in_behaviour_two"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_BUILD_IN_BEHAVIOUR_TWO_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-success note_build_in_behaviour_two" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_linked_to_notice"
+                       label="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_LABEL"
+                       description="COM_COMPONENTBUILDER_LIBRARY_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
+                       heading="h4"
+                       class="note_linked_to_notice" />
        </fieldset>
 	
 	<!-- Access Control Fields. -->
--- a/admin/models/forms/site_view.js
+++ b/admin/models/forms/site_view.js
@ -23,8 +23,6 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyjvyf_required = false;
-jform_vvvvvykvyg_required = false;
 jform_vvvvvylvyh_required = false;
 jform_vvvvvymvyi_required = false;
 jform_vvvvvynvyj_required = false;
@ -33,308 +31,310 @@ jform_vvvvvypvyl_required = false;
 jform_vvvvvyqvym_required = false;
 jform_vvvvvyrvyn_required = false;
 jform_vvvvvysvyo_required = false;
-jform_vvvvvysvyp_required = false;
+jform_vvvvvytvyp_required = false;
+jform_vvvvvyuvyq_required = false;
+jform_vvvvvyuvyr_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyj = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyj(add_php_view_vvvvvyj);
+	var add_php_view_vvvvvyl = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyl(add_php_view_vvvvvyl);

-	var add_php_jview_display_vvvvvyk = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyk(add_php_jview_display_vvvvvyk);
+	var add_php_jview_display_vvvvvym = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvym(add_php_jview_display_vvvvvym);

-	var add_php_jview_vvvvvyl = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyl(add_php_jview_vvvvvyl);
+	var add_php_jview_vvvvvyn = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyn(add_php_jview_vvvvvyn);

-	var add_php_document_vvvvvym = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvym(add_php_document_vvvvvym);
+	var add_php_document_vvvvvyo = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvyo(add_php_document_vvvvvyo);

-	var add_css_document_vvvvvyn = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvyn(add_css_document_vvvvvyn);
+	var add_css_document_vvvvvyp = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyp(add_css_document_vvvvvyp);

-	var add_javascript_file_vvvvvyo = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyo(add_javascript_file_vvvvvyo);
+	var add_javascript_file_vvvvvyq = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyq(add_javascript_file_vvvvvyq);

-	var add_js_document_vvvvvyp = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyp(add_js_document_vvvvvyp);
+	var add_js_document_vvvvvyr = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyr(add_js_document_vvvvvyr);

-	var add_css_vvvvvyq = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyq(add_css_vvvvvyq);
+	var add_css_vvvvvys = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvys(add_css_vvvvvys);

-	var add_php_ajax_vvvvvyr = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvyr(add_php_ajax_vvvvvyr);
+	var add_php_ajax_vvvvvyt = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyt(add_php_ajax_vvvvvyt);

-	var add_custom_button_vvvvvys = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvys(add_custom_button_vvvvvys);
+	var add_custom_button_vvvvvyu = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyu(add_custom_button_vvvvvyu);

-	var button_position_vvvvvyt = jQuery("#jform_button_position").val();
-	vvvvvyt(button_position_vvvvvyt);
+	var button_position_vvvvvyv = jQuery("#jform_button_position").val();
+	vvvvvyv(button_position_vvvvvyv);
 });

-// the vvvvvyj function
-function vvvvvyj(add_php_view_vvvvvyj)
+// the vvvvvyl function
+function vvvvvyl(add_php_view_vvvvvyl)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyj == 1)
+	if (add_php_view_vvvvvyl == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyjvyf_required)
+		if (jform_vvvvvylvyh_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyjvyf_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyjvyf_required)
-		{
-			updateFieldRequired('php_view',1);
-			jQuery('#jform_php_view').removeAttr('required');
-			jQuery('#jform_php_view').removeAttr('aria-required');
-			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyjvyf_required = true;
-		}
-	}
-}
-
-// the vvvvvyk function
-function vvvvvyk(add_php_jview_display_vvvvvyk)
-{
-	// set the function logic
-	if (add_php_jview_display_vvvvvyk == 1)
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').show();
-		if (jform_vvvvvykvyg_required)
-		{
-			updateFieldRequired('php_jview_display',0);
-			jQuery('#jform_php_jview_display').prop('required','required');
-			jQuery('#jform_php_jview_display').attr('aria-required',true);
-			jQuery('#jform_php_jview_display').addClass('required');
-			jform_vvvvvykvyg_required = false;
-		}
-
-	}
-	else
-	{
-		jQuery('#jform_php_jview_display').closest('.control-group').hide();
-		if (!jform_vvvvvykvyg_required)
-		{
-			updateFieldRequired('php_jview_display',1);
-			jQuery('#jform_php_jview_display').removeAttr('required');
-			jQuery('#jform_php_jview_display').removeAttr('aria-required');
-			jQuery('#jform_php_jview_display').removeClass('required');
-			jform_vvvvvykvyg_required = true;
-		}
-	}
-}
-
-// the vvvvvyl function
-function vvvvvyl(add_php_jview_vvvvvyl)
-{
-	// set the function logic
-	if (add_php_jview_vvvvvyl == 1)
-	{
-		jQuery('#jform_php_jview').closest('.control-group').show();
-		if (jform_vvvvvylvyh_required)
-		{
-			updateFieldRequired('php_jview',0);
-			jQuery('#jform_php_jview').prop('required','required');
-			jQuery('#jform_php_jview').attr('aria-required',true);
-			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvylvyh_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_jview').closest('.control-group').hide();
+		jQuery('#jform_php_view').closest('.control-group').hide();
 		if (!jform_vvvvvylvyh_required)
 		{
-			updateFieldRequired('php_jview',1);
-			jQuery('#jform_php_jview').removeAttr('required');
-			jQuery('#jform_php_jview').removeAttr('aria-required');
-			jQuery('#jform_php_jview').removeClass('required');
+			updateFieldRequired('php_view',1);
+			jQuery('#jform_php_view').removeAttr('required');
+			jQuery('#jform_php_view').removeAttr('aria-required');
+			jQuery('#jform_php_view').removeClass('required');
 			jform_vvvvvylvyh_required = true;
 		}
 	}
 }

 // the vvvvvym function
-function vvvvvym(add_php_document_vvvvvym)
+function vvvvvym(add_php_jview_display_vvvvvym)
 {
 	// set the function logic
-	if (add_php_document_vvvvvym == 1)
+	if (add_php_jview_display_vvvvvym == 1)
 	{
-		jQuery('#jform_php_document').closest('.control-group').show();
+		jQuery('#jform_php_jview_display').closest('.control-group').show();
 		if (jform_vvvvvymvyi_required)
 		{
-			updateFieldRequired('php_document',0);
-			jQuery('#jform_php_document').prop('required','required');
-			jQuery('#jform_php_document').attr('aria-required',true);
-			jQuery('#jform_php_document').addClass('required');
+			updateFieldRequired('php_jview_display',0);
+			jQuery('#jform_php_jview_display').prop('required','required');
+			jQuery('#jform_php_jview_display').attr('aria-required',true);
+			jQuery('#jform_php_jview_display').addClass('required');
 			jform_vvvvvymvyi_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_php_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview_display').closest('.control-group').hide();
 		if (!jform_vvvvvymvyi_required)
 		{
-			updateFieldRequired('php_document',1);
-			jQuery('#jform_php_document').removeAttr('required');
-			jQuery('#jform_php_document').removeAttr('aria-required');
-			jQuery('#jform_php_document').removeClass('required');
+			updateFieldRequired('php_jview_display',1);
+			jQuery('#jform_php_jview_display').removeAttr('required');
+			jQuery('#jform_php_jview_display').removeAttr('aria-required');
+			jQuery('#jform_php_jview_display').removeClass('required');
 			jform_vvvvvymvyi_required = true;
 		}
 	}
 }

 // the vvvvvyn function
-function vvvvvyn(add_css_document_vvvvvyn)
+function vvvvvyn(add_php_jview_vvvvvyn)
 {
 	// set the function logic
-	if (add_css_document_vvvvvyn == 1)
+	if (add_php_jview_vvvvvyn == 1)
 	{
-		jQuery('#jform_css_document').closest('.control-group').show();
+		jQuery('#jform_php_jview').closest('.control-group').show();
 		if (jform_vvvvvynvyj_required)
 		{
-			updateFieldRequired('css_document',0);
-			jQuery('#jform_css_document').prop('required','required');
-			jQuery('#jform_css_document').attr('aria-required',true);
-			jQuery('#jform_css_document').addClass('required');
+			updateFieldRequired('php_jview',0);
+			jQuery('#jform_php_jview').prop('required','required');
+			jQuery('#jform_php_jview').attr('aria-required',true);
+			jQuery('#jform_php_jview').addClass('required');
 			jform_vvvvvynvyj_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css_document').closest('.control-group').hide();
+		jQuery('#jform_php_jview').closest('.control-group').hide();
 		if (!jform_vvvvvynvyj_required)
 		{
-			updateFieldRequired('css_document',1);
-			jQuery('#jform_css_document').removeAttr('required');
-			jQuery('#jform_css_document').removeAttr('aria-required');
-			jQuery('#jform_css_document').removeClass('required');
+			updateFieldRequired('php_jview',1);
+			jQuery('#jform_php_jview').removeAttr('required');
+			jQuery('#jform_php_jview').removeAttr('aria-required');
+			jQuery('#jform_php_jview').removeClass('required');
 			jform_vvvvvynvyj_required = true;
 		}
 	}
 }

 // the vvvvvyo function
-function vvvvvyo(add_javascript_file_vvvvvyo)
+function vvvvvyo(add_php_document_vvvvvyo)
 {
 	// set the function logic
-	if (add_javascript_file_vvvvvyo == 1)
+	if (add_php_document_vvvvvyo == 1)
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').show();
+		jQuery('#jform_php_document').closest('.control-group').show();
 		if (jform_vvvvvyovyk_required)
 		{
-			updateFieldRequired('javascript_file',0);
-			jQuery('#jform_javascript_file').prop('required','required');
-			jQuery('#jform_javascript_file').attr('aria-required',true);
-			jQuery('#jform_javascript_file').addClass('required');
+			updateFieldRequired('php_document',0);
+			jQuery('#jform_php_document').prop('required','required');
+			jQuery('#jform_php_document').attr('aria-required',true);
+			jQuery('#jform_php_document').addClass('required');
 			jform_vvvvvyovyk_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_javascript_file').closest('.control-group').hide();
+		jQuery('#jform_php_document').closest('.control-group').hide();
 		if (!jform_vvvvvyovyk_required)
 		{
-			updateFieldRequired('javascript_file',1);
-			jQuery('#jform_javascript_file').removeAttr('required');
-			jQuery('#jform_javascript_file').removeAttr('aria-required');
-			jQuery('#jform_javascript_file').removeClass('required');
+			updateFieldRequired('php_document',1);
+			jQuery('#jform_php_document').removeAttr('required');
+			jQuery('#jform_php_document').removeAttr('aria-required');
+			jQuery('#jform_php_document').removeClass('required');
 			jform_vvvvvyovyk_required = true;
 		}
 	}
 }

 // the vvvvvyp function
-function vvvvvyp(add_js_document_vvvvvyp)
+function vvvvvyp(add_css_document_vvvvvyp)
 {
 	// set the function logic
-	if (add_js_document_vvvvvyp == 1)
+	if (add_css_document_vvvvvyp == 1)
 	{
-		jQuery('#jform_js_document').closest('.control-group').show();
+		jQuery('#jform_css_document').closest('.control-group').show();
 		if (jform_vvvvvypvyl_required)
 		{
-			updateFieldRequired('js_document',0);
-			jQuery('#jform_js_document').prop('required','required');
-			jQuery('#jform_js_document').attr('aria-required',true);
-			jQuery('#jform_js_document').addClass('required');
+			updateFieldRequired('css_document',0);
+			jQuery('#jform_css_document').prop('required','required');
+			jQuery('#jform_css_document').attr('aria-required',true);
+			jQuery('#jform_css_document').addClass('required');
 			jform_vvvvvypvyl_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_js_document').closest('.control-group').hide();
+		jQuery('#jform_css_document').closest('.control-group').hide();
 		if (!jform_vvvvvypvyl_required)
 		{
-			updateFieldRequired('js_document',1);
-			jQuery('#jform_js_document').removeAttr('required');
-			jQuery('#jform_js_document').removeAttr('aria-required');
-			jQuery('#jform_js_document').removeClass('required');
+			updateFieldRequired('css_document',1);
+			jQuery('#jform_css_document').removeAttr('required');
+			jQuery('#jform_css_document').removeAttr('aria-required');
+			jQuery('#jform_css_document').removeClass('required');
 			jform_vvvvvypvyl_required = true;
 		}
 	}
 }

 // the vvvvvyq function
-function vvvvvyq(add_css_vvvvvyq)
+function vvvvvyq(add_javascript_file_vvvvvyq)
 {
 	// set the function logic
-	if (add_css_vvvvvyq == 1)
+	if (add_javascript_file_vvvvvyq == 1)
 	{
-		jQuery('#jform_css').closest('.control-group').show();
+		jQuery('#jform_javascript_file').closest('.control-group').show();
 		if (jform_vvvvvyqvym_required)
 		{
-			updateFieldRequired('css',0);
-			jQuery('#jform_css').prop('required','required');
-			jQuery('#jform_css').attr('aria-required',true);
-			jQuery('#jform_css').addClass('required');
+			updateFieldRequired('javascript_file',0);
+			jQuery('#jform_javascript_file').prop('required','required');
+			jQuery('#jform_javascript_file').attr('aria-required',true);
+			jQuery('#jform_javascript_file').addClass('required');
 			jform_vvvvvyqvym_required = false;
 		}

 	}
 	else
 	{
-		jQuery('#jform_css').closest('.control-group').hide();
+		jQuery('#jform_javascript_file').closest('.control-group').hide();
 		if (!jform_vvvvvyqvym_required)
 		{
-			updateFieldRequired('css',1);
-			jQuery('#jform_css').removeAttr('required');
-			jQuery('#jform_css').removeAttr('aria-required');
-			jQuery('#jform_css').removeClass('required');
+			updateFieldRequired('javascript_file',1);
+			jQuery('#jform_javascript_file').removeAttr('required');
+			jQuery('#jform_javascript_file').removeAttr('aria-required');
+			jQuery('#jform_javascript_file').removeClass('required');
 			jform_vvvvvyqvym_required = true;
 		}
 	}
 }

 // the vvvvvyr function
-function vvvvvyr(add_php_ajax_vvvvvyr)
+function vvvvvyr(add_js_document_vvvvvyr)
 {
 	// set the function logic
-	if (add_php_ajax_vvvvvyr == 1)
+	if (add_js_document_vvvvvyr == 1)
+	{
+		jQuery('#jform_js_document').closest('.control-group').show();
+		if (jform_vvvvvyrvyn_required)
+		{
+			updateFieldRequired('js_document',0);
+			jQuery('#jform_js_document').prop('required','required');
+			jQuery('#jform_js_document').attr('aria-required',true);
+			jQuery('#jform_js_document').addClass('required');
+			jform_vvvvvyrvyn_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_js_document').closest('.control-group').hide();
+		if (!jform_vvvvvyrvyn_required)
+		{
+			updateFieldRequired('js_document',1);
+			jQuery('#jform_js_document').removeAttr('required');
+			jQuery('#jform_js_document').removeAttr('aria-required');
+			jQuery('#jform_js_document').removeClass('required');
+			jform_vvvvvyrvyn_required = true;
+		}
+	}
+}
+
+// the vvvvvys function
+function vvvvvys(add_css_vvvvvys)
+{
+	// set the function logic
+	if (add_css_vvvvvys == 1)
+	{
+		jQuery('#jform_css').closest('.control-group').show();
+		if (jform_vvvvvysvyo_required)
+		{
+			updateFieldRequired('css',0);
+			jQuery('#jform_css').prop('required','required');
+			jQuery('#jform_css').attr('aria-required',true);
+			jQuery('#jform_css').addClass('required');
+			jform_vvvvvysvyo_required = false;
+		}
+
+	}
+	else
+	{
+		jQuery('#jform_css').closest('.control-group').hide();
+		if (!jform_vvvvvysvyo_required)
+		{
+			updateFieldRequired('css',1);
+			jQuery('#jform_css').removeAttr('required');
+			jQuery('#jform_css').removeAttr('aria-required');
+			jQuery('#jform_css').removeClass('required');
+			jform_vvvvvysvyo_required = true;
+		}
+	}
+}
+
+// the vvvvvyt function
+function vvvvvyt(add_php_ajax_vvvvvyt)
+{
+	// set the function logic
+	if (add_php_ajax_vvvvvyt == 1)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').show();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').show();
-		if (jform_vvvvvyrvyn_required)
+		if (jform_vvvvvytvyp_required)
 		{
 			updateFieldRequired('php_ajaxmethod',0);
 			jQuery('#jform_php_ajaxmethod').prop('required','required');
 			jQuery('#jform_php_ajaxmethod').attr('aria-required',true);
 			jQuery('#jform_php_ajaxmethod').addClass('required');
-			jform_vvvvvyrvyn_required = false;
+			jform_vvvvvytvyp_required = false;
 		}

 	}
@ -342,42 +342,42 @@ function vvvvvyr(add_php_ajax_vvvvvyr)
 	{
 		jQuery('#jform_ajax_input-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_ajaxmethod').closest('.control-group').hide();
-		if (!jform_vvvvvyrvyn_required)
+		if (!jform_vvvvvytvyp_required)
 		{
 			updateFieldRequired('php_ajaxmethod',1);
 			jQuery('#jform_php_ajaxmethod').removeAttr('required');
 			jQuery('#jform_php_ajaxmethod').removeAttr('aria-required');
 			jQuery('#jform_php_ajaxmethod').removeClass('required');
-			jform_vvvvvyrvyn_required = true;
+			jform_vvvvvytvyp_required = true;
 		}
 	}
 }

-// the vvvvvys function
-function vvvvvys(add_custom_button_vvvvvys)
+// the vvvvvyu function
+function vvvvvyu(add_custom_button_vvvvvyu)
 {
 	// set the function logic
-	if (add_custom_button_vvvvvys == 1)
+	if (add_custom_button_vvvvvyu == 1)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').show();
 		jQuery('#jform_php_controller').closest('.control-group').show();
-		if (jform_vvvvvysvyo_required)
+		if (jform_vvvvvyuvyq_required)
 		{
 			updateFieldRequired('php_controller',0);
 			jQuery('#jform_php_controller').prop('required','required');
 			jQuery('#jform_php_controller').attr('aria-required',true);
 			jQuery('#jform_php_controller').addClass('required');
-			jform_vvvvvysvyo_required = false;
+			jform_vvvvvyuvyq_required = false;
 		}

 		jQuery('#jform_php_model').closest('.control-group').show();
-		if (jform_vvvvvysvyp_required)
+		if (jform_vvvvvyuvyr_required)
 		{
 			updateFieldRequired('php_model',0);
 			jQuery('#jform_php_model').prop('required','required');
 			jQuery('#jform_php_model').attr('aria-required',true);
 			jQuery('#jform_php_model').addClass('required');
-			jform_vvvvvysvyp_required = false;
+			jform_vvvvvyuvyr_required = false;
 		}

 	}
@ -385,40 +385,40 @@ function vvvvvys(add_custom_button_vvvvvys)
 	{
 		jQuery('#jform_custom_button-lbl').closest('.control-group').hide();
 		jQuery('#jform_php_controller').closest('.control-group').hide();
-		if (!jform_vvvvvysvyo_required)
+		if (!jform_vvvvvyuvyq_required)
 		{
 			updateFieldRequired('php_controller',1);
 			jQuery('#jform_php_controller').removeAttr('required');
 			jQuery('#jform_php_controller').removeAttr('aria-required');
 			jQuery('#jform_php_controller').removeClass('required');
-			jform_vvvvvysvyo_required = true;
+			jform_vvvvvyuvyq_required = true;
 		}
 		jQuery('#jform_php_model').closest('.control-group').hide();
-		if (!jform_vvvvvysvyp_required)
+		if (!jform_vvvvvyuvyr_required)
 		{
 			updateFieldRequired('php_model',1);
 			jQuery('#jform_php_model').removeAttr('required');
 			jQuery('#jform_php_model').removeAttr('aria-required');
 			jQuery('#jform_php_model').removeClass('required');
-			jform_vvvvvysvyp_required = true;
+			jform_vvvvvyuvyr_required = true;
 		}
 	}
 }

-// the vvvvvyt function
-function vvvvvyt(button_position_vvvvvyt)
+// the vvvvvyv function
+function vvvvvyv(button_position_vvvvvyv)
 {
-	if (isSet(button_position_vvvvvyt) && button_position_vvvvvyt.constructor !== Array)
+	if (isSet(button_position_vvvvvyv) && button_position_vvvvvyv.constructor !== Array)
 	{
-		var temp_vvvvvyt = button_position_vvvvvyt;
-		var button_position_vvvvvyt = [];
-		button_position_vvvvvyt.push(temp_vvvvvyt);
+		var temp_vvvvvyv = button_position_vvvvvyv;
+		var button_position_vvvvvyv = [];
+		button_position_vvvvvyv.push(temp_vvvvvyv);
 	}
-	else if (!isSet(button_position_vvvvvyt))
+	else if (!isSet(button_position_vvvvvyv))
 	{
-		var button_position_vvvvvyt = [];
+		var button_position_vvvvvyv = [];
 	}
-	var button_position = button_position_vvvvvyt.some(button_position_vvvvvyt_SomeFunc);
+	var button_position = button_position_vvvvvyv.some(button_position_vvvvvyv_SomeFunc);


 	// set this function logic
@ -432,11 +432,11 @@ function vvvvvyt(button_position_vvvvvyt)
 	}
 }

-// the vvvvvyt Some function
-function button_position_vvvvvyt_SomeFunc(button_position_vvvvvyt)
+// the vvvvvyv Some function
+function button_position_vvvvvyv_SomeFunc(button_position_vvvvvyv)
 {
 	// set the function logic
-	if (button_position_vvvvvyt == 5)
+	if (button_position_vvvvvyv == 5)
 	{
 		return true;
 	}
@ -479,6 +479,33 @@ function isSet(val)
 	return false;
 }

+jQuery(document).ready(function()
+{
+	// get the linked details
+	getLinked();
+});
+			
+function getLinked_server(type){
+	var getUrl = "index.php?option=com_componentbuilder&task=ajax.getLinked&format=json&vdm="+vastDevMod;
+	if(token.length > 0 && type > 0){
+		var request = 'token='+token+'&type='+type;
+	}
+	return jQuery.ajax({
+		type: 'GET',
+		url: getUrl,
+		dataType: 'jsonp',
+		data: request,
+		jsonp: 'callback'
+	});
+}
+
+function getLinked(){
+	getLinked_server(1).done(function(result) {
+		if(result){
+			jQuery('#display_linked_to').html(result);
+		}
+	});
+}			
 			
 function getSnippetDetails_server(snippetId){
 	var getUrl = "index.php?option=com_componentbuilder&task=ajax.snippetDetails&format=json";
--- a/admin/models/forms/site_view.xml
+++ b/admin/models/forms/site_view.xml
@ -138,27 +138,6 @@
                       multiple="false"
                       required="false"
                       button="true" />
-                <!-- Css Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_HINT"
-                       required="true" />
-                <!-- Libraries Field. Type: Libraries. (custom)-->
-                <field type="libraries"
-                       name="libraries"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
-                       class="list_class"
-                       multiple="true"
-                       default="0"
-                       required="false"
-                       button="true" />
                <!-- Note_add_language_string Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_add_language_string"
@ -166,175 +145,6 @@
                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_ADD_LANGUAGE_STRING_DESCRIPTION"
                       heading="h4"
                       class="note_add_language_string" />
-                <!-- Js_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="js_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Add_php_document Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_DOCUMENT_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_uikit_snippet"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
-                       heading="h4"
-                       class="snippet-code note_uikit_snippet" />
-                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_libraries_selection"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
-                       heading="h4"
-                       class="alert alert-info note_libraries_selection" />
-                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="note_snippet_usage"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
-                       heading="h4"
-                       class="snippet-usage note_snippet_usage" />
-                <!-- Css_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="css_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_HINT"
-                       required="true" />
-                <!-- Default Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="default"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
-                       rows="20"
-                       cols="15"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
-                       required="true" />
-                <!-- Php_ajaxmethod Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_ajaxmethod"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_HINT"
-                       required="true" />
-                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Add_php_view Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_view"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Javascript_file Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="javascript_file"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT"
-                       required="true" />
-                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_php_jview"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Php_model Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_model"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
-                       rows="30"
-                       cols="15"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
-                       required="false" />
-                <!-- Not_required Field. Type: Hidden. (joomla)-->
-                <field type="hidden"
-                       name="not_required"
-                       default="[]" />
-                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_javascript_file"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Custom_get Field. Type: Customgets. (custom)-->
-                <field type="customgets"
-                       name="custom_get"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION"
-                       multiple="true" />
-                <!-- Add_js_document Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_js_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
-                       class="btn-group btn-group-yesno"
-                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Main_get Field. Type: Maingets. (custom)-->
-                <field type="maingets"
-                       name="main_get"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_DESCRIPTION"
-                       multiple="false"
-                       required="true"
-                       button="true" />
                <!-- Add_css_document Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_css_document"
@ -346,31 +156,16 @@
                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                </field>
-                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
-                <field type="dynamicgets"
-                       name="dynamic_get"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
-                       multiple="false"
-                       required="false" />
-                <!-- Add_css Field. Type: Radio. (joomla)-->
-                <field type="radio"
-                       name="add_css"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
-                       class="btn-group btn-group-yesno"
+                <!-- Libraries Field. Type: Libraries. (custom)-->
+                <field type="libraries"
+                       name="libraries"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_LIBRARIES_DESCRIPTION"
+                       class="list_class"
+                       multiple="true"
                       default="0"
-                       required="true">
-                        <!-- Option Set.-->
-                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
-                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
-                </field>
-                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
-                <field type="note"
-                       name="dynamic_values"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_LABEL"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION"
-                       heading="h4"
-                       class="dynamic_values" />
+                       required="false"
+                       button="true" />
                <!-- Add_php_ajax Field. Type: Radio. (joomla)-->
                <field type="radio"
                       name="add_php_ajax"
@ -382,10 +177,45 @@
                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                </field>
-                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
+                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview_display"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
+                       required="true" />
+                <!-- Php_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Note_libraries_selection Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_libraries_selection"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LIBRARIES_SELECTION_DESCRIPTION"
+                       heading="h4"
+                       class="alert alert-info note_libraries_selection" />
+                <!-- Note_uikit_snippet Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_uikit_snippet"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_UIKIT_SNIPPET_LABEL"
+                       heading="h4"
+                       class="snippet-code note_uikit_snippet" />
+                <!-- Add_css Field. Type: Radio. (joomla)-->
                <field type="radio"
-                       name="add_custom_button"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+                       name="add_css"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CSS_LABEL"
                       class="btn-group btn-group-yesno"
                       default="0"
                       required="true">
@ -393,6 +223,12 @@
                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
                </field>
+                <!-- Note_snippet_usage Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_snippet_usage"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_SNIPPET_USAGE_LABEL"
+                       heading="h4"
+                       class="snippet-usage note_snippet_usage" />
                <!-- Ajax_input Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="ajax_input"
@ -500,6 +336,181 @@
                                       class="inputbox" />
                        </form>
                </field>
+                <!-- Default Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="default"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_LABEL"
+                       rows="20"
+                       cols="15"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_DEFAULT_HINT"
+                       required="true" />
+                <!-- Php_view Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_view"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_HINT"
+                       required="true" />
+                <!-- Add_javascript_file Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_javascript_file"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JAVASCRIPT_FILE_DESCRIPTION"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Php_jview Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_jview"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_HINT"
+                       required="true" />
+                <!-- Add_js_document Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_js_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_JS_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Php_model Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_model"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_MODEL_HINT"
+                       required="false" />
+                <!-- Not_required Field. Type: Hidden. (joomla)-->
+                <field type="hidden"
+                       name="not_required"
+                       default="[]" />
+                <!-- Javascript_file Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="javascript_file"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JAVASCRIPT_FILE_HINT"
+                       required="true" />
+                <!-- Custom_get Field. Type: Customgets. (custom)-->
+                <field type="customgets"
+                       name="custom_get"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM_GET_DESCRIPTION"
+                       multiple="true" />
+                <!-- Js_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="js_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_JS_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Main_get Field. Type: Maingets. (custom)-->
+                <field type="maingets"
+                       name="main_get"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_MAIN_GET_DESCRIPTION"
+                       multiple="false"
+                       required="true"
+                       button="true" />
+                <!-- Css_document Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_LABEL"
+                       rows="17"
+                       cols="5"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DOCUMENT_HINT"
+                       required="true" />
+                <!-- Dynamic_get Field. Type: Dynamicgets. (custom)-->
+                <field type="dynamicgets"
+                       name="dynamic_get"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_GET_DESCRIPTION"
+                       multiple="false"
+                       required="false" />
+                <!-- Css Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="css"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_CSS_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_CSS_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_CSS_HINT"
+                       required="true" />
+                <!-- Dynamic_values Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="dynamic_values"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_DYNAMIC_VALUES_DESCRIPTION"
+                       heading="h4"
+                       class="dynamic_values" />
+                <!-- Php_ajaxmethod Field. Type: Textarea. (joomla)-->
+                <field type="textarea"
+                       name="php_ajaxmethod"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_LABEL"
+                       rows="30"
+                       cols="15"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_DESCRIPTION"
+                       class="text_area span12"
+                       filter="raw"
+                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_AJAXMETHOD_HINT"
+                       required="true" />
+                <!-- Add_custom_button Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_custom_button"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_CUSTOM_BUTTON_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
+                <!-- Add_php_document Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_document"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_DOCUMENT_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                <!-- Button_position Field. Type: List. (joomla)-->
                <field type="list"
                       name="button_position"
@ -518,17 +529,17 @@
                        <option value="4">COM_COMPONENTBUILDER_SITE_VIEW_BOTTOM_LEFT</option>
                        <option value="5">COM_COMPONENTBUILDER_SITE_VIEW_CUSTOM</option>
                </field>
-                <!-- Php_document Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_document"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_DOCUMENT_HINT"
-                       required="true" />
+                <!-- Add_php_view Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_view"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_VIEW_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                <!-- Note_custom_toolbar_placeholder Field. Type: Note. A None Database Field. (joomla)-->
                <field type="note"
                       name="note_custom_toolbar_placeholder"
@ -536,17 +547,17 @@
                       heading="h4"
                       class="note_custom_toolbar_placeholder"
                       showon="button_position:5" />
-                <!-- Php_view Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_view"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_VIEW_HINT"
-                       required="true" />
+                <!-- Add_php_jview_display Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_jview_display"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_DISPLAY_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                <!-- Custom_button Field. Type: Subform. (joomla)-->
                <field type="subform"
                       name="custom_button"
@ -834,17 +845,17 @@
                                </field>
                        </form>
                </field>
-                <!-- Php_jview_display Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview_display"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DISPLAY_HINT"
-                       required="true" />
+                <!-- Add_php_jview Field. Type: Radio. (joomla)-->
+                <field type="radio"
+                       name="add_php_jview"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_ADD_PHP_JVIEW_LABEL"
+                       class="btn-group btn-group-yesno"
+                       default="0"
+                       required="true">
+                        <!-- Option Set.-->
+                        <option value="1">COM_COMPONENTBUILDER_SITE_VIEW_YES</option>
+                        <option value="0">COM_COMPONENTBUILDER_SITE_VIEW_NO</option>
+                </field>
                <!-- Php_controller Field. Type: Textarea. (joomla)-->
                <field type="textarea"
                       name="php_controller"
@ -856,17 +867,13 @@
                       filter="raw"
                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_CONTROLLER_HINT"
                       required="false" />
-                <!-- Php_jview Field. Type: Textarea. (joomla)-->
-                <field type="textarea"
-                       name="php_jview"
-                       label="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_LABEL"
-                       rows="17"
-                       cols="5"
-                       description="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_DESCRIPTION"
-                       class="text_area span12"
-                       filter="raw"
-                       hint="COM_COMPONENTBUILDER_SITE_VIEW_PHP_JVIEW_HINT"
-                       required="true" />
+                <!-- Note_linked_to_notice Field. Type: Note. A None Database Field. (joomla)-->
+                <field type="note"
+                       name="note_linked_to_notice"
+                       label="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_LABEL"
+                       description="COM_COMPONENTBUILDER_SITE_VIEW_NOTE_LINKED_TO_NOTICE_DESCRIPTION"
+                       heading="h4"
+                       class="note_linked_to_notice" />
        </fieldset>
 	
 	<!-- Access Control Fields. -->
--- a/admin/models/forms/template.js
+++ b/admin/models/forms/template.js
@ -23,42 +23,42 @@
 /-----------------------------------------------------------------------------------------------------------------------------*/

 // Some Global Values
-jform_vvvvvyuvyq_required = false;
+jform_vvvvvywvys_required = false;

 // Initial Script
 jQuery(document).ready(function()
 {
-	var add_php_view_vvvvvyu = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvyu(add_php_view_vvvvvyu);
+	var add_php_view_vvvvvyw = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyw(add_php_view_vvvvvyw);
 });

-// the vvvvvyu function
-function vvvvvyu(add_php_view_vvvvvyu)
+// the vvvvvyw function
+function vvvvvyw(add_php_view_vvvvvyw)
 {
 	// set the function logic
-	if (add_php_view_vvvvvyu == 1)
+	if (add_php_view_vvvvvyw == 1)
 	{
 		jQuery('#jform_php_view').closest('.control-group').show();
-		if (jform_vvvvvyuvyq_required)
+		if (jform_vvvvvywvys_required)
 		{
 			updateFieldRequired('php_view',0);
 			jQuery('#jform_php_view').prop('required','required');
 			jQuery('#jform_php_view').attr('aria-required',true);
 			jQuery('#jform_php_view').addClass('required');
-			jform_vvvvvyuvyq_required = false;
+			jform_vvvvvywvys_required = false;
 		}

 	}
 	else
 	{
 		jQuery('#jform_php_view').closest('.control-group').hide();
-		if (!jform_vvvvvyuvyq_required)
+		if (!jform_vvvvvywvys_required)
 		{
 			updateFieldRequired('php_view',1);
 			jQuery('#jform_php_view').removeAttr('required');
 			jQuery('#jform_php_view').removeAttr('aria-required');
 			jQuery('#jform_php_view').removeClass('required');
-			jform_vvvvvyuvyq_required = true;
+			jform_vvvvvywvys_required = true;
 		}
 	}
 }
--- a/admin/models/ftp.php
+++ b/admin/models/ftp.php
@ -122,7 +122,7 @@ class ComponentbuilderModelFtp extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVzzlinked_components()
+	public function getWablinked_components()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@ -108,28 +108,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->addcontributors = $addcontributors->toArray();
 			}

-			if (!empty($item->php_postflight_update))
+			if (!empty($item->readme))
 			{
-				// base64 Decode php_postflight_update.
-				$item->php_postflight_update = base64_decode($item->php_postflight_update);
-			}
-
-			if (!empty($item->php_preflight_update))
-			{
-				// base64 Decode php_preflight_update.
-				$item->php_preflight_update = base64_decode($item->php_preflight_update);
-			}
-
-			if (!empty($item->sql))
-			{
-				// base64 Decode sql.
-				$item->sql = base64_decode($item->sql);
-			}
-
-			if (!empty($item->php_preflight_install))
-			{
-				// base64 Decode php_preflight_install.
-				$item->php_preflight_install = base64_decode($item->php_preflight_install);
+				// base64 Decode readme.
+				$item->readme = base64_decode($item->readme);
 			}

 			if (!empty($item->php_postflight_install))
@ -138,16 +120,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->php_postflight_install = base64_decode($item->php_postflight_install);
 			}

+			if (!empty($item->php_preflight_install))
+			{
+				// base64 Decode php_preflight_install.
+				$item->php_preflight_install = base64_decode($item->php_preflight_install);
+			}
+
 			if (!empty($item->php_method_uninstall))
 			{
 				// base64 Decode php_method_uninstall.
 				$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 			}

-			if (!empty($item->readme))
+			if (!empty($item->php_preflight_update))
 			{
-				// base64 Decode readme.
-				$item->readme = base64_decode($item->readme);
+				// base64 Decode php_preflight_update.
+				$item->php_preflight_update = base64_decode($item->php_preflight_update);
+			}
+
+			if (!empty($item->php_postflight_update))
+			{
+				// base64 Decode php_postflight_update.
+				$item->php_postflight_update = base64_decode($item->php_postflight_update);
+			}
+
+			if (!empty($item->sql))
+			{
+				// base64 Decode sql.
+				$item->sql = base64_decode($item->sql);
 			}

 			if (!empty($item->php_helper_both))
@ -186,10 +186,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 				$item->javascript = base64_decode($item->javascript);
 			}

-			if (!empty($item->css))
+			if (!empty($item->css_admin))
 			{
-				// base64 Decode css.
-				$item->css = base64_decode($item->css);
+				// base64 Decode css_admin.
+				$item->css_admin = base64_decode($item->css_admin);
+			}
+
+			if (!empty($item->css_site))
+			{
+				// base64 Decode css_site.
+				$item->css_site = base64_decode($item->css_site);
 			}

 			if (!empty($item->buildcompsql))
@ -283,7 +289,7 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 	*
 	* @return mixed  An array of data items on success, false on failure.
 	*/
-	public function getVwmtranslation()
+	public function getVwntranslation()
 	{
 		// Get the user object.
 		$user = JFactory::getUser();
@ -1196,28 +1202,10 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['addcontributors'] = '';
 		}

-		// Set the php_postflight_update string to base64 string.
-		if (isset($data['php_postflight_update']))
+		// Set the readme string to base64 string.
+		if (isset($data['readme']))
 		{
-			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
-		}
-
-		// Set the php_preflight_update string to base64 string.
-		if (isset($data['php_preflight_update']))
-		{
-			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
-		}
-
-		// Set the sql string to base64 string.
-		if (isset($data['sql']))
-		{
-			$data['sql'] = base64_encode($data['sql']);
-		}
-
-		// Set the php_preflight_install string to base64 string.
-		if (isset($data['php_preflight_install']))
-		{
-			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+			$data['readme'] = base64_encode($data['readme']);
 		}

 		// Set the php_postflight_install string to base64 string.
@ -1226,16 +1214,34 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['php_postflight_install'] = base64_encode($data['php_postflight_install']);
 		}

+		// Set the php_preflight_install string to base64 string.
+		if (isset($data['php_preflight_install']))
+		{
+			$data['php_preflight_install'] = base64_encode($data['php_preflight_install']);
+		}
+
 		// Set the php_method_uninstall string to base64 string.
 		if (isset($data['php_method_uninstall']))
 		{
 			$data['php_method_uninstall'] = base64_encode($data['php_method_uninstall']);
 		}

-		// Set the readme string to base64 string.
-		if (isset($data['readme']))
+		// Set the php_preflight_update string to base64 string.
+		if (isset($data['php_preflight_update']))
 		{
-			$data['readme'] = base64_encode($data['readme']);
+			$data['php_preflight_update'] = base64_encode($data['php_preflight_update']);
+		}
+
+		// Set the php_postflight_update string to base64 string.
+		if (isset($data['php_postflight_update']))
+		{
+			$data['php_postflight_update'] = base64_encode($data['php_postflight_update']);
+		}
+
+		// Set the sql string to base64 string.
+		if (isset($data['sql']))
+		{
+			$data['sql'] = base64_encode($data['sql']);
 		}

 		// Set the php_helper_both string to base64 string.
@ -1274,10 +1280,16 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 			$data['javascript'] = base64_encode($data['javascript']);
 		}

-		// Set the css string to base64 string.
-		if (isset($data['css']))
+		// Set the css_admin string to base64 string.
+		if (isset($data['css_admin']))
 		{
-			$data['css'] = base64_encode($data['css']);
+			$data['css_admin'] = base64_encode($data['css_admin']);
+		}
+
+		// Set the css_site string to base64 string.
+		if (isset($data['css_site']))
+		{
+			$data['css_site'] = base64_encode($data['css_site']);
 		}

 		// Set the buildcompsql string to base64 string.
--- a/admin/models/joomla_components.php
+++ b/admin/models/joomla_components.php
@ -1526,25 +1526,25 @@ class ComponentbuilderModelJoomla_components extends JModelList
 							continue;
 						}

-						// decode php_postflight_update
-						$item->php_postflight_update = base64_decode($item->php_postflight_update);
-						// decode php_preflight_update
-						$item->php_preflight_update = base64_decode($item->php_preflight_update);
-						// decode sql
-						$item->sql = base64_decode($item->sql);
+						// decode readme
+						$item->readme = base64_decode($item->readme);
+						// decode php_postflight_install
+						$item->php_postflight_install = base64_decode($item->php_postflight_install);
 						// decode php_preflight_install
 						$item->php_preflight_install = base64_decode($item->php_preflight_install);
+						// decode php_method_uninstall
+						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
 						if ($basickey && !is_numeric($item->whmcs_key) && $item->whmcs_key === base64_encode(base64_decode($item->whmcs_key, true)))
 						{
 							// decrypt whmcs_key
 							$item->whmcs_key = $basic->decryptString($item->whmcs_key);
 						}
-						// decode php_postflight_install
-						$item->php_postflight_install = base64_decode($item->php_postflight_install);
-						// decode php_method_uninstall
-						$item->php_method_uninstall = base64_decode($item->php_method_uninstall);
-						// decode readme
-						$item->readme = base64_decode($item->readme);
+						// decode php_preflight_update
+						$item->php_preflight_update = base64_decode($item->php_preflight_update);
+						// decode php_postflight_update
+						$item->php_postflight_update = base64_decode($item->php_postflight_update);
+						// decode sql
+						$item->sql = base64_decode($item->sql);
 						// decode php_helper_both
 						$item->php_helper_both = base64_decode($item->php_helper_both);
 						// decode php_helper_admin
@ -1557,8 +1557,10 @@ class ComponentbuilderModelJoomla_components extends JModelList
 						$item->php_site_event = base64_decode($item->php_site_event);
 						// decode javascript
 						$item->javascript = base64_decode($item->javascript);
-						// decode css
-						$item->css = base64_decode($item->css);
+						// decode css_admin
+						$item->css_admin = base64_decode($item->css_admin);
+						// decode css_site
+						$item->css_site = base64_decode($item->css_site);
 						if ($basickey && !is_numeric($item->export_key) && $item->export_key === base64_encode(base64_decode($item->export_key, true)))
 						{
 							// decrypt export_key
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@ -66,6 +66,11 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}

+	public function getVDM()
+	{
+		return $this->vastDevMod;
+	}
+    
 	/**
 	 * Method to get a single record.
 	 *
@ -103,14 +108,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->libraries = $libraries->toArray();
 			}

-			if (!empty($item->custom_get))
-			{
-				// Convert the custom_get field to an array.
-				$custom_get = new Registry;
-				$custom_get->loadString($item->custom_get);
-				$item->custom_get = $custom_get->toArray();
-			}
-
 			if (!empty($item->ajax_input))
 			{
 				// Convert the ajax_input field to an array.
@ -119,6 +116,14 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->ajax_input = $ajax_input->toArray();
 			}

+			if (!empty($item->custom_get))
+			{
+				// Convert the custom_get field to an array.
+				$custom_get = new Registry;
+				$custom_get->loadString($item->custom_get);
+				$item->custom_get = $custom_get->toArray();
+			}
+
 			if (!empty($item->custom_button))
 			{
 				// Convert the custom_button field to an array.
@ -127,10 +132,46 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->custom_button = $custom_button->toArray();
 			}

-			if (!empty($item->css))
+			if (!empty($item->php_jview_display))
 			{
-				// base64 Decode css.
-				$item->css = base64_decode($item->css);
+				// base64 Decode php_jview_display.
+				$item->php_jview_display = base64_decode($item->php_jview_display);
+			}
+
+			if (!empty($item->php_document))
+			{
+				// base64 Decode php_document.
+				$item->php_document = base64_decode($item->php_document);
+			}
+
+			if (!empty($item->default))
+			{
+				// base64 Decode default.
+				$item->default = base64_decode($item->default);
+			}
+
+			if (!empty($item->php_view))
+			{
+				// base64 Decode php_view.
+				$item->php_view = base64_decode($item->php_view);
+			}
+
+			if (!empty($item->php_jview))
+			{
+				// base64 Decode php_jview.
+				$item->php_jview = base64_decode($item->php_jview);
+			}
+
+			if (!empty($item->php_model))
+			{
+				// base64 Decode php_model.
+				$item->php_model = base64_decode($item->php_model);
+			}
+
+			if (!empty($item->javascript_file))
+			{
+				// base64 Decode javascript_file.
+				$item->javascript_file = base64_decode($item->javascript_file);
 			}

 			if (!empty($item->js_document))
@ -145,10 +186,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->css_document = base64_decode($item->css_document);
 			}

-			if (!empty($item->default))
+			if (!empty($item->css))
 			{
-				// base64 Decode default.
-				$item->default = base64_decode($item->default);
+				// base64 Decode css.
+				$item->css = base64_decode($item->css);
 			}

 			if (!empty($item->php_ajaxmethod))
@ -157,46 +198,31 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 				$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
 			}

-			if (!empty($item->javascript_file))
-			{
-				// base64 Decode javascript_file.
-				$item->javascript_file = base64_decode($item->javascript_file);
-			}
-
-			if (!empty($item->php_model))
-			{
-				// base64 Decode php_model.
-				$item->php_model = base64_decode($item->php_model);
-			}
-
-			if (!empty($item->php_document))
-			{
-				// base64 Decode php_document.
-				$item->php_document = base64_decode($item->php_document);
-			}
-
-			if (!empty($item->php_view))
-			{
-				// base64 Decode php_view.
-				$item->php_view = base64_decode($item->php_view);
-			}
-
-			if (!empty($item->php_jview_display))
-			{
-				// base64 Decode php_jview_display.
-				$item->php_jview_display = base64_decode($item->php_jview_display);
-			}
-
 			if (!empty($item->php_controller))
 			{
 				// base64 Decode php_controller.
 				$item->php_controller = base64_decode($item->php_controller);
 			}

-			if (!empty($item->php_jview))
+			
+			if (empty($item->id))
 			{
-				// base64 Decode php_jview.
-				$item->php_jview = base64_decode($item->php_jview);
+				$id = 0;
+			}
+			else
+			{
+				$id = $item->id;
+			}			
+			// set the id and view name to session
+			if ($vdm = ComponentbuilderHelper::get('site_view__'.$id))
+			{
+				$this->vastDevMod = $vdm;
+			}
+			else
+			{
+				$this->vastDevMod = ComponentbuilderHelper::randomkey(50);
+				ComponentbuilderHelper::set($this->vastDevMod, 'site_view__'.$id);
+				ComponentbuilderHelper::set('site_view__'.$id, $this->vastDevMod);
 			}			

 			// update the fields
@ -977,19 +1003,6 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['libraries'] = '';
 		}

-		// Set the custom_get items to data.
-		if (isset($data['custom_get']) && is_array($data['custom_get']))
-		{
-			$custom_get = new JRegistry;
-			$custom_get->loadArray($data['custom_get']);
-			$data['custom_get'] = (string) $custom_get;
-		}
-		elseif (!isset($data['custom_get']))
-		{
-			// Set the empty custom_get to data
-			$data['custom_get'] = '';
-		}
-
 		// Set the ajax_input items to data.
 		if (isset($data['ajax_input']) && is_array($data['ajax_input']))
 		{
@ -1003,6 +1016,19 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['ajax_input'] = '';
 		}

+		// Set the custom_get items to data.
+		if (isset($data['custom_get']) && is_array($data['custom_get']))
+		{
+			$custom_get = new JRegistry;
+			$custom_get->loadArray($data['custom_get']);
+			$data['custom_get'] = (string) $custom_get;
+		}
+		elseif (!isset($data['custom_get']))
+		{
+			// Set the empty custom_get to data
+			$data['custom_get'] = '';
+		}
+
 		// Set the custom_button items to data.
 		if (isset($data['custom_button']) && is_array($data['custom_button']))
 		{
@ -1016,10 +1042,46 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['custom_button'] = '';
 		}

-		// Set the css string to base64 string.
-		if (isset($data['css']))
+		// Set the php_jview_display string to base64 string.
+		if (isset($data['php_jview_display']))
 		{
-			$data['css'] = base64_encode($data['css']);
+			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
+		}
+
+		// Set the php_document string to base64 string.
+		if (isset($data['php_document']))
+		{
+			$data['php_document'] = base64_encode($data['php_document']);
+		}
+
+		// Set the default string to base64 string.
+		if (isset($data['default']))
+		{
+			$data['default'] = base64_encode($data['default']);
+		}
+
+		// Set the php_view string to base64 string.
+		if (isset($data['php_view']))
+		{
+			$data['php_view'] = base64_encode($data['php_view']);
+		}
+
+		// Set the php_jview string to base64 string.
+		if (isset($data['php_jview']))
+		{
+			$data['php_jview'] = base64_encode($data['php_jview']);
+		}
+
+		// Set the php_model string to base64 string.
+		if (isset($data['php_model']))
+		{
+			$data['php_model'] = base64_encode($data['php_model']);
+		}
+
+		// Set the javascript_file string to base64 string.
+		if (isset($data['javascript_file']))
+		{
+			$data['javascript_file'] = base64_encode($data['javascript_file']);
 		}

 		// Set the js_document string to base64 string.
@ -1034,10 +1096,10 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['css_document'] = base64_encode($data['css_document']);
 		}

-		// Set the default string to base64 string.
-		if (isset($data['default']))
+		// Set the css string to base64 string.
+		if (isset($data['css']))
 		{
-			$data['default'] = base64_encode($data['default']);
+			$data['css'] = base64_encode($data['css']);
 		}

 		// Set the php_ajaxmethod string to base64 string.
@ -1046,48 +1108,12 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 			$data['php_ajaxmethod'] = base64_encode($data['php_ajaxmethod']);
 		}

-		// Set the javascript_file string to base64 string.
-		if (isset($data['javascript_file']))
-		{
-			$data['javascript_file'] = base64_encode($data['javascript_file']);
-		}
-
-		// Set the php_model string to base64 string.
-		if (isset($data['php_model']))
-		{
-			$data['php_model'] = base64_encode($data['php_model']);
-		}
-
-		// Set the php_document string to base64 string.
-		if (isset($data['php_document']))
-		{
-			$data['php_document'] = base64_encode($data['php_document']);
-		}
-
-		// Set the php_view string to base64 string.
-		if (isset($data['php_view']))
-		{
-			$data['php_view'] = base64_encode($data['php_view']);
-		}
-
-		// Set the php_jview_display string to base64 string.
-		if (isset($data['php_jview_display']))
-		{
-			$data['php_jview_display'] = base64_encode($data['php_jview_display']);
-		}
-
 		// Set the php_controller string to base64 string.
 		if (isset($data['php_controller']))
 		{
 			$data['php_controller'] = base64_encode($data['php_controller']);
 		}
        
-		// Set the php_jview string to base64 string.
-		if (isset($data['php_jview']))
-		{
-			$data['php_jview'] = base64_encode($data['php_jview']);
-		}
-        
 		// Set the Params Items to data
 		if (isset($data['params']) && is_array($data['params']))
 		{
--- a/admin/models/site_views.php
+++ b/admin/models/site_views.php
@ -266,30 +266,30 @@ class ComponentbuilderModelSite_views extends JModelList
 							continue;
 						}

-						// decode css
-						$item->css = base64_decode($item->css);
+						// decode php_jview_display
+						$item->php_jview_display = base64_decode($item->php_jview_display);
+						// decode php_document
+						$item->php_document = base64_decode($item->php_document);
+						// decode default
+						$item->default = base64_decode($item->default);
+						// decode php_view
+						$item->php_view = base64_decode($item->php_view);
+						// decode php_jview
+						$item->php_jview = base64_decode($item->php_jview);
+						// decode php_model
+						$item->php_model = base64_decode($item->php_model);
+						// decode javascript_file
+						$item->javascript_file = base64_decode($item->javascript_file);
 						// decode js_document
 						$item->js_document = base64_decode($item->js_document);
 						// decode css_document
 						$item->css_document = base64_decode($item->css_document);
-						// decode default
-						$item->default = base64_decode($item->default);
+						// decode css
+						$item->css = base64_decode($item->css);
 						// decode php_ajaxmethod
 						$item->php_ajaxmethod = base64_decode($item->php_ajaxmethod);
-						// decode javascript_file
-						$item->javascript_file = base64_decode($item->javascript_file);
-						// decode php_model
-						$item->php_model = base64_decode($item->php_model);
-						// decode php_document
-						$item->php_document = base64_decode($item->php_document);
-						// decode php_view
-						$item->php_view = base64_decode($item->php_view);
-						// decode php_jview_display
-						$item->php_jview_display = base64_decode($item->php_jview_display);
 						// decode php_controller
 						$item->php_controller = base64_decode($item->php_controller);
-						// decode php_jview
-						$item->php_jview = base64_decode($item->php_jview);
 						// unset the values we don't want exported.
 						unset($item->asset_id);
 						unset($item->checked_out);
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
--- a/admin/sql/updates/mysql/2.6.9.sql
+++ b/admin/sql/updates/mysql/2.6.9.sql
@ -0,0 +1,13 @@
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `add_php_ajax` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_js_document`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `ajax_input` TEXT NOT NULL AFTER `add_php_view`;
+
+ALTER TABLE `#__componentbuilder_custom_admin_view` ADD `php_ajaxmethod` MEDIUMTEXT NOT NULL AFTER `not_required`;
+
+ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `css` `css_admin` TEXT NOT NULL;
+
+ALTER TABLE `#__componentbuilder_joomla_component` CHANGE `add_css` `add_css_admin` TINYINT(1) NOT NULL DEFAULT 0 ;
+
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `add_css_site` TINYINT(1) NOT NULL DEFAULT 0 AFTER `add_css_admin`;
+
+ALTER TABLE `#__componentbuilder_joomla_component` ADD `css_site` TEXT NOT NULL AFTER `css_admin`;
--- a/admin/views/admin_fields/view.html.php
+++ b/admin/views/admin_fields/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewAdmin_fields extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/admin_fields_conditions/view.html.php
+++ b/admin/views/admin_fields_conditions/view.html.php
@ -194,11 +194,11 @@ class ComponentbuilderViewAdmin_fields_conditions extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_NEW' : 'COM_COMPONENTBUILDER_ADMIN_FIELDS_CONDITIONS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_fields_conditions.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields_conditions/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_fields_conditions/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/admin_view/tmpl/edit.php
+++ b/admin/views/admin_view/tmpl/edit.php
@ -72,6 +72,11 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 				<?php echo JLayoutHelper::render('admin_view.details_right', $this); ?>
 			</div>
 		</div>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<?php echo JLayoutHelper::render('admin_view.details_fullwidth', $this); ?>
+			</div>
+		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>

 	<?php echo JHtml::_('bootstrap.addTab', 'admin_viewTab', 'settings', JText::_('COM_COMPONENTBUILDER_ADMIN_VIEW_SETTINGS', true)); ?>
@ -214,431 +219,416 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_css_view listeners for add_css_view_vvvvvww function
+// #jform_add_css_view listeners for add_css_view_vvvvvwx function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvvww = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvww(add_css_view_vvvvvww);
+	var add_css_view_vvvvvwx = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvvwx(add_css_view_vvvvvwx);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvvww = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvvww(add_css_view_vvvvvww);
+	var add_css_view_vvvvvwx = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvvwx(add_css_view_vvvvvwx);

 });

-// #jform_add_css_views listeners for add_css_views_vvvvvwx function
+// #jform_add_css_views listeners for add_css_views_vvvvvwy function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvvwx = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvwx(add_css_views_vvvvvwx);
+	var add_css_views_vvvvvwy = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvvwy(add_css_views_vvvvvwy);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvvwx = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvvwx(add_css_views_vvvvvwx);
+	var add_css_views_vvvvvwy = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvvwy(add_css_views_vvvvvwy);

 });

-// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvwy function
+// #jform_add_javascript_view_file listeners for add_javascript_view_file_vvvvvwz function
 jQuery('#jform_add_javascript_view_file').on('keyup',function()
 {
-	var add_javascript_view_file_vvvvvwy = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvwy(add_javascript_view_file_vvvvvwy);
+	var add_javascript_view_file_vvvvvwz = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	vvvvvwz(add_javascript_view_file_vvvvvwz);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_file_vvvvvwy = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
-	vvvvvwy(add_javascript_view_file_vvvvvwy);
+	var add_javascript_view_file_vvvvvwz = jQuery("#jform_add_javascript_view_file input[type='radio']:checked").val();
+	vvvvvwz(add_javascript_view_file_vvvvvwz);

 });

-// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvwz function
+// #jform_add_javascript_views_file listeners for add_javascript_views_file_vvvvvxa function
 jQuery('#jform_add_javascript_views_file').on('keyup',function()
 {
-	var add_javascript_views_file_vvvvvwz = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvwz(add_javascript_views_file_vvvvvwz);
+	var add_javascript_views_file_vvvvvxa = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	vvvvvxa(add_javascript_views_file_vvvvvxa);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_file_vvvvvwz = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
-	vvvvvwz(add_javascript_views_file_vvvvvwz);
+	var add_javascript_views_file_vvvvvxa = jQuery("#jform_add_javascript_views_file input[type='radio']:checked").val();
+	vvvvvxa(add_javascript_views_file_vvvvvxa);

 });

-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvxa function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvvxb function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvvxa = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvxa(add_javascript_view_footer_vvvvvxa);
+	var add_javascript_view_footer_vvvvvxb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvvxb(add_javascript_view_footer_vvvvvxb);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvvxa = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvvxa(add_javascript_view_footer_vvvvvxa);
+	var add_javascript_view_footer_vvvvvxb = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvvxb(add_javascript_view_footer_vvvvvxb);

 });

-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvxb function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvvxc function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvvxb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvxb(add_javascript_views_footer_vvvvvxb);
+	var add_javascript_views_footer_vvvvvxc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvvxc(add_javascript_views_footer_vvvvvxc);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvvxb = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvvxb(add_javascript_views_footer_vvvvvxb);
+	var add_javascript_views_footer_vvvvvxc = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvvxc(add_javascript_views_footer_vvvvvxc);

 });

-// #jform_add_php_ajax listeners for add_php_ajax_vvvvvxc function
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvxd function
 jQuery('#jform_add_php_ajax').on('keyup',function()
 {
-	var add_php_ajax_vvvvvxc = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvxc(add_php_ajax_vvvvvxc);
+	var add_php_ajax_vvvvvxd = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvxd(add_php_ajax_vvvvvxd);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
 {
 	e.preventDefault();
-	var add_php_ajax_vvvvvxc = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
-	vvvvvxc(add_php_ajax_vvvvvxc);
+	var add_php_ajax_vvvvvxd = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvxd(add_php_ajax_vvvvvxd);

 });

-// #jform_add_php_getitem listeners for add_php_getitem_vvvvvxd function
+// #jform_add_php_getitem listeners for add_php_getitem_vvvvvxe function
 jQuery('#jform_add_php_getitem').on('keyup',function()
 {
-	var add_php_getitem_vvvvvxd = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvxd(add_php_getitem_vvvvvxd);
+	var add_php_getitem_vvvvvxe = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	vvvvvxe(add_php_getitem_vvvvvxe);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_getitem_vvvvvxd = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
-	vvvvvxd(add_php_getitem_vvvvvxd);
+	var add_php_getitem_vvvvvxe = jQuery("#jform_add_php_getitem input[type='radio']:checked").val();
+	vvvvvxe(add_php_getitem_vvvvvxe);

 });

-// #jform_add_php_getitems listeners for add_php_getitems_vvvvvxe function
+// #jform_add_php_getitems listeners for add_php_getitems_vvvvvxf function
 jQuery('#jform_add_php_getitems').on('keyup',function()
 {
-	var add_php_getitems_vvvvvxe = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvxe(add_php_getitems_vvvvvxe);
+	var add_php_getitems_vvvvvxf = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	vvvvvxf(add_php_getitems_vvvvvxf);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_vvvvvxe = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
-	vvvvvxe(add_php_getitems_vvvvvxe);
+	var add_php_getitems_vvvvvxf = jQuery("#jform_add_php_getitems input[type='radio']:checked").val();
+	vvvvvxf(add_php_getitems_vvvvvxf);

 });

-// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvxf function
+// #jform_add_php_getitems_after_all listeners for add_php_getitems_after_all_vvvvvxg function
 jQuery('#jform_add_php_getitems_after_all').on('keyup',function()
 {
-	var add_php_getitems_after_all_vvvvvxf = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvxf(add_php_getitems_after_all_vvvvvxf);
+	var add_php_getitems_after_all_vvvvvxg = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	vvvvvxg(add_php_getitems_after_all_vvvvvxg);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getitems_after_all',function (e)
 {
 	e.preventDefault();
-	var add_php_getitems_after_all_vvvvvxf = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
-	vvvvvxf(add_php_getitems_after_all_vvvvvxf);
+	var add_php_getitems_after_all_vvvvvxg = jQuery("#jform_add_php_getitems_after_all input[type='radio']:checked").val();
+	vvvvvxg(add_php_getitems_after_all_vvvvvxg);

 });

-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvxg function
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvxh function
 jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_getlistquery_vvvvvxg = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvxg(add_php_getlistquery_vvvvvxg);
+	var add_php_getlistquery_vvvvvxh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	vvvvvxh(add_php_getlistquery_vvvvvxh);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_getlistquery_vvvvvxg = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	vvvvvxg(add_php_getlistquery_vvvvvxg);
+	var add_php_getlistquery_vvvvvxh = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
+	vvvvvxh(add_php_getlistquery_vvvvvxh);

 });

-// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxh function
+// #jform_add_php_before_save listeners for add_php_before_save_vvvvvxi function
 jQuery('#jform_add_php_before_save').on('keyup',function()
 {
-	var add_php_before_save_vvvvvxh = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxh(add_php_before_save_vvvvvxh);
+	var add_php_before_save_vvvvvxi = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	vvvvvxi(add_php_before_save_vvvvvxi);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_save',function (e)
 {
 	e.preventDefault();
-	var add_php_before_save_vvvvvxh = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
-	vvvvvxh(add_php_before_save_vvvvvxh);
+	var add_php_before_save_vvvvvxi = jQuery("#jform_add_php_before_save input[type='radio']:checked").val();
+	vvvvvxi(add_php_before_save_vvvvvxi);

 });

-// #jform_add_php_save listeners for add_php_save_vvvvvxi function
+// #jform_add_php_save listeners for add_php_save_vvvvvxj function
 jQuery('#jform_add_php_save').on('keyup',function()
 {
-	var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxi(add_php_save_vvvvvxi);
+	var add_php_save_vvvvvxj = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	vvvvvxj(add_php_save_vvvvvxj);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_save',function (e)
 {
 	e.preventDefault();
-	var add_php_save_vvvvvxi = jQuery("#jform_add_php_save input[type='radio']:checked").val();
-	vvvvvxi(add_php_save_vvvvvxi);
+	var add_php_save_vvvvvxj = jQuery("#jform_add_php_save input[type='radio']:checked").val();
+	vvvvvxj(add_php_save_vvvvvxj);

 });

-// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxj function
+// #jform_add_php_postsavehook listeners for add_php_postsavehook_vvvvvxk function
 jQuery('#jform_add_php_postsavehook').on('keyup',function()
 {
-	var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxj(add_php_postsavehook_vvvvvxj);
+	var add_php_postsavehook_vvvvvxk = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	vvvvvxk(add_php_postsavehook_vvvvvxk);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_postsavehook',function (e)
 {
 	e.preventDefault();
-	var add_php_postsavehook_vvvvvxj = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
-	vvvvvxj(add_php_postsavehook_vvvvvxj);
+	var add_php_postsavehook_vvvvvxk = jQuery("#jform_add_php_postsavehook input[type='radio']:checked").val();
+	vvvvvxk(add_php_postsavehook_vvvvvxk);

 });

-// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxk function
+// #jform_add_php_allowedit listeners for add_php_allowedit_vvvvvxl function
 jQuery('#jform_add_php_allowedit').on('keyup',function()
 {
-	var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxk(add_php_allowedit_vvvvvxk);
+	var add_php_allowedit_vvvvvxl = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxl(add_php_allowedit_vvvvvxl);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_allowedit',function (e)
 {
 	e.preventDefault();
-	var add_php_allowedit_vvvvvxk = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
-	vvvvvxk(add_php_allowedit_vvvvvxk);
+	var add_php_allowedit_vvvvvxl = jQuery("#jform_add_php_allowedit input[type='radio']:checked").val();
+	vvvvvxl(add_php_allowedit_vvvvvxl);

 });

-// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxl function
+// #jform_add_php_batchcopy listeners for add_php_batchcopy_vvvvvxm function
 jQuery('#jform_add_php_batchcopy').on('keyup',function()
 {
-	var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxl(add_php_batchcopy_vvvvvxl);
+	var add_php_batchcopy_vvvvvxm = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxm(add_php_batchcopy_vvvvvxm);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchcopy',function (e)
 {
 	e.preventDefault();
-	var add_php_batchcopy_vvvvvxl = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
-	vvvvvxl(add_php_batchcopy_vvvvvxl);
+	var add_php_batchcopy_vvvvvxm = jQuery("#jform_add_php_batchcopy input[type='radio']:checked").val();
+	vvvvvxm(add_php_batchcopy_vvvvvxm);

 });

-// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxm function
+// #jform_add_php_batchmove listeners for add_php_batchmove_vvvvvxn function
 jQuery('#jform_add_php_batchmove').on('keyup',function()
 {
-	var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxm(add_php_batchmove_vvvvvxm);
+	var add_php_batchmove_vvvvvxn = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxn(add_php_batchmove_vvvvvxn);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_batchmove',function (e)
 {
 	e.preventDefault();
-	var add_php_batchmove_vvvvvxm = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
-	vvvvvxm(add_php_batchmove_vvvvvxm);
+	var add_php_batchmove_vvvvvxn = jQuery("#jform_add_php_batchmove input[type='radio']:checked").val();
+	vvvvvxn(add_php_batchmove_vvvvvxn);

 });

-// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxn function
+// #jform_add_php_before_publish listeners for add_php_before_publish_vvvvvxo function
 jQuery('#jform_add_php_before_publish').on('keyup',function()
 {
-	var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxn(add_php_before_publish_vvvvvxn);
+	var add_php_before_publish_vvvvvxo = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxo(add_php_before_publish_vvvvvxo);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_before_publish_vvvvvxn = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
-	vvvvvxn(add_php_before_publish_vvvvvxn);
+	var add_php_before_publish_vvvvvxo = jQuery("#jform_add_php_before_publish input[type='radio']:checked").val();
+	vvvvvxo(add_php_before_publish_vvvvvxo);

 });

-// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxo function
+// #jform_add_php_after_publish listeners for add_php_after_publish_vvvvvxp function
 jQuery('#jform_add_php_after_publish').on('keyup',function()
 {
-	var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxo(add_php_after_publish_vvvvvxo);
+	var add_php_after_publish_vvvvvxp = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxp(add_php_after_publish_vvvvvxp);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_publish',function (e)
 {
 	e.preventDefault();
-	var add_php_after_publish_vvvvvxo = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
-	vvvvvxo(add_php_after_publish_vvvvvxo);
+	var add_php_after_publish_vvvvvxp = jQuery("#jform_add_php_after_publish input[type='radio']:checked").val();
+	vvvvvxp(add_php_after_publish_vvvvvxp);

 });

-// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxp function
+// #jform_add_php_before_delete listeners for add_php_before_delete_vvvvvxq function
 jQuery('#jform_add_php_before_delete').on('keyup',function()
 {
-	var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxp(add_php_before_delete_vvvvvxp);
+	var add_php_before_delete_vvvvvxq = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxq(add_php_before_delete_vvvvvxq);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_before_delete_vvvvvxp = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
-	vvvvvxp(add_php_before_delete_vvvvvxp);
+	var add_php_before_delete_vvvvvxq = jQuery("#jform_add_php_before_delete input[type='radio']:checked").val();
+	vvvvvxq(add_php_before_delete_vvvvvxq);

 });

-// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxq function
+// #jform_add_php_after_delete listeners for add_php_after_delete_vvvvvxr function
 jQuery('#jform_add_php_after_delete').on('keyup',function()
 {
-	var add_php_after_delete_vvvvvxq = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxq(add_php_after_delete_vvvvvxq);
+	var add_php_after_delete_vvvvvxr = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxr(add_php_after_delete_vvvvvxr);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_delete',function (e)
 {
 	e.preventDefault();
-	var add_php_after_delete_vvvvvxq = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
-	vvvvvxq(add_php_after_delete_vvvvvxq);
+	var add_php_after_delete_vvvvvxr = jQuery("#jform_add_php_after_delete input[type='radio']:checked").val();
+	vvvvvxr(add_php_after_delete_vvvvvxr);

 });

-// #jform_add_php_document listeners for add_php_document_vvvvvxr function
+// #jform_add_php_document listeners for add_php_document_vvvvvxs function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxr(add_php_document_vvvvvxr);
+	var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxs(add_php_document_vvvvvxs);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvxr = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvxr(add_php_document_vvvvvxr);
-
-});
-
-// #jform_add_sql listeners for add_sql_vvvvvxs function
-jQuery('#jform_add_sql').on('keyup',function()
-{
-	var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxs(add_sql_vvvvvxs);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
-{
-	e.preventDefault();
-	var add_sql_vvvvvxs = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxs(add_sql_vvvvvxs);
-
-});
-
-// #jform_source listeners for source_vvvvvxt function
-jQuery('#jform_source').on('keyup',function()
-{
-	var source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt);
-
-});
-jQuery('#adminForm').on('change', '#jform_source',function (e)
-{
-	e.preventDefault();
-	var source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt);
+	var add_php_document_vvvvvxs = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvxs(add_php_document_vvvvvxs);

 });

 // #jform_add_sql listeners for add_sql_vvvvvxt function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt);
+	vvvvvxt(add_sql_vvvvvxt);

 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxt = jQuery("#jform_source input[type='radio']:checked").val();
 	var add_sql_vvvvvxt = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxt(source_vvvvvxt,add_sql_vvvvvxt);
+	vvvvvxt(add_sql_vvvvvxt);

 });

-// #jform_source listeners for source_vvvvvxv function
+// #jform_source listeners for source_vvvvvxu function
 jQuery('#jform_source').on('keyup',function()
 {
-	var source_vvvvvxv = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv);
+	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);

 });
 jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxv = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv);
+	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);

 });

-// #jform_add_sql listeners for add_sql_vvvvvxv function
+// #jform_add_sql listeners for add_sql_vvvvvxu function
 jQuery('#jform_add_sql').on('keyup',function()
 {
-	var source_vvvvvxv = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv);
+	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);

 });
 jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
 {
 	e.preventDefault();
-	var source_vvvvvxv = jQuery("#jform_source input[type='radio']:checked").val();
-	var add_sql_vvvvvxv = jQuery("#jform_add_sql input[type='radio']:checked").val();
-	vvvvvxv(source_vvvvvxv,add_sql_vvvvvxv);
+	var source_vvvvvxu = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxu = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxu(source_vvvvvxu,add_sql_vvvvvxu);

 });

-// #jform_add_custom_import listeners for add_custom_import_vvvvvxx function
-jQuery('#jform_add_custom_import').on('keyup',function()
+// #jform_source listeners for source_vvvvvxw function
+jQuery('#jform_source').on('keyup',function()
 {
-	var add_custom_import_vvvvvxx = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvxx(add_custom_import_vvvvvxx);
+	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);

 });
-jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+jQuery('#adminForm').on('change', '#jform_source',function (e)
 {
 	e.preventDefault();
-	var add_custom_import_vvvvvxx = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
-	vvvvvxx(add_custom_import_vvvvvxx);
+	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
+
+});
+
+// #jform_add_sql listeners for add_sql_vvvvvxw function
+jQuery('#jform_add_sql').on('keyup',function()
+{
+	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_sql',function (e)
+{
+	e.preventDefault();
+	var source_vvvvvxw = jQuery("#jform_source input[type='radio']:checked").val();
+	var add_sql_vvvvvxw = jQuery("#jform_add_sql input[type='radio']:checked").val();
+	vvvvvxw(source_vvvvvxw,add_sql_vvvvvxw);

 });

@ -657,18 +647,33 @@ jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)

 });

-// #jform_add_custom_button listeners for add_custom_button_vvvvvxz function
+// #jform_add_custom_import listeners for add_custom_import_vvvvvxz function
+jQuery('#jform_add_custom_import').on('keyup',function()
+{
+	var add_custom_import_vvvvvxz = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvxz(add_custom_import_vvvvvxz);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_custom_import',function (e)
+{
+	e.preventDefault();
+	var add_custom_import_vvvvvxz = jQuery("#jform_add_custom_import input[type='radio']:checked").val();
+	vvvvvxz(add_custom_import_vvvvvxz);
+
+});
+
+// #jform_add_custom_button listeners for add_custom_button_vvvvvya function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvxz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvxz(add_custom_button_vvvvvxz);
+	var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvya(add_custom_button_vvvvvya);

 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvxz = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvxz(add_custom_button_vvvvvxz);
+	var add_custom_button_vvvvvya = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvya(add_custom_button_vvvvvya);

 });

--- a/admin/views/admin_view/view.html.php
+++ b/admin/views/admin_view/view.html.php
@ -194,19 +194,20 @@ class ComponentbuilderViewAdmin_view extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_ADMIN_VIEW_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_view.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_view.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_view/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/admin_view/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
+			
+		// add the Uikit v2 style sheets
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');

 		// add Uikit v2 JavaScripts
-		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , array('version' => 'auto'));
-		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));
-		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));
-		// add the Uikit v2 style sheets
-		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , array('version' => 'auto'));
-		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , array('version' => 'auto'));			
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);			
 		// add var key
 		$this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); 
 		JText::script('view not acceptable. Error');
--- a/admin/views/admin_views/view.html.php
+++ b/admin/views/admin_views/view.html.php
@ -214,7 +214,7 @@ class ComponentbuilderViewAdmin_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMIN_VIEWS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_views.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/admins_fields/view.html.php
+++ b/admin/views/admins_fields/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewAdmins_fields extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/admins_fields_conditions/view.html.php
+++ b/admin/views/admins_fields_conditions/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewAdmins_fields_conditions extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields_conditions.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/admins_fields_conditions.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@ -162,12 +162,12 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 		// The uikit css.
 		if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
-			$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', array('version' => 'auto'));
+			$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		}
 		// The uikit js.
 		if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
 		{
-			$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', array('version' => 'auto'));
+			$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
 		}

 		// Load the needed uikit components in this view.
@ -185,13 +185,13 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 					if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
 					{
 						// load the css.
-						$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', array('version' => 'auto'));
+						$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 					}
 					// check if the JavaScript file exists.
 					if (JFile::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
 					{
 						// load the js.
-						$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));
+						$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
 					}
 				}
 			}
@ -199,7 +199,7 @@ class ComponentbuilderViewCompiler extends JViewLegacy
 		// add marked library
 		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/custom/marked.js");
 		// add the document default css file
-		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/compiler.css', array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root(true) .'/administrator/components/com_componentbuilder/assets/css/compiler.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Set the Custom CSS script to view
 		$this->document->addStyleDeclaration("
 			.j-sidebar-container {
--- a/admin/views/component_admin_views/view.html.php
+++ b/admin/views/component_admin_views/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_admin_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_ADMIN_VIEWS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_admin_views.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_admin_views/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_admin_views/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_config/view.html.php
+++ b/admin/views/component_config/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_config extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CONFIG_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_config.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_config/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_config.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_config/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_custom_admin_menus/view.html.php
+++ b/admin/views/component_custom_admin_menus/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_custom_admin_menus extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_MENUS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_menus.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_menus/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_menus.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_menus/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_custom_admin_views/view.html.php
+++ b/admin/views/component_custom_admin_views/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_custom_admin_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_CUSTOM_ADMIN_VIEWS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_views.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_views/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_custom_admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_custom_admin_views/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_dashboard/view.html.php
+++ b/admin/views/component_dashboard/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_dashboard extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_DASHBOARD_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_dashboard.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_dashboard/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_dashboard.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_dashboard/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_files_folders/view.html.php
+++ b/admin/views/component_files_folders/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_files_folders extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_files_folders.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_files_folders/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_files_folders.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_files_folders/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_mysql_tweaks/view.html.php
+++ b/admin/views/component_mysql_tweaks/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_mysql_tweaks extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_MYSQL_TWEAKS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_mysql_tweaks.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_mysql_tweaks/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_mysql_tweaks.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_mysql_tweaks/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_site_views/view.html.php
+++ b/admin/views/component_site_views/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_site_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_SITE_VIEWS_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_site_views.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_site_views/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_site_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_site_views/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/component_updates/view.html.php
+++ b/admin/views/component_updates/view.html.php
@ -194,9 +194,9 @@ class ComponentbuilderViewComponent_updates extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_NEW' : 'COM_COMPONENTBUILDER_COMPONENT_UPDATES_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_updates.css", array('version' => 'auto')); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_updates/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/component_updates.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/component_updates/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/components_admin_views/view.html.php
+++ b/admin/views/components_admin_views/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_admin_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_admin_views.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_config/view.html.php
+++ b/admin/views/components_config/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_config extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CONFIG'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_config.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_config.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_custom_admin_menus/view.html.php
+++ b/admin/views/components_custom_admin_menus/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_custom_admin_menus extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_menus.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_menus.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_custom_admin_views/view.html.php
+++ b/admin/views/components_custom_admin_views/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_custom_admin_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_views.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_custom_admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_dashboard/view.html.php
+++ b/admin/views/components_dashboard/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_dashboard extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_dashboard.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_dashboard.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_files_folders/view.html.php
+++ b/admin/views/components_files_folders/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_files_folders extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_files_folders.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_files_folders.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_mysql_tweaks/view.html.php
+++ b/admin/views/components_mysql_tweaks/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_mysql_tweaks extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_mysql_tweaks.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_mysql_tweaks.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_site_views/view.html.php
+++ b/admin/views/components_site_views/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_site_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_site_views.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_site_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/components_updates/view.html.php
+++ b/admin/views/components_updates/view.html.php
@ -204,7 +204,7 @@ class ComponentbuilderViewComponents_updates extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_COMPONENTS_UPDATES'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_updates.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/components_updates.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/custom_admin_view/tmpl/edit.php
+++ b/admin/views/custom_admin_view/tmpl/edit.php
@ -113,6 +113,16 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');
 		</div>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>

+	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'linked_components', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_LINKED_COMPONENTS', true)); ?>
+		<div class="row-fluid form-horizontal-desktop">
+		</div>
+		<div class="row-fluid form-horizontal-desktop">
+			<div class="span12">
+				<?php echo JLayoutHelper::render('custom_admin_view.linked_components_fullwidth', $this); ?>
+			</div>
+		</div>
+	<?php echo JHtml::_('bootstrap.endTab'); ?>
+
 	<?php if ($this->canDo->get('core.delete') || $this->canDo->get('core.edit.created_by') || $this->canDo->get('core.edit.state') || $this->canDo->get('core.edit.created')) : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'custom_admin_viewTab', 'publishing', JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_PUBLISHING', true)); ?>
 		<div class="row-fluid form-horizontal-desktop">
@ -163,138 +173,153 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_add_php_view listeners for add_php_view_vvvvvya function
+// #jform_add_php_view listeners for add_php_view_vvvvvyb function
 jQuery('#jform_add_php_view').on('keyup',function()
 {
-	var add_php_view_vvvvvya = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvya(add_php_view_vvvvvya);
+	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyb(add_php_view_vvvvvyb);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_view',function (e)
 {
 	e.preventDefault();
-	var add_php_view_vvvvvya = jQuery("#jform_add_php_view input[type='radio']:checked").val();
-	vvvvvya(add_php_view_vvvvvya);
+	var add_php_view_vvvvvyb = jQuery("#jform_add_php_view input[type='radio']:checked").val();
+	vvvvvyb(add_php_view_vvvvvyb);

 });

-// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyb function
+// #jform_add_php_jview_display listeners for add_php_jview_display_vvvvvyc function
 jQuery('#jform_add_php_jview_display').on('keyup',function()
 {
-	var add_php_jview_display_vvvvvyb = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyb(add_php_jview_display_vvvvvyb);
+	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyc(add_php_jview_display_vvvvvyc);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview_display',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_display_vvvvvyb = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
-	vvvvvyb(add_php_jview_display_vvvvvyb);
+	var add_php_jview_display_vvvvvyc = jQuery("#jform_add_php_jview_display input[type='radio']:checked").val();
+	vvvvvyc(add_php_jview_display_vvvvvyc);

 });

-// #jform_add_php_jview listeners for add_php_jview_vvvvvyc function
+// #jform_add_php_jview listeners for add_php_jview_vvvvvyd function
 jQuery('#jform_add_php_jview').on('keyup',function()
 {
-	var add_php_jview_vvvvvyc = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_vvvvvyc);
+	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyd(add_php_jview_vvvvvyd);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_jview',function (e)
 {
 	e.preventDefault();
-	var add_php_jview_vvvvvyc = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
-	vvvvvyc(add_php_jview_vvvvvyc);
+	var add_php_jview_vvvvvyd = jQuery("#jform_add_php_jview input[type='radio']:checked").val();
+	vvvvvyd(add_php_jview_vvvvvyd);

 });

-// #jform_add_php_document listeners for add_php_document_vvvvvyd function
+// #jform_add_php_document listeners for add_php_document_vvvvvye function
 jQuery('#jform_add_php_document').on('keyup',function()
 {
-	var add_php_document_vvvvvyd = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyd(add_php_document_vvvvvyd);
+	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvye(add_php_document_vvvvvye);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_document',function (e)
 {
 	e.preventDefault();
-	var add_php_document_vvvvvyd = jQuery("#jform_add_php_document input[type='radio']:checked").val();
-	vvvvvyd(add_php_document_vvvvvyd);
+	var add_php_document_vvvvvye = jQuery("#jform_add_php_document input[type='radio']:checked").val();
+	vvvvvye(add_php_document_vvvvvye);

 });

-// #jform_add_css_document listeners for add_css_document_vvvvvye function
+// #jform_add_css_document listeners for add_css_document_vvvvvyf function
 jQuery('#jform_add_css_document').on('keyup',function()
 {
-	var add_css_document_vvvvvye = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvye(add_css_document_vvvvvye);
+	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyf(add_css_document_vvvvvyf);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_document',function (e)
 {
 	e.preventDefault();
-	var add_css_document_vvvvvye = jQuery("#jform_add_css_document input[type='radio']:checked").val();
-	vvvvvye(add_css_document_vvvvvye);
+	var add_css_document_vvvvvyf = jQuery("#jform_add_css_document input[type='radio']:checked").val();
+	vvvvvyf(add_css_document_vvvvvyf);

 });

-// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyf function
+// #jform_add_javascript_file listeners for add_javascript_file_vvvvvyg function
 jQuery('#jform_add_javascript_file').on('keyup',function()
 {
-	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyf(add_javascript_file_vvvvvyf);
+	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyg(add_javascript_file_vvvvvyg);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_file',function (e)
 {
 	e.preventDefault();
-	var add_javascript_file_vvvvvyf = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
-	vvvvvyf(add_javascript_file_vvvvvyf);
+	var add_javascript_file_vvvvvyg = jQuery("#jform_add_javascript_file input[type='radio']:checked").val();
+	vvvvvyg(add_javascript_file_vvvvvyg);

 });

-// #jform_add_js_document listeners for add_js_document_vvvvvyg function
+// #jform_add_js_document listeners for add_js_document_vvvvvyh function
 jQuery('#jform_add_js_document').on('keyup',function()
 {
-	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyg(add_js_document_vvvvvyg);
+	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyh(add_js_document_vvvvvyh);

 });
 jQuery('#adminForm').on('change', '#jform_add_js_document',function (e)
 {
 	e.preventDefault();
-	var add_js_document_vvvvvyg = jQuery("#jform_add_js_document input[type='radio']:checked").val();
-	vvvvvyg(add_js_document_vvvvvyg);
+	var add_js_document_vvvvvyh = jQuery("#jform_add_js_document input[type='radio']:checked").val();
+	vvvvvyh(add_js_document_vvvvvyh);

 });

-// #jform_add_custom_button listeners for add_custom_button_vvvvvyh function
+// #jform_add_custom_button listeners for add_custom_button_vvvvvyi function
 jQuery('#jform_add_custom_button').on('keyup',function()
 {
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);

 });
 jQuery('#adminForm').on('change', '#jform_add_custom_button',function (e)
 {
 	e.preventDefault();
-	var add_custom_button_vvvvvyh = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
-	vvvvvyh(add_custom_button_vvvvvyh);
+	var add_custom_button_vvvvvyi = jQuery("#jform_add_custom_button input[type='radio']:checked").val();
+	vvvvvyi(add_custom_button_vvvvvyi);

 });

-// #jform_add_css listeners for add_css_vvvvvyi function
+// #jform_add_css listeners for add_css_vvvvvyj function
 jQuery('#jform_add_css').on('keyup',function()
 {
-	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyi(add_css_vvvvvyi);
+	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyj(add_css_vvvvvyj);

 });
 jQuery('#adminForm').on('change', '#jform_add_css',function (e)
 {
 	e.preventDefault();
-	var add_css_vvvvvyi = jQuery("#jform_add_css input[type='radio']:checked").val();
-	vvvvvyi(add_css_vvvvvyi);
+	var add_css_vvvvvyj = jQuery("#jform_add_css input[type='radio']:checked").val();
+	vvvvvyj(add_css_vvvvvyj);
+
+});
+
+// #jform_add_php_ajax listeners for add_php_ajax_vvvvvyk function
+jQuery('#jform_add_php_ajax').on('keyup',function()
+{
+	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyk(add_php_ajax_vvvvvyk);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_ajax',function (e)
+{
+	e.preventDefault();
+	var add_php_ajax_vvvvvyk = jQuery("#jform_add_php_ajax input[type='radio']:checked").val();
+	vvvvvyk(add_php_ajax_vvvvvyk);

 });

@ -393,4 +418,17 @@ jQuery(document).ready(function() {
 // some lang strings
 var select_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_SELECT_A_SNIPPET'); ?>';
 var create_a_snippet = '<?php echo JText::_('COM_COMPONENTBUILDER_CREATE_A_SNIPPET'); ?>';
+			
+// nice little dot trick :)
+jQuery(document).ready( function($) {
+  var x=0;
+  setInterval(function() {
+	var dots = "";
+	x++;
+	for (var y=0; y < x%8; y++) {
+		dots+=".";
+	}
+	$(".loading-dots").text(dots);
+  } , 500);
+});			 
 </script>
--- a/admin/views/custom_admin_view/view.html.php
+++ b/admin/views/custom_admin_view/view.html.php
@ -194,11 +194,22 @@ class ComponentbuilderViewCustom_admin_view extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_view.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_admin_view/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
+			
+		// add the Uikit v2 style sheets
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+		// add Uikit v2 JavaScripts
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);			
+		// add var key
+		$this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/custom_admin_views/view.html.php
+++ b/admin/views/custom_admin_views/view.html.php
@ -219,7 +219,7 @@ class ComponentbuilderViewCustom_admin_views extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_views.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_admin_views.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/custom_code/tmpl/edit.php
+++ b/admin/views/custom_code/tmpl/edit.php
@ -127,101 +127,101 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_target listeners for target_vvvvvzs function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzs = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzs(target_vvvvvzs);
-
-});
-
-// #jform_target listeners for target_vvvvvzt function
-jQuery('#jform_target').on('keyup',function()
-{
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(target_vvvvvzt);
-
-});
-jQuery('#adminForm').on('change', '#jform_target',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzt = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzt(target_vvvvvzt);
-
-});
-
 // #jform_target listeners for target_vvvvvzu function
 jQuery('#jform_target').on('keyup',function()
 {
 	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
+	vvvvvzu(target_vvvvvzu);

 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
 	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
-
-});
-
-// #jform_type listeners for type_vvvvvzu function
-jQuery('#jform_type').on('keyup',function()
-{
-	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var target_vvvvvzu = jQuery("#jform_target input[type='radio']:checked").val();
-	var type_vvvvvzu = jQuery("#jform_type input[type='radio']:checked").val();
-	vvvvvzu(target_vvvvvzu,type_vvvvvzu);
-
-});
-
-// #jform_type listeners for type_vvvvvzv function
-jQuery('#jform_type').on('keyup',function()
-{
-	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
-
-});
-jQuery('#adminForm').on('change', '#jform_type',function (e)
-{
-	e.preventDefault();
-	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
-	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+	vvvvvzu(target_vvvvvzu);

 });

 // #jform_target listeners for target_vvvvvzv function
 jQuery('#jform_target').on('keyup',function()
 {
-	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+	vvvvvzv(target_vvvvvzv);

 });
 jQuery('#adminForm').on('change', '#jform_target',function (e)
 {
 	e.preventDefault();
-	var type_vvvvvzv = jQuery("#jform_type input[type='radio']:checked").val();
 	var target_vvvvvzv = jQuery("#jform_target input[type='radio']:checked").val();
-	vvvvvzv(type_vvvvvzv,target_vvvvvzv);
+	vvvvvzv(target_vvvvvzv);
+
+});
+
+// #jform_target listeners for target_vvvvvzw function
+jQuery('#jform_target').on('keyup',function()
+{
+	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
+
+});
+
+// #jform_type listeners for type_vvvvvzw function
+jQuery('#jform_type').on('keyup',function()
+{
+	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var target_vvvvvzw = jQuery("#jform_target input[type='radio']:checked").val();
+	var type_vvvvvzw = jQuery("#jform_type input[type='radio']:checked").val();
+	vvvvvzw(target_vvvvvzw,type_vvvvvzw);
+
+});
+
+// #jform_type listeners for type_vvvvvzx function
+jQuery('#jform_type').on('keyup',function()
+{
+	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
+
+});
+jQuery('#adminForm').on('change', '#jform_type',function (e)
+{
+	e.preventDefault();
+	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
+
+});
+
+// #jform_target listeners for target_vvvvvzx function
+jQuery('#jform_target').on('keyup',function()
+{
+	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzx(type_vvvvvzx,target_vvvvvzx);
+
+});
+jQuery('#adminForm').on('change', '#jform_target',function (e)
+{
+	e.preventDefault();
+	var type_vvvvvzx = jQuery("#jform_type input[type='radio']:checked").val();
+	var target_vvvvvzx = jQuery("#jform_target input[type='radio']:checked").val();
+	vvvvvzx(type_vvvvvzx,target_vvvvvzx);

 });

--- a/admin/views/custom_code/view.html.php
+++ b/admin/views/custom_code/view.html.php
@ -194,19 +194,20 @@ class ComponentbuilderViewCustom_code extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_CUSTOM_CODE_NEW' : 'COM_COMPONENTBUILDER_CUSTOM_CODE_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_code.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_code.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_code/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/custom_code/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
+			
+		// add the Uikit v2 style sheets
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');

 		// add Uikit v2 JavaScripts
-		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , array('version' => 'auto'));
-		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));
-		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', array('version' => 'auto'), array('type' => 'text/javascript', 'async' => 'async'));
-		// add the Uikit v2 style sheets
-		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , array('version' => 'auto'));
-		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , array('version' => 'auto'));			
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);			
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/custom_codes/view.html.php
+++ b/admin/views/custom_codes/view.html.php
@ -302,7 +302,7 @@ class ComponentbuilderViewCustom_codes extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_codes.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/custom_codes.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/dynamic_get/tmpl/edit.php
+++ b/admin/views/dynamic_get/tmpl/edit.php
@ -167,48 +167,18 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_gettype listeners for gettype_vvvvvyw function
+// #jform_gettype listeners for gettype_vvvvvyy function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvyw = jQuery("#jform_gettype").val();
-	vvvvvyw(gettype_vvvvvyw);
+	var gettype_vvvvvyy = jQuery("#jform_gettype").val();
+	vvvvvyy(gettype_vvvvvyy);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvyw = jQuery("#jform_gettype").val();
-	vvvvvyw(gettype_vvvvvyw);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyx function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyx = jQuery("#jform_main_source").val();
-	vvvvvyx(main_source_vvvvvyx);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyx = jQuery("#jform_main_source").val();
-	vvvvvyx(main_source_vvvvvyx);
-
-});
-
-// #jform_main_source listeners for main_source_vvvvvyy function
-jQuery('#jform_main_source').on('keyup',function()
-{
-	var main_source_vvvvvyy = jQuery("#jform_main_source").val();
-	vvvvvyy(main_source_vvvvvyy);
-
-});
-jQuery('#adminForm').on('change', '#jform_main_source',function (e)
-{
-	e.preventDefault();
-	var main_source_vvvvvyy = jQuery("#jform_main_source").val();
-	vvvvvyy(main_source_vvvvvyy);
+	var gettype_vvvvvyy = jQuery("#jform_gettype").val();
+	vvvvvyy(gettype_vvvvvyy);

 });

@ -242,52 +212,33 @@ jQuery('#adminForm').on('change', '#jform_main_source',function (e)

 });

-// #jform_addcalculation listeners for addcalculation_vvvvvzb function
-jQuery('#jform_addcalculation').on('keyup',function()
+// #jform_main_source listeners for main_source_vvvvvzb function
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzb(addcalculation_vvvvvzb);
+	var main_source_vvvvvzb = jQuery("#jform_main_source").val();
+	vvvvvzb(main_source_vvvvvzb);

 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzb = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	vvvvvzb(addcalculation_vvvvvzb);
+	var main_source_vvvvvzb = jQuery("#jform_main_source").val();
+	vvvvvzb(main_source_vvvvvzb);

 });

-// #jform_addcalculation listeners for addcalculation_vvvvvzc function
-jQuery('#jform_addcalculation').on('keyup',function()
+// #jform_main_source listeners for main_source_vvvvvzc function
+jQuery('#jform_main_source').on('keyup',function()
 {
-	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+	var main_source_vvvvvzc = jQuery("#jform_main_source").val();
+	vvvvvzc(main_source_vvvvvzc);

 });
-jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzc function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var addcalculation_vvvvvzc = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzc = jQuery("#jform_gettype").val();
-	vvvvvzc(addcalculation_vvvvvzc,gettype_vvvvvzc);
+	var main_source_vvvvvzc = jQuery("#jform_main_source").val();
+	vvvvvzc(main_source_vvvvvzc);

 });

@ -295,278 +246,327 @@ jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 jQuery('#jform_addcalculation').on('keyup',function()
 {
 	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
-	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+	vvvvvzd(addcalculation_vvvvvzd);

 });
 jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
 {
 	e.preventDefault();
 	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
-	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+	vvvvvzd(addcalculation_vvvvvzd);

 });

-// #jform_gettype listeners for gettype_vvvvvzd function
+// #jform_addcalculation listeners for addcalculation_vvvvvze function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvze = jQuery("#jform_gettype").val();
+	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvze = jQuery("#jform_gettype").val();
+	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvze function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
-	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvze = jQuery("#jform_gettype").val();
+	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var addcalculation_vvvvvzd = jQuery("#jform_addcalculation input[type='radio']:checked").val();
-	var gettype_vvvvvzd = jQuery("#jform_gettype").val();
-	vvvvvzd(addcalculation_vvvvvzd,gettype_vvvvvzd);
+	var addcalculation_vvvvvze = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvze = jQuery("#jform_gettype").val();
+	vvvvvze(addcalculation_vvvvvze,gettype_vvvvvze);

 });

-// #jform_main_source listeners for main_source_vvvvvzg function
+// #jform_addcalculation listeners for addcalculation_vvvvvzf function
+jQuery('#jform_addcalculation').on('keyup',function()
+{
+	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
+
+});
+jQuery('#adminForm').on('change', '#jform_addcalculation',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzf function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var addcalculation_vvvvvzf = jQuery("#jform_addcalculation input[type='radio']:checked").val();
+	var gettype_vvvvvzf = jQuery("#jform_gettype").val();
+	vvvvvzf(addcalculation_vvvvvzf,gettype_vvvvvzf);
+
+});
+
+// #jform_main_source listeners for main_source_vvvvvzi function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
+	var main_source_vvvvvzi = jQuery("#jform_main_source").val();
+	vvvvvzi(main_source_vvvvvzi);

 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzg = jQuery("#jform_main_source").val();
-	vvvvvzg(main_source_vvvvvzg);
+	var main_source_vvvvvzi = jQuery("#jform_main_source").val();
+	vvvvvzi(main_source_vvvvvzi);

 });

-// #jform_main_source listeners for main_source_vvvvvzh function
+// #jform_main_source listeners for main_source_vvvvvzj function
 jQuery('#jform_main_source').on('keyup',function()
 {
-	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
-	vvvvvzh(main_source_vvvvvzh);
+	var main_source_vvvvvzj = jQuery("#jform_main_source").val();
+	vvvvvzj(main_source_vvvvvzj);

 });
 jQuery('#adminForm').on('change', '#jform_main_source',function (e)
 {
 	e.preventDefault();
-	var main_source_vvvvvzh = jQuery("#jform_main_source").val();
-	vvvvvzh(main_source_vvvvvzh);
+	var main_source_vvvvvzj = jQuery("#jform_main_source").val();
+	vvvvvzj(main_source_vvvvvzj);

 });

-// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzi function
+// #jform_add_php_before_getitem listeners for add_php_before_getitem_vvvvvzk function
 jQuery('#jform_add_php_before_getitem').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
+	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_before_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
+	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);

 });

-// #jform_gettype listeners for gettype_vvvvvzi function
+// #jform_gettype listeners for gettype_vvvvvzk function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
+	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitem_vvvvvzi = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzi = jQuery("#jform_gettype").val();
-	vvvvvzi(add_php_before_getitem_vvvvvzi,gettype_vvvvvzi);
+	var add_php_before_getitem_vvvvvzk = jQuery("#jform_add_php_before_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzk = jQuery("#jform_gettype").val();
+	vvvvvzk(add_php_before_getitem_vvvvvzk,gettype_vvvvvzk);

 });

-// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzj function
+// #jform_add_php_after_getitem listeners for add_php_after_getitem_vvvvvzl function
 jQuery('#jform_add_php_after_getitem').on('keyup',function()
 {
-	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
+	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
+	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);

 });
 jQuery('#adminForm').on('change', '#jform_add_php_after_getitem',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzj function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_after_getitem_vvvvvzj = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
-	var gettype_vvvvvzj = jQuery("#jform_gettype").val();
-	vvvvvzj(add_php_after_getitem_vvvvvzj,gettype_vvvvvzj);
+	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
+	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
+	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);

 });

 // #jform_gettype listeners for gettype_vvvvvzl function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(gettype_vvvvvzl);
+	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitem_vvvvvzl = jQuery("#jform_add_php_after_getitem input[type='radio']:checked").val();
 	var gettype_vvvvvzl = jQuery("#jform_gettype").val();
-	vvvvvzl(gettype_vvvvvzl);
-
-});
-
-// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzm function
-jQuery('#jform_add_php_getlistquery').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
-
-});
-
-// #jform_gettype listeners for gettype_vvvvvzm function
-jQuery('#jform_gettype').on('keyup',function()
-{
-	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
-
-});
-jQuery('#adminForm').on('change', '#jform_gettype',function (e)
-{
-	e.preventDefault();
-	var add_php_getlistquery_vvvvvzm = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
-	var gettype_vvvvvzm = jQuery("#jform_gettype").val();
-	vvvvvzm(add_php_getlistquery_vvvvvzm,gettype_vvvvvzm);
-
-});
-
-// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzn function
-jQuery('#jform_add_php_before_getitems').on('keyup',function()
-{
-	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
-
-});
-jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
-{
-	e.preventDefault();
-	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
-	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzl(add_php_after_getitem_vvvvvzl,gettype_vvvvvzl);

 });

 // #jform_gettype listeners for gettype_vvvvvzn function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzn(gettype_vvvvvzn);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_before_getitems_vvvvvzn = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzn = jQuery("#jform_gettype").val();
-	vvvvvzn(add_php_before_getitems_vvvvvzn,gettype_vvvvvzn);
+	vvvvvzn(gettype_vvvvvzn);

 });

-// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzo function
-jQuery('#jform_add_php_after_getitems').on('keyup',function()
+// #jform_add_php_getlistquery listeners for add_php_getlistquery_vvvvvzo function
+jQuery('#jform_add_php_getlistquery').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);

 });
-jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+jQuery('#adminForm').on('change', '#jform_add_php_getlistquery',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);

 });

 // #jform_gettype listeners for gettype_vvvvvzo function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var add_php_after_getitems_vvvvvzo = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var add_php_getlistquery_vvvvvzo = jQuery("#jform_add_php_getlistquery input[type='radio']:checked").val();
 	var gettype_vvvvvzo = jQuery("#jform_gettype").val();
-	vvvvvzo(add_php_after_getitems_vvvvvzo,gettype_vvvvvzo);
+	vvvvvzo(add_php_getlistquery_vvvvvzo,gettype_vvvvvzo);
+
+});
+
+// #jform_add_php_before_getitems listeners for add_php_before_getitems_vvvvvzp function
+jQuery('#jform_add_php_before_getitems').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_before_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzp function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var add_php_before_getitems_vvvvvzp = jQuery("#jform_add_php_before_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzp = jQuery("#jform_gettype").val();
+	vvvvvzp(add_php_before_getitems_vvvvvzp,gettype_vvvvvzp);
+
+});
+
+// #jform_add_php_after_getitems listeners for add_php_after_getitems_vvvvvzq function
+jQuery('#jform_add_php_after_getitems').on('keyup',function()
+{
+	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);
+
+});
+jQuery('#adminForm').on('change', '#jform_add_php_after_getitems',function (e)
+{
+	e.preventDefault();
+	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
+	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
+	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);

 });

 // #jform_gettype listeners for gettype_vvvvvzq function
 jQuery('#jform_gettype').on('keyup',function()
 {
+	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(gettype_vvvvvzq);
+	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
+	var add_php_after_getitems_vvvvvzq = jQuery("#jform_add_php_after_getitems input[type='radio']:checked").val();
 	var gettype_vvvvvzq = jQuery("#jform_gettype").val();
-	vvvvvzq(gettype_vvvvvzq);
+	vvvvvzq(add_php_after_getitems_vvvvvzq,gettype_vvvvvzq);

 });

-// #jform_gettype listeners for gettype_vvvvvzr function
+// #jform_gettype listeners for gettype_vvvvvzs function
 jQuery('#jform_gettype').on('keyup',function()
 {
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(gettype_vvvvvzr);
+	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+	vvvvvzs(gettype_vvvvvzs);

 });
 jQuery('#adminForm').on('change', '#jform_gettype',function (e)
 {
 	e.preventDefault();
-	var gettype_vvvvvzr = jQuery("#jform_gettype").val();
-	vvvvvzr(gettype_vvvvvzr);
+	var gettype_vvvvvzs = jQuery("#jform_gettype").val();
+	vvvvvzs(gettype_vvvvvzs);
+
+});
+
+// #jform_gettype listeners for gettype_vvvvvzt function
+jQuery('#jform_gettype').on('keyup',function()
+{
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(gettype_vvvvvzt);
+
+});
+jQuery('#adminForm').on('change', '#jform_gettype',function (e)
+{
+	e.preventDefault();
+	var gettype_vvvvvzt = jQuery("#jform_gettype").val();
+	vvvvvzt(gettype_vvvvvzt);

 });

@ -598,4 +598,17 @@ jQuery(document).ready(function(){
 	get<?php echo $funcName; ?>TableColumns(value_<?php echo $fieldName ?>,'a','<?php echo $fieldName ?>',3,true, '','');
 });
 <?php endforeach; ?>
+			
+// nice little dot trick :)
+jQuery(document).ready( function($) {
+  var x=0;
+  setInterval(function() {
+	var dots = "";
+	x++;
+	for (var y=0; y < x%8; y++) {
+		dots+=".";
+	}
+	$(".loading-dots").text(dots);
+  } , 500);
+});			 
 </script>
--- a/admin/views/dynamic_get/view.html.php
+++ b/admin/views/dynamic_get/view.html.php
@ -194,11 +194,22 @@ class ComponentbuilderViewDynamic_get extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_DYNAMIC_GET_NEW' : 'COM_COMPONENTBUILDER_DYNAMIC_GET_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_get.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_get.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/dynamic_get/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/dynamic_get/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
+			
+		// add the Uikit v2 style sheets
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+		// add Uikit v2 JavaScripts
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);			
+		// add var key
+		$this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/dynamic_gets/view.html.php
+++ b/admin/views/dynamic_gets/view.html.php
@ -258,7 +258,7 @@ class ComponentbuilderViewDynamic_gets extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_DYNAMIC_GETS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_gets.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/dynamic_gets.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/admin/views/field/tmpl/edit.php
+++ b/admin/views/field/tmpl/edit.php
@ -137,157 +137,157 @@ $componentParams = JComponentHelper::getParams('com_componentbuilder');

 <script type="text/javascript">

-// #jform_datalenght listeners for datalenght_vvvvwae function
+// #jform_datalenght listeners for datalenght_vvvvwag function
 jQuery('#jform_datalenght').on('keyup',function()
 {
-	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwae(datalenght_vvvvwae);
+	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
+	vvvvwag(datalenght_vvvvwag);

 });
 jQuery('#adminForm').on('change', '#jform_datalenght',function (e)
 {
 	e.preventDefault();
-	var datalenght_vvvvwae = jQuery("#jform_datalenght").val();
-	vvvvwae(datalenght_vvvvwae);
+	var datalenght_vvvvwag = jQuery("#jform_datalenght").val();
+	vvvvwag(datalenght_vvvvwag);

 });

-// #jform_datadefault listeners for datadefault_vvvvwaf function
+// #jform_datadefault listeners for datadefault_vvvvwah function
 jQuery('#jform_datadefault').on('keyup',function()
 {
-	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwaf(datadefault_vvvvwaf);
+	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
+	vvvvwah(datadefault_vvvvwah);

 });
 jQuery('#adminForm').on('change', '#jform_datadefault',function (e)
 {
 	e.preventDefault();
-	var datadefault_vvvvwaf = jQuery("#jform_datadefault").val();
-	vvvvwaf(datadefault_vvvvwaf);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwag function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(datatype_vvvvwag);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwag = jQuery("#jform_datatype").val();
-	vvvvwag(datatype_vvvvwag);
-
-});
-
-// #jform_datatype listeners for datatype_vvvvwah function
-jQuery('#jform_datatype').on('keyup',function()
-{
-	var datatype_vvvvwah = jQuery("#jform_datatype").val();
-	vvvvwah(datatype_vvvvwah);
-
-});
-jQuery('#adminForm').on('change', '#jform_datatype',function (e)
-{
-	e.preventDefault();
-	var datatype_vvvvwah = jQuery("#jform_datatype").val();
-	vvvvwah(datatype_vvvvwah);
-
-});
-
-// #jform_store listeners for store_vvvvwai function
-jQuery('#jform_store').on('keyup',function()
-{
-	var store_vvvvwai = jQuery("#jform_store").val();
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(store_vvvvwai,datatype_vvvvwai);
-
-});
-jQuery('#adminForm').on('change', '#jform_store',function (e)
-{
-	e.preventDefault();
-	var store_vvvvwai = jQuery("#jform_store").val();
-	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+	var datadefault_vvvvwah = jQuery("#jform_datadefault").val();
+	vvvvwah(datadefault_vvvvwah);

 });

 // #jform_datatype listeners for datatype_vvvvwai function
 jQuery('#jform_datatype').on('keyup',function()
 {
-	var store_vvvvwai = jQuery("#jform_store").val();
 	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+	vvvvwai(datatype_vvvvwai);

 });
 jQuery('#adminForm').on('change', '#jform_datatype',function (e)
 {
 	e.preventDefault();
-	var store_vvvvwai = jQuery("#jform_store").val();
 	var datatype_vvvvwai = jQuery("#jform_datatype").val();
-	vvvvwai(store_vvvvwai,datatype_vvvvwai);
+	vvvvwai(datatype_vvvvwai);

 });

-// #jform_add_css_view listeners for add_css_view_vvvvwak function
+// #jform_datatype listeners for datatype_vvvvwaj function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
+	vvvvwaj(datatype_vvvvwaj);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var datatype_vvvvwaj = jQuery("#jform_datatype").val();
+	vvvvwaj(datatype_vvvvwaj);
+
+});
+
+// #jform_store listeners for store_vvvvwak function
+jQuery('#jform_store').on('keyup',function()
+{
+	var store_vvvvwak = jQuery("#jform_store").val();
+	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_store',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwak = jQuery("#jform_store").val();
+	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+
+});
+
+// #jform_datatype listeners for datatype_vvvvwak function
+jQuery('#jform_datatype').on('keyup',function()
+{
+	var store_vvvvwak = jQuery("#jform_store").val();
+	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+
+});
+jQuery('#adminForm').on('change', '#jform_datatype',function (e)
+{
+	e.preventDefault();
+	var store_vvvvwak = jQuery("#jform_store").val();
+	var datatype_vvvvwak = jQuery("#jform_datatype").val();
+	vvvvwak(store_vvvvwak,datatype_vvvvwak);
+
+});
+
+// #jform_add_css_view listeners for add_css_view_vvvvwam function
 jQuery('#jform_add_css_view').on('keyup',function()
 {
-	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwak(add_css_view_vvvvwak);
+	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwam(add_css_view_vvvvwam);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_view',function (e)
 {
 	e.preventDefault();
-	var add_css_view_vvvvwak = jQuery("#jform_add_css_view input[type='radio']:checked").val();
-	vvvvwak(add_css_view_vvvvwak);
+	var add_css_view_vvvvwam = jQuery("#jform_add_css_view input[type='radio']:checked").val();
+	vvvvwam(add_css_view_vvvvwam);

 });

-// #jform_add_css_views listeners for add_css_views_vvvvwal function
+// #jform_add_css_views listeners for add_css_views_vvvvwan function
 jQuery('#jform_add_css_views').on('keyup',function()
 {
-	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwal(add_css_views_vvvvwal);
+	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwan(add_css_views_vvvvwan);

 });
 jQuery('#adminForm').on('change', '#jform_add_css_views',function (e)
 {
 	e.preventDefault();
-	var add_css_views_vvvvwal = jQuery("#jform_add_css_views input[type='radio']:checked").val();
-	vvvvwal(add_css_views_vvvvwal);
+	var add_css_views_vvvvwan = jQuery("#jform_add_css_views input[type='radio']:checked").val();
+	vvvvwan(add_css_views_vvvvwan);

 });

-// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwam function
+// #jform_add_javascript_view_footer listeners for add_javascript_view_footer_vvvvwao function
 jQuery('#jform_add_javascript_view_footer').on('keyup',function()
 {
-	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwam(add_javascript_view_footer_vvvvwam);
+	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwao(add_javascript_view_footer_vvvvwao);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_view_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_view_footer_vvvvwam = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
-	vvvvwam(add_javascript_view_footer_vvvvwam);
+	var add_javascript_view_footer_vvvvwao = jQuery("#jform_add_javascript_view_footer input[type='radio']:checked").val();
+	vvvvwao(add_javascript_view_footer_vvvvwao);

 });

-// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwan function
+// #jform_add_javascript_views_footer listeners for add_javascript_views_footer_vvvvwap function
 jQuery('#jform_add_javascript_views_footer').on('keyup',function()
 {
-	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwan(add_javascript_views_footer_vvvvwan);
+	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwap(add_javascript_views_footer_vvvvwap);

 });
 jQuery('#adminForm').on('change', '#jform_add_javascript_views_footer',function (e)
 {
 	e.preventDefault();
-	var add_javascript_views_footer_vvvvwan = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
-	vvvvwan(add_javascript_views_footer_vvvvwan);
+	var add_javascript_views_footer_vvvvwap = jQuery("#jform_add_javascript_views_footer input[type='radio']:checked").val();
+	vvvvwap(add_javascript_views_footer_vvvvwap);

 });

@ -333,4 +333,17 @@ jQuery(document).ready(function() {
 		getFieldOptions(fieldId,false);
 	}
 });
+			
+// nice little dot trick :)
+jQuery(document).ready( function($) {
+  var x=0;
+  setInterval(function() {
+	var dots = "";
+	x++;
+	for (var y=0; y < x%8; y++) {
+		dots+=".";
+	}
+	$(".loading-dots").text(dots);
+  } , 500);
+});			 
 </script>
--- a/admin/views/field/view.html.php
+++ b/admin/views/field/view.html.php
@ -194,11 +194,22 @@ class ComponentbuilderViewField extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_($isNew ? 'COM_COMPONENTBUILDER_FIELD_NEW' : 'COM_COMPONENTBUILDER_FIELD_EDIT'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/field.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/field.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 		// Add Ajax Token
 		$this->document->addScriptDeclaration("var token = '".JSession::getFormToken()."';"); 
-		$this->document->addScript(JURI::root() . $this->script, array('version' => 'auto'));
-		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/field/submitbutton.js", array('version' => 'auto')); 
+		$this->document->addScript(JURI::root() . $this->script, (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript(JURI::root() . "administrator/components/com_componentbuilder/views/field/submitbutton.js", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); 
+			
+		// add the Uikit v2 style sheets
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+		$this->document->addStyleSheet( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/notify.gradient.min.css' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
+
+		// add Uikit v2 JavaScripts
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit.min.js' , (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/lightbox.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);
+		$this->document->addScript( JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/notify.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);			
+		// add var key
+		$this->document->addScriptDeclaration("var vastDevMod = '".$this->get('VDM')."';"); 
 		JText::script('view not acceptable. Error');
 	}
 }
--- a/admin/views/fields/view.html.php
+++ b/admin/views/fields/view.html.php
@ -341,7 +341,7 @@ class ComponentbuilderViewFields extends JViewLegacy
 			$this->document = JFactory::getDocument();
 		}
 		$this->document->setTitle(JText::_('COM_COMPONENTBUILDER_FIELDS'));
-		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fields.css", array('version' => 'auto'));
+		$this->document->addStyleSheet(JURI::root() . "administrator/components/com_componentbuilder/assets/css/fields.css", (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');
 	}

 	/**
--- a/Show More
+++ b/Show More