diff --git a/README.md b/README.md
index 19b30191e..5fb70e3b0 100644
--- a/README.md
+++ b/README.md
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 1st July, 2019
++ *Last Build*: 4th July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211430**
-+ *Field count*: **1142**
++ *Line count*: **211563**
++ *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/README.txt b/admin/README.txt
index 19b30191e..5fb70e3b0 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -146,12 +146,12 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 1st July, 2019
++ *Last Build*: 4th July, 2019
 + *Version*: 2.9.20
 + *Copyright*: Copyright (C) 2015 - 2019 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **211430**
-+ *Field count*: **1142**
++ *Line count*: **211563**
++ *Field count*: **1143**
 + *File count*: **1346**
 + *Folder count*: **209**
 
diff --git a/admin/compiler/joomla_3/Helper.php b/admin/compiler/joomla_3/Helper.php
index 2841876b0..b6ce01384 100644
--- a/admin/compiler/joomla_3/Helper.php
+++ b/admin/compiler/joomla_3/Helper.php
@@ -496,38 +496,42 @@ abstract class ###Component###Helper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = '###Component###', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $Component = '###Component###', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
diff --git a/admin/compiler/joomla_3/Helper_site.php b/admin/compiler/joomla_3/Helper_site.php
index 6164ce694..9213fb793 100644
--- a/admin/compiler/joomla_3/Helper_site.php
+++ b/admin/compiler/joomla_3/Helper_site.php
@@ -139,38 +139,42 @@ abstract class ###Component###Helper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = '###Component###', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $Component = '###Component###', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
diff --git a/admin/config.xml b/admin/config.xml
index b976865fa..20204b87b 100644
--- a/admin/config.xml
+++ b/admin/config.xml
@@ -249,6 +249,20 @@
 			<option value="2">
 				COM_COMPONENTBUILDER_CONFIG_SIMPLEXMLELEMENT_CLASS</option>
 		</field>
+		<!-- Field_name_builder Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="field_name_builder"
+			label="COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_LABEL"
+			description="COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_DESCRIPTION"
+			class="btn-group btn-group-yesno"
+			default="1">
+			<!-- Option Set. -->
+			<option value="1">
+				COM_COMPONENTBUILDER_CONFIG_DEFAULT</option>
+			<option value="2">
+				COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC</option>
+		</field>
 		<!-- Spacer_hr_seven Field. Type: Spacer. A None Database Field. (joomla) -->
 		<field type="spacer" name="spacer_hr_seven" hr="true" class="spacer_hr_seven" />
 		<!-- Api Field. Type: User. (joomla) -->
diff --git a/admin/helpers/compiler/a_Get.php b/admin/helpers/compiler/a_Get.php
index 61c84de40..29186c266 100644
--- a/admin/helpers/compiler/a_Get.php
+++ b/admin/helpers/compiler/a_Get.php
@@ -1581,6 +1581,29 @@ class Get
 		return $component;
 	}
 
+	/**
+	 * set the language content values to language content array
+	 * 
+	 * @param   string   $target    The target area for the language string
+	 * @param   string   $language  The language key string
+	 * @param   string   $string    The language string
+	 * @param   boolean  $addPrefix The switch to add langPrefix
+	 *
+	 * @return  void
+	 * 
+	 */
+	public function setLangContent($target, $language, $string, $addPrefix = false)
+	{
+		if ($addPrefix &&  !isset($this->langContent[$target][$this->langPrefix . '_' . $language]))
+		{
+			$this->langContent[$target][$this->langPrefix . '_' . $language] = trim($string);
+		}
+		elseif (!isset($this->langContent[$target][$language]))
+		{
+			$this->langContent[$target][$language] = trim($string);
+		}
+	}
+
 	/**
 	 * Get all Admin View Data
 	 * 
@@ -1708,7 +1731,7 @@ class Get
 					$tab['name'] = (isset($tab['name']) && ComponentbuilderHelper::checkString($tab['name'])) ? $tab['name'] : 'Tab';
 					// set lang
 					$tab['lang'] = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tab['view'], 'U') . '_' . ComponentbuilderHelper::safeString($tab['name'], 'U');
-					$this->langContent['both'][$tab['lang']] = trim($tab['name']);
+					$this->setLangContent('both', $tab['lang'], $tab['name']);
 					// set code name
 					$tab['code'] = ComponentbuilderHelper::safeString($tab['name']);
 					// check if the permissions for the tab should be added
@@ -1747,8 +1770,8 @@ class Get
 						$tab['lang_permission'] = $tab['lang'] . '_TAB_PERMISSION';
 						$tab['lang_permission_desc'] = $tab['lang'] . '_TAB_PERMISSION_DESC';
 						$tab['lang_permission_title'] = $this->placeholders[$this->hhh . 'Views' . $this->hhh] . ' View ' . $tab['name'] . ' Tab';
-						$this->langContent['both'][$tab['lang_permission']] = $tab['lang_permission_title'];
-						$this->langContent['both'][$tab['lang_permission_desc']] = 'Allow the users in this group to view ' . $tab['name'] . ' Tab of ' . $this->placeholders[$this->hhh . 'views' . $this->hhh];
+						$this->setLangContent('both', $tab['lang_permission'], $tab['lang_permission_title']);
+						$this->setLangContent('both', $tab['lang_permission_desc'], 'Allow the users in this group to view ' . $tab['name'] . ' Tab of ' . $this->placeholders[$this->hhh . 'views' . $this->hhh]);
 						// set the sort key
 						$tab['sortKey'] = ComponentbuilderHelper::safeString($tab['lang_permission_title']);
 					}
@@ -2036,7 +2059,7 @@ class Get
 							if ('default' !== $check_column_name)
 							{
 								$column_name_lang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($name_list, 'U') . '_' . ComponentbuilderHelper::safeString($relationsValue['column_name'], 'U');
-								$this->langContent['admin'][$column_name_lang] = trim($relationsValue['column_name']);
+								$this->setLangContent('admin', $column_name_lang, $relationsValue['column_name']);
 								$this->listHeadOverRide[$name_list][(int) $relationsValue['listfield']] = $column_name_lang;
 							}
 						}
@@ -4369,12 +4392,11 @@ class Get
 		{
 			return false;
 		}
-		// only load if string is not already set
+		// build lang key
 		$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($string, 'U');
-		if (!isset($this->langContent[$this->lang][$keyLang]))
-		{
-			$this->langContent[$this->lang][$keyLang] = trim($string);
-		}
+		// set the language string
+		$this->setLangContent($this->lang, $keyLang, $string);
+
 		return $keyLang;
 	}
 
@@ -6334,12 +6356,10 @@ class Get
 					{
 						continue;
 					}
-					// only load if string is not already set
+					// build lang key
 					$keyLang = $this->langPrefix . '_' . $_keyLang;
-					if (!isset($this->langContent[$this->lang][$keyLang]))
-					{
-						$this->langContent[$this->lang][$keyLang] = trim($lang);
-					}
+					// set lang content string
+					$this->setLangContent($this->lang, $keyLang, $lang);
 					// reverse the placeholders
 					foreach ($langStringTargets as $langStringTarget)
 					{
diff --git a/admin/helpers/compiler/c_Fields.php b/admin/helpers/compiler/c_Fields.php
index c3a411af7..4eb73f5cd 100644
--- a/admin/helpers/compiler/c_Fields.php
+++ b/admin/helpers/compiler/c_Fields.php
@@ -380,42 +380,42 @@ class Fields extends Structure
 			$langView = $this->langPrefix . '_' . $this->placeholders[$this->hhh . 'VIEW' . $this->hhh];
 			$langViews = $this->langPrefix . '_' . $this->placeholders[$this->hhh . 'VIEWS' . $this->hhh];
 			// set default lang
-			$this->langContent[$this->lang][$langView] = $view['settings']->name_single;
-			$this->langContent[$this->lang][$langViews] = $view['settings']->name_list;
+			$this->setLangContent($this->lang, $langView, $view['settings']->name_single);
+			$this->setLangContent($this->lang, $langViews, $view['settings']->name_list);
 			// set global item strings
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_ARCHIVED'] = "%s " . $view['settings']->name_list . " archived.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_ARCHIVED_1'] = "%s " . $view['settings']->name_single . " archived.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_CHECKED_IN_0'] = "No " . $view['settings']->name_single . " successfully checked in.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_CHECKED_IN_1'] = "%d " . $view['settings']->name_single . " successfully checked in.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_CHECKED_IN_MORE'] = "%d " . $view['settings']->name_list . " successfully checked in.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_DELETED'] = "%s " . $view['settings']->name_list . " deleted.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_DELETED_1'] = "%s " . $view['settings']->name_single . " deleted.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_FEATURED'] = "%s " . $view['settings']->name_list . " featured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_FEATURED_1'] = "%s " . $view['settings']->name_single . " featured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_PUBLISHED'] = "%s " . $view['settings']->name_list . " published.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_PUBLISHED_1'] = "%s " . $view['settings']->name_single . " published.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_TRASHED'] = "%s " . $view['settings']->name_list . " trashed.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_TRASHED_1'] = "%s " . $view['settings']->name_single . " trashed.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNFEATURED'] = "%s " . $view['settings']->name_list . " unfeatured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNFEATURED_1'] = "%s " . $view['settings']->name_single . " unfeatured.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNPUBLISHED'] = "%s " . $view['settings']->name_list . " unpublished.";
-			$this->langContent[$this->lang][$langViews . '_N_ITEMS_UNPUBLISHED_1'] = "%s " . $view['settings']->name_single . " unpublished.";
-			$this->langContent[$this->lang][$langViews . '_BATCH_OPTIONS'] = "Batch process the selected " . $view['settings']->name_list;
-			$this->langContent[$this->lang][$langViews . '_BATCH_TIP'] = "All changes will be applied to all selected " . $view['settings']->name_list;
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_ARCHIVED', "%s " . $view['settings']->name_list . " archived.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_ARCHIVED_1', "%s " . $view['settings']->name_single . " archived.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_CHECKED_IN_0', "No " . $view['settings']->name_single . " successfully checked in.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_CHECKED_IN_1', "%d " . $view['settings']->name_single . " successfully checked in.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_CHECKED_IN_MORE', "%d " . $view['settings']->name_list . " successfully checked in.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_DELETED', "%s " . $view['settings']->name_list . " deleted.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_DELETED_1', "%s " . $view['settings']->name_single . " deleted.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_FEATURED', "%s " . $view['settings']->name_list . " featured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_FEATURED_1', "%s " . $view['settings']->name_single . " featured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_PUBLISHED', "%s " . $view['settings']->name_list . " published.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_PUBLISHED_1', "%s " . $view['settings']->name_single . " published.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_TRASHED', "%s " . $view['settings']->name_list . " trashed.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_TRASHED_1', "%s " . $view['settings']->name_single . " trashed.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNFEATURED', "%s " . $view['settings']->name_list . " unfeatured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNFEATURED_1', "%s " . $view['settings']->name_single . " unfeatured.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNPUBLISHED', "%s " . $view['settings']->name_list . " unpublished.");
+			$this->setLangContent($this->lang, $langViews . '_N_ITEMS_UNPUBLISHED_1', "%s " . $view['settings']->name_single . " unpublished.");
+			$this->setLangContent($this->lang, $langViews . '_BATCH_OPTIONS', "Batch process the selected " . $view['settings']->name_list);
+			$this->setLangContent($this->lang, $langViews . '_BATCH_TIP', "All changes will be applied to all selected " . $view['settings']->name_list);
 			// set some basic defaults
-			$this->langContent[$this->lang][$langView . '_ERROR_UNIQUE_ALIAS'] = "Another " . $view['settings']->name_single . " has the same alias.";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_LABEL'] = "Created Date";
-			$this->langContent[$this->lang][$langView . '_CREATED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was created.";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_LABEL'] = "Modified Date";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_DATE_DESC'] = "The date this " . $view['settings']->name_single . " was modified.";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_LABEL'] = "Created By";
-			$this->langContent[$this->lang][$langView . '_CREATED_BY_DESC'] = "The user that created this " . $view['settings']->name_single . ".";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_LABEL'] = "Modified By";
-			$this->langContent[$this->lang][$langView . '_MODIFIED_BY_DESC'] = "The last user that modified this " . $view['settings']->name_single . ".";
-			$this->langContent[$this->lang][$langView . '_ORDERING_LABEL'] = "Ordering";
-			$this->langContent[$this->lang][$langView . '_VERSION_LABEL'] = "Revision";
-			$this->langContent[$this->lang][$langView . '_VERSION_DESC'] = "A count of the number of times this " . $view['settings']->name_single . " has been revised.";
-			$this->langContent[$this->lang][$langView . '_SAVE_WARNING'] = "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.";
+			$this->setLangContent($this->lang, $langView . '_ERROR_UNIQUE_ALIAS', "Another " . $view['settings']->name_single . " has the same alias.");
+			$this->setLangContent($this->lang, $langView . '_CREATED_DATE_LABEL', "Created Date");
+			$this->setLangContent($this->lang, $langView . '_CREATED_DATE_DESC', "The date this " . $view['settings']->name_single . " was created.");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_DATE_LABEL', "Modified Date");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_DATE_DESC', "The date this " . $view['settings']->name_single . " was modified.");
+			$this->setLangContent($this->lang, $langView . '_CREATED_BY_LABEL', "Created By");
+			$this->setLangContent($this->lang, $langView . '_CREATED_BY_DESC', "The user that created this " . $view['settings']->name_single . ".");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_BY_LABEL', "Modified By");
+			$this->setLangContent($this->lang, $langView . '_MODIFIED_BY_DESC', "The last user that modified this " . $view['settings']->name_single . ".");
+			$this->setLangContent($this->lang, $langView . '_ORDERING_LABEL', "Ordering");
+			$this->setLangContent($this->lang, $langView . '_VERSION_LABEL', "Revision");
+			$this->setLangContent($this->lang, $langView . '_VERSION_DESC', "A count of the number of times this " . $view['settings']->name_single . " has been revised.");
+			$this->setLangContent($this->lang, $langView . '_SAVE_WARNING', "Alias already existed so a number was added at the end. You can re-edit the " . $view['settings']->name_single . " to customise the alias.");
 			// check what type of field builder to use
 			if ($this->fieldBuilderType == 1)
 			{
@@ -1214,7 +1214,7 @@ class Fields extends Structure
 		if ($setType === 'option')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(1) . $taber . $this->_t(1) . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$field .= PHP_EOL . $this->_t(1) . $taber . $this->_t(1) . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 			$field .= PHP_EOL . $this->_t(1) . $taber . $this->_t(1) . "<field";
 			$optionSet = '';
 			foreach ($fieldAttributes as $property => $value)
@@ -1236,9 +1236,9 @@ class Fields extends Structure
 							{
 								// has other value then text
 								list($v, $t) = explode('|', $option);
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $t;
+								$this->setLangContent($this->lang, $langValue, $t);
 								// no add to option set
 								$optionSet .= PHP_EOL . $this->_t(1) . $taber . $this->_t(2) . '<option value="' . $v . '">' . PHP_EOL . $this->_t(1) . $taber . $this->_t(3) . $langValue . '</option>';
 								$optionArray[$v] = $langValue;
@@ -1246,9 +1246,9 @@ class Fields extends Structure
 							else
 							{
 								// text is also the value
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($option, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($option, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $option;
+								$this->setLangContent($this->lang, $langValue, $option);
 								// no add to option set
 								$optionSet .= PHP_EOL . $this->_t(2) . $taber . $this->_t(1) . '<option value="' . $option . '">' . PHP_EOL . $this->_t(2) . $taber . $this->_t(2) . $langValue . '</option>';
 								$optionArray[$option] = $langValue;
@@ -1262,9 +1262,9 @@ class Fields extends Structure
 						{
 							// has other value then text
 							list($v, $t) = explode('|', $value);
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $t;
+							$this->setLangContent($this->lang, $langValue, $t);
 							// no add to option set
 							$optionSet .= PHP_EOL . $this->_t(2) . $taber . $this->_t(1) . '<option value="' . $v . '">' . PHP_EOL . $this->_t(2) . $taber . $this->_t(2) . $langValue . '</option>';
 							$optionArray[$v] = $langValue;
@@ -1272,9 +1272,9 @@ class Fields extends Structure
 						else
 						{
 							// text is also the value
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($value, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($value, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $value;
+							$this->setLangContent($this->lang, $langValue, $value);
 							// no add to option set
 							$optionSet .= PHP_EOL . $this->_t(2) . $taber . $this->_t(1) . '<option value="' . $value . '">' . PHP_EOL . $this->_t(2) . $taber . $this->_t(2) . $langValue . '</option>';
 							$optionArray[$value] = $langValue;
@@ -1306,7 +1306,7 @@ class Fields extends Structure
 		elseif ($setType === 'plain')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 			$field .= PHP_EOL . $this->_t(2) . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1320,7 +1320,7 @@ class Fields extends Structure
 		elseif ($setType === 'spacer')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
+			$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla) -->";
 			$field .= PHP_EOL . $this->_t(2) . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1337,7 +1337,7 @@ class Fields extends Structure
 			if ($typeName === 'repeatable')
 			{
 				// now add to the field set
-				$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$field .= PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 				$field .= PHP_EOL . $this->_t(2) . "<field";
 				$fieldsSet = array();
 				foreach ($fieldAttributes as $property => $value)
@@ -1412,9 +1412,9 @@ class Fields extends Structure
 									// now add to the field set
 									$field .= $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray, null, $r_taber);
 									// set lang (just incase)
-									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 									// add to lang array
-									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 									// if label was set use instead
 									if (ComponentbuilderHelper::checkString($r_langLabel))
 									{
@@ -1437,7 +1437,7 @@ class Fields extends Structure
 			elseif ($typeName === 'subform')
 			{
 				// now add to the field set
-				$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
+				$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla) -->";
 				$field .= PHP_EOL . $this->_t(2) . $taber . "<field";
 				$fieldsSet = array();
 				foreach ($fieldAttributes as $property => $value)
@@ -1529,9 +1529,9 @@ class Fields extends Structure
 									// now add to the field set
 									$field .= $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray, null, $r_taber);
 									// set lang (just incase)
-									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 									// add to lang array
-									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 									// if label was set use instead
 									if (ComponentbuilderHelper::checkString($r_langLabel))
 									{
@@ -1553,7 +1553,7 @@ class Fields extends Structure
 		elseif ($setType === 'custom')
 		{
 			// now add to the field set
-			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
+			$field .= PHP_EOL . $this->_t(2) . $taber . "<!--" . $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom) -->";
 			$field .= PHP_EOL . $this->_t(2) . $taber . "<field";
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1602,7 +1602,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
 
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1624,9 +1624,9 @@ class Fields extends Structure
 							{
 								// has other value then text
 								list($v, $t) = explode('|', $option);
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $t;
+								$this->setLangContent($this->lang, $langValue, $t);
 								// no add to option set
 								$optionXML->addAttribute('value', $v);
 								$optionArray[$v] = $langValue;
@@ -1634,9 +1634,9 @@ class Fields extends Structure
 							else
 							{
 								// text is also the value
-								$langValue = $langView . '_' . ComponentbuilderHelper::safeString($option, 'U');
+								$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($option, true);
 								// add to lang array
-								$this->langContent[$this->lang][$langValue] = $option;
+								$this->setLangContent($this->lang, $langValue, $option);
 								// no add to option set
 								$optionXML->addAttribute('value', $option);
 								$optionArray[$option] = $langValue;
@@ -1652,9 +1652,9 @@ class Fields extends Structure
 						{
 							// has other value then text
 							list($v, $t) = explode('|', $value);
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($t, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($t, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $t;
+							$this->setLangContent($this->lang, $langValue, $t);
 							// no add to option set
 							$optionXML->addAttribute('value', $v);
 							$optionArray[$v] = $langValue;
@@ -1662,9 +1662,9 @@ class Fields extends Structure
 						else
 						{
 							// text is also the value
-							$langValue = $langView . '_' . ComponentbuilderHelper::safeString($value, 'U');
+							$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($value, true);
 							// add to lang array
-							$this->langContent[$this->lang][$langValue] = $value;
+							$this->setLangContent($this->lang, $langValue, $value);
 							// no add to option set
 							$optionXML->addAttribute('value', $value);
 							$optionArray[$value] = $langValue;
@@ -1683,7 +1683,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
 
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1697,7 +1697,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". A None Database Field. (joomla)";
 
 			foreach ($fieldAttributes as $property => $value)
 			{
@@ -1714,7 +1714,7 @@ class Fields extends Structure
 			{
 				// now add to the field set
 				$field->fieldXML = new SimpleXMLElement('<field/>');
-				$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (depreciated)";
+				$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (depreciated)";
 
 				foreach ($fieldAttributes as $property => $value)
 				{
@@ -1791,9 +1791,9 @@ class Fields extends Structure
 									// now add to the field set
 									ComponentbuilderHelper::xmlAppend($fieldSetXML, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 									// set lang (just incase)
-									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+									$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 									// add to lang array
-									$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+									$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 									// if label was set use instead
 									if (ComponentbuilderHelper::checkString($r_langLabel))
 									{
@@ -1814,7 +1814,7 @@ class Fields extends Structure
 			{
 				// now add to the field set
 				$field->fieldXML = new SimpleXMLElement('<field/>');
-				$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
+				$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (joomla)";
 				// add all properties
 				foreach ($fieldAttributes as $property => $value)
 				{
@@ -1918,9 +1918,9 @@ class Fields extends Structure
 										// now add to the field set
 										ComponentbuilderHelper::xmlAppend($form, $this->setField('custom', $r_fieldValues, $r_name, $r_typeName, $langView, $view_name_single, $view_name_list, $placeholders, $r_optionArray));
 										// set lang (just incase)
-										$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeString($r_name, 'U');
+										$r_listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($r_name, true);
 										// add to lang array
-										$this->langContent[$this->lang][$r_listLangName] = ComponentbuilderHelper::safeString($r_name, 'W');
+										$this->setLangContent($this->lang, $r_listLangName, ComponentbuilderHelper::safeString($r_name, 'W'));
 										// if label was set use instead
 										if (ComponentbuilderHelper::checkString($r_langLabel))
 										{
@@ -1942,7 +1942,7 @@ class Fields extends Structure
 		{
 			// now add to the field set
 			$field->fieldXML = new SimpleXMLElement('<field/>');
-			$field->comment = $this->setLine(__LINE__) . " " . ComponentbuilderHelper::safeString($name, 'F') . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom)";
+			$field->comment = $this->setLine(__LINE__) . " " . ucfirst($name) . " Field. Type: " . ComponentbuilderHelper::safeString($typeName, 'F') . ". (custom)";
 			foreach ($fieldAttributes as $property => $value)
 			{
 				if ($property != 'option')
@@ -2328,9 +2328,9 @@ class Fields extends Structure
 						$customLabel = $xmlValue;
 					}
 					// set lang key
-					$langValue = $langView . '_' . ComponentbuilderHelper::safeString($name . ' ' . $property['name'], 'U');
+					$langValue = $langView . '_' . ComponentbuilderHelper::safeFieldName($name . ' ' . $property['name'], true);
 					// add to lang array
-					$this->langContent[$this->lang][$langValue] = $xmlValue;
+					$this->setLangContent($this->lang, $langValue, $xmlValue);
 					// use lang value
 					$xmlValue = $langValue;
 				}
@@ -2560,16 +2560,16 @@ class Fields extends Structure
 				$tempName = $view_name_single . ' category';
 			}
 			// set lang
-			$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
+			$listLangName = $langView . '_' . ComponentbuilderHelper::safeFieldName($tempName, true);
 			// add to lang array
-			$this->langContent[$this->lang][$listLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
+			$this->setLangContent($this->lang, $listLangName, ComponentbuilderHelper::safeString($tempName, 'W'));
 		}
 		else
 		{
 			// set lang (just incase)
-			$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
+			$listLangName = $langView . '_' .ComponentbuilderHelper::safeFieldName($name, true);
 			// add to lang array
-			$this->langContent[$this->lang][$listLangName] = ComponentbuilderHelper::safeString($name, 'W');
+			$this->setLangContent($this->lang, $listLangName, ComponentbuilderHelper::safeString($name, 'W'));
 			// if label was set use instead
 			if (ComponentbuilderHelper::checkString($langLabel))
 			{
@@ -3009,9 +3009,9 @@ class Fields extends Structure
 					// temp holder for name
 					$tempName = $data['custom']['label'] . ' Group';
 					// set lang
-					$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($tempName, 'U');
+					$groupLangName = $this->langPrefix . '_' . ComponentbuilderHelper::safeFieldName($tempName, true);
 					// add to lang array
-					$this->langContent[$this->lang][$groupLangName] = ComponentbuilderHelper::safeString($tempName, 'W');
+					$this->setLangContent($this->lang, $groupLangName, ComponentbuilderHelper::safeString($tempName, 'W'));
 					// build the Group Control
 					$this->setGroupControl[$data['type']] = $groupLangName;
 					// JFORM_GETGROUPS_PHP <<<DYNAMIC>>>
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 0dcdffe72..cc60884ad 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -1487,9 +1487,9 @@ class Interpretation extends Fields
 		{
 			// set the lang
 			$lang = ComponentbuilderHelper::safeString('com_' . $this->componentCodeName . '_menu_' . $viewName_single, 'U');
-			$this->langContent['adminsys'][$lang . '_TITLE'] = 'Create ' . $view['settings']->name_single;
-			$this->langContent['adminsys'][$lang . '_OPTION'] = 'Create ' . $view['settings']->name_single;
-			$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->short_description;
+			$this->setLangContent('adminsys', $lang . '_TITLE', 'Create ' . $view['settings']->name_single);
+			$this->setLangContent('adminsys', $lang . '_OPTION', 'Create ' . $view['settings']->name_single);
+			$this->setLangContent('adminsys', $lang . '_DESC', $view['settings']->short_description);
 			//start loading xml
 			$xml = '<?xml version="1.0" encoding="utf-8" ?>';
 			$xml .= PHP_EOL . '<metadata>';
@@ -1517,9 +1517,9 @@ class Interpretation extends Fields
 		{
 			// set the lang
 			$lang = ComponentbuilderHelper::safeString('com_' . $this->componentCodeName . '_menu_' . $view['settings']->code, 'U');
-			$this->langContent['adminsys'][$lang . '_TITLE'] = $view['settings']->name;
-			$this->langContent['adminsys'][$lang . '_OPTION'] = $view['settings']->name;
-			$this->langContent['adminsys'][$lang . '_DESC'] = $view['settings']->description;
+			$this->setLangContent('adminsys', $lang . '_TITLE', $view['settings']->name);
+			$this->setLangContent('adminsys', $lang . '_OPTION', $view['settings']->name);
+			$this->setLangContent('adminsys', $lang . '_DESC',  $view['settings']->description);
 			//start loading xml
 			$xml = '<?xml version="1.0" encoding="utf-8" ?>';
 			$xml .= PHP_EOL . '<metadata>';
@@ -2330,10 +2330,7 @@ class Interpretation extends Fields
 			$accessCheck[] = $this->_t(3) . "\$app = JFactory::getApplication();";
 			// set lang
 			$langKeyWord = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Not authorised to view ' . $view['settings']->code . '!', 'U');
-			if (!isset($this->langContent['site'][$langKeyWord]))
-			{
-				$this->langContent['site'][$langKeyWord] = 'Not authorised to view ' . $view['settings']->code . '!';
-			}
+			$this->setLangContent('site', $langKeyWord, 'Not authorised to view ' . $view['settings']->code . '!');
 			$accessCheck[] = $this->_t(3) . "\$app->enqueueMessage(JText:" . ":_('" . $langKeyWord . "'), 'error');";
 			$accessCheck[] = $redirectMessage;
 			$accessCheck[] = $this->_t(3) . "\$app->redirect(" . $redirectString . ");";
@@ -2412,10 +2409,7 @@ class Interpretation extends Fields
 			{
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "\$app = JFactory::getApplication();";
 				$langKeyWoord = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Not found or access denied', 'U');
-				if (!isset($this->langContent[$this->lang][$langKeyWoord]))
-				{
-					$this->langContent[$this->lang][$langKeyWoord] = 'Not found, or access denied.';
-				}
+				$this->setLangContent($this->lang, $langKeyWoord, 'Not found, or access denied.');
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "//" . $this->setLine(__LINE__) . " If no data is found redirect to default page and show warning.";
 				$getItem .= PHP_EOL . $this->_t(1) . $tab . $this->_t(2) . "\$app->enqueueMessage(JText:" . ":_('" . $langKeyWoord . "'), 'warning');";
 				if ('site' === $this->target)
@@ -3608,7 +3602,7 @@ class Interpretation extends Fields
 					// Load to lang
 					$keyLang = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($custom_button['name'], 'U');
 					$keyCode = ComponentbuilderHelper::safeString($custom_button['name']);
-					$this->langContent[$this->lang][$keyLang] = trim($custom_button['name']);
+					$this->setLangContent($this->lang, $keyLang, $custom_button['name']);
 					// load the button
 					if (3 !== $type && ($custom_button['target'] != 2 || $this->target === 'site'))
 					{
@@ -6541,83 +6535,83 @@ class Interpretation extends Fields
 		// Trigger Event: jcb_ce_onBeforeBuildAdminLang
 		$this->triggerEvent('jcb_ce_onBeforeBuildAdminLang', array(&$this->componentContext, &$this->langContent['admin'], &$this->langPrefix, &$componentName));
 		// start loding the defaults
-		$this->langContent['adminsys'][$this->langPrefix] = $componentName;
-		$this->langContent['adminsys'][$this->langPrefix . '_CONFIGURATION'] = $componentName . ' Configuration';
-		$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';
-		$this->langContent['admin'][$this->langPrefix . '_DATE'] = 'Date';
-		$this->langContent['admin'][$this->langPrefix . '_AUTHOR'] = 'Author';
-		$this->langContent['admin'][$this->langPrefix . '_WEBSITE'] = 'Website';
-		$this->langContent['admin'][$this->langPrefix . '_LICENSE'] = 'License';
-		$this->langContent['admin'][$this->langPrefix . '_CONTRIBUTORS'] = 'Contributors';
-		$this->langContent['admin'][$this->langPrefix . '_CONTRIBUTOR'] = 'Contributor';
-		$this->langContent['admin'][$this->langPrefix . '_DASHBOARD'] = $componentName . ' Dashboard';
-		$this->langContent['admin'][$this->langPrefix . '_SAVE_SUCCESS'] = "Great! Item successfully saved.";
-		$this->langContent['admin'][$this->langPrefix . '_SAVE_WARNING'] = "The value already existed so please select another.";
-		$this->langContent['admin'][$this->langPrefix . '_HELP_MANAGER'] = "Help";
-		$this->langContent['admin'][$this->langPrefix . '_NEW'] = "New";
-		$this->langContent['admin'][$this->langPrefix . '_CLOSE_NEW'] = "Close & New";
-		$this->langContent['admin'][$this->langPrefix . '_CREATE_NEW_S'] = "Create New %s";
-		$this->langContent['admin'][$this->langPrefix . '_EDIT_S'] = "Edit %s";
-		$this->langContent['admin'][$this->langPrefix . '_KEEP_ORIGINAL_STATE'] = "- Keep Original State -";
-		$this->langContent['admin'][$this->langPrefix . '_KEEP_ORIGINAL_ACCESS'] = "- Keep Original Access -";
-		$this->langContent['admin'][$this->langPrefix . '_KEEP_ORIGINAL_CATEGORY'] = "- Keep Original Category -";
-		$this->langContent['admin'][$this->langPrefix . '_PUBLISHED'] = 'Published';
-		$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!";
+		$this->setLangContent('adminsys', $this->langPrefix, $componentName);
+		$this->setLangContent('adminsys', $this->langPrefix . '_CONFIGURATION', $componentName . ' Configuration');
+		$this->setLangContent('admin', $this->langPrefix, $componentName);
+		$this->setLangContent('admin', $this->langPrefix . '_BACK', 'Back');
+		$this->setLangContent('admin', $this->langPrefix . '_DASH', 'Dashboard');
+		$this->setLangContent('admin', $this->langPrefix . '_VERSION', 'Version');
+		$this->setLangContent('admin', $this->langPrefix . '_DATE', 'Date');
+		$this->setLangContent('admin', $this->langPrefix . '_AUTHOR', 'Author');
+		$this->setLangContent('admin', $this->langPrefix . '_WEBSITE', 'Website');
+		$this->setLangContent('admin', $this->langPrefix . '_LICENSE', 'License');
+		$this->setLangContent('admin', $this->langPrefix . '_CONTRIBUTORS', 'Contributors');
+		$this->setLangContent('admin', $this->langPrefix . '_CONTRIBUTOR', 'Contributor');
+		$this->setLangContent('admin', $this->langPrefix . '_DASHBOARD', $componentName . ' Dashboard');
+		$this->setLangContent('admin', $this->langPrefix . '_SAVE_SUCCESS', "Great! Item successfully saved.");
+		$this->setLangContent('admin', $this->langPrefix . '_SAVE_WARNING', "The value already existed so please select another.");
+		$this->setLangContent('admin', $this->langPrefix . '_HELP_MANAGER', "Help");
+		$this->setLangContent('admin', $this->langPrefix . '_NEW', "New");
+		$this->setLangContent('admin', $this->langPrefix . '_CLOSE_NEW', "Close & New");
+		$this->setLangContent('admin', $this->langPrefix . '_CREATE_NEW_S', "Create New %s");
+		$this->setLangContent('admin', $this->langPrefix . '_EDIT_S', "Edit %s");
+		$this->setLangContent('admin', $this->langPrefix . '_KEEP_ORIGINAL_STATE', "- Keep Original State -");
+		$this->setLangContent('admin', $this->langPrefix . '_KEEP_ORIGINAL_ACCESS', "- Keep Original Access -");
+		$this->setLangContent('admin', $this->langPrefix . '_KEEP_ORIGINAL_CATEGORY', "- Keep Original Category -");
+		$this->setLangContent('admin', $this->langPrefix . '_PUBLISHED', 'Published');
+		$this->setLangContent('admin', $this->langPrefix . '_INACTIVE', 'Inactive');
+		$this->setLangContent('admin', $this->langPrefix . '_ARCHIVED', 'Archived');
+		$this->setLangContent('admin', $this->langPrefix . '_TRASHED', 'Trashed');
+		$this->setLangContent('admin', $this->langPrefix . '_NO_ACCESS_GRANTED', "No Access Granted!");
+		$this->setLangContent('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 <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.</p></center>";
+			$this->setLangContent('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 <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.</p></center>");
 		}
 		// add the langug files needed to import and export data
 		if ($this->addEximport)
 		{
-			$this->langContent['admin'][$this->langPrefix . '_EXPORT_FAILED'] = "Export Failed";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FAILED'] = "Import Failed";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_TITLE'] = "Data Importer";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_NO_IMPORT_TYPE_FOUND'] = "Import type not found.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE'] = "Package to import not found.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_ERROR'] = "Import error.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SUCCESS'] = "Great! Import successful.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_WARNIMPORTFILE'] = "Warning, import file error.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_NO_FILE_SELECTED'] = "No import file selected.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_FILE'] = "Please select a file to import.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS'] = "Please link all columns.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY'] = "Please enter the file directory.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_WARNIMPORTUPLOADERROR'] = "Warning, import upload error.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY'] = "Please enter the file directory.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE'] = "Path does not have a valid file.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE'] = "Does not have a valid file type.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_ENTER_A_URL'] = "Please enter a url.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_MSG_INVALID_URL'] = "Invalid url.";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_CONTINUE'] = "Continue";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FROM_UPLOAD'] = "Upload";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SELECT_FILE'] = "Select File";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_UPLOAD_BOTTON'] = "Upload File";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FROM_DIRECTORY'] = "Directory";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SELECT_FILE_DIRECTORY'] = "Set the path to file";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_GET_BOTTON'] = "Get File";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FROM_URL'] = "URL";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_SELECT_FILE_URL'] = "Enter file URL";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_UPDATE_DATA'] = "Import Data";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_FORMATS_ACCEPTED'] = "formats accepted";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_LINK_FILE_TO_TABLE_COLUMNS'] = "Link File to Table Columns";
-			$this->langContent['admin'][$this->langPrefix . '_IMPORT_TABLE_COLUMNS'] = "Table Columns";
-			$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->setLangContent('admin', $this->langPrefix . '_EXPORT_FAILED', "Export Failed");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FAILED', "Import Failed");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_TITLE', "Data Importer");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_NO_IMPORT_TYPE_FOUND', "Import type not found.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE', "Package to import not found.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_ERROR', "Import error.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SUCCESS', "Great! Import successful.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_WARNIMPORTFILE', "Warning, import file error.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_NO_FILE_SELECTED', "No import file selected.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_FILE', "Please select a file to import.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_ALL_COLUMNS', "Please link all columns.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_SELECT_A_DIRECTORY', "Please enter the file directory.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_WARNIMPORTUPLOADERROR', "Warning, import upload error.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PLEASE_ENTER_A_PACKAGE_DIRECTORY', "Please enter the file directory.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_PATH_DOES_NOT_HAVE_A_VALID_PACKAGE', "Path does not have a valid file.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_DOES_NOT_HAVE_A_VALID_FILE_TYPE', "Does not have a valid file type.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_ENTER_A_URL', "Please enter a url.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_MSG_INVALID_URL', "Invalid url.");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_CONTINUE', "Continue");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FROM_UPLOAD', "Upload");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SELECT_FILE', "Select File");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_UPLOAD_BOTTON', "Upload File");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FROM_DIRECTORY', "Directory");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SELECT_FILE_DIRECTORY', "Set the path to file");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_GET_BOTTON', "Get File");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FROM_URL', "URL");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_SELECT_FILE_URL', "Enter file URL");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_UPDATE_DATA', "Import Data");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FORMATS_ACCEPTED', "formats accepted");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_LINK_FILE_TO_TABLE_COLUMNS', "Link File to Table Columns");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_TABLE_COLUMNS', "Table Columns");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_FILE_COLUMNS', "File Columns");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_PLEASE_SELECT_COLUMN', "-- Please Select Column --");
+			$this->setLangContent('admin', $this->langPrefix . '_IMPORT_IGNORE_COLUMN', "-- Ignore This Column --");
 		}
 		// check if the both array is set
 		if (isset($this->langContent['both']) && ComponentbuilderHelper::checkArray($this->langContent['both']))
 		{
 			foreach ($this->langContent['both'] as $keylang => $langval)
 			{
-				$this->langContent['admin'][$keylang] = $langval;
+				$this->setLangContent('admin', $keylang, $langval);
 			}
 		}
 		// check if the both admin array is set
@@ -6625,7 +6619,7 @@ class Interpretation extends Fields
 		{
 			foreach ($this->langContent['bothadmin'] as $keylang => $langval)
 			{
-				$this->langContent['admin'][$keylang] = $langval;
+				$this->setLangContent('admin', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['admin']) && ComponentbuilderHelper::checkArray($this->langContent['admin']))
@@ -6651,33 +6645,33 @@ class Interpretation extends Fields
 		// Trigger Event: jcb_ce_onBeforeBuildSiteLang
 		$this->triggerEvent('jcb_ce_onBeforeBuildSiteLang', array(&$this->componentContext, &$this->langContent['site'], &$this->langPrefix, &$componentName));
 		// add final list of needed lang strings
-		$this->langContent['site'][$this->langPrefix] = $componentName;
+		$this->setLangContent('site', $this->langPrefix, $componentName);
 		// some more defaults
-		$this->langContent['site']['JTOOLBAR_APPLY'] = "Save";
-		$this->langContent['site']['JTOOLBAR_SAVE_AS_COPY'] = "Save as Copy";
-		$this->langContent['site']['JTOOLBAR_SAVE'] = "Save & Close";
-		$this->langContent['site']['JTOOLBAR_SAVE_AND_NEW'] = "Save & New";
-		$this->langContent['site']['JTOOLBAR_CANCEL'] = "Cancel";
-		$this->langContent['site']['JTOOLBAR_CLOSE'] = "Close";
-		$this->langContent['site']['JTOOLBAR_HELP'] = "Help";
-		$this->langContent['site']['JGLOBAL_FIELD_ID_LABEL'] = "ID";
-		$this->langContent['site']['JGLOBAL_FIELD_ID_DESC'] = "Record number in the database.";
-		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_LABEL'] = "Modified Date";
-		$this->langContent['site']['COM_CONTENT_FIELD_MODIFIED_DESC'] = "The last date this item was modified.";
-		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_LABEL'] = "Modified By";
-		$this->langContent['site']['JGLOBAL_FIELD_MODIFIED_BY_DESC'] = "The user who did the last modification.";
-		$this->langContent['site'][$this->langPrefix . '_NEW'] = "New";
-		$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!";
+		$this->setLangContent('site', 'JTOOLBAR_APPLY', "Save");
+		$this->setLangContent('site', 'JTOOLBAR_SAVE_AS_COPY', "Save as Copy");
+		$this->setLangContent('site', 'JTOOLBAR_SAVE', "Save & Close");
+		$this->setLangContent('site', 'JTOOLBAR_SAVE_AND_NEW', "Save & New");
+		$this->setLangContent('site', 'JTOOLBAR_CANCEL', "Cancel");
+		$this->setLangContent('site', 'JTOOLBAR_CLOSE', "Close");
+		$this->setLangContent('site', 'JTOOLBAR_HELP', "Help");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_ID_LABEL', "ID");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_ID_DESC', "Record number in the database.");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_MODIFIED_LABEL', "Modified Date");
+		$this->setLangContent('site', 'COM_CONTENT_FIELD_MODIFIED_DESC', "The last date this item was modified.");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_MODIFIED_BY_LABEL', "Modified By");
+		$this->setLangContent('site', 'JGLOBAL_FIELD_MODIFIED_BY_DESC', "The user who did the last modification.");
+		$this->setLangContent('site', $this->langPrefix . '_NEW', "New");
+		$this->setLangContent('site', $this->langPrefix . '_CREATE_NEW_S', "Create New %s");
+		$this->setLangContent('site', $this->langPrefix . '_EDIT_S', "Edit %s");
+		$this->setLangContent('site', $this->langPrefix . '_NO_ACCESS_GRANTED', "No Access Granted!");
+		$this->setLangContent('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']))
 		{
 			foreach ($this->langContent['both'] as $keylang => $langval)
 			{
-				$this->langContent['site'][$keylang] = $langval;
+				$this->setLangContent('site', $keylang, $langval);
 			}
 		}
 		// check if the both site array is set
@@ -6685,7 +6679,7 @@ class Interpretation extends Fields
 		{
 			foreach ($this->langContent['bothsite'] as $keylang => $langval)
 			{
-				$this->langContent['site'][$keylang] = $langval;
+				$this->setLangContent('site', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['site']) && ComponentbuilderHelper::checkArray($this->langContent['site']))
@@ -6711,16 +6705,16 @@ class Interpretation extends Fields
 		// Trigger Event: jcb_ce_onBeforeBuildSiteSysLang
 		$this->triggerEvent('jcb_ce_onBeforeBuildSiteSysLang', array(&$this->componentContext, &$this->langContent['sitesys'], &$this->langPrefix, &$componentName));
 		// add final list of needed lang strings
-		$this->langContent['sitesys'][$this->langPrefix] = $componentName;
-		$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!";
+		$this->setLangContent('sitesys', $this->langPrefix, $componentName);
+		$this->setLangContent('sitesys', $this->langPrefix . '_NO_ACCESS_GRANTED', "No Access Granted!");
+		$this->setLangContent('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']))
 		{
 			foreach ($this->langContent['bothsite'] as $keylang => $langval)
 			{
-				$this->langContent['sitesys'][$keylang] = $langval;
+				$this->setLangContent('sitesys', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['sitesys']) && ComponentbuilderHelper::checkArray($this->langContent['sitesys']))
@@ -6750,7 +6744,7 @@ class Interpretation extends Fields
 		{
 			foreach ($this->langContent['bothadmin'] as $keylang => $langval)
 			{
-				$this->langContent['adminsys'][$keylang] = $langval;
+				$this->setLangContent('adminsys', $keylang, $langval);
 			}
 		}
 		if (isset($this->langContent['adminsys']) && ComponentbuilderHelper::checkArray($this->langContent['adminsys']))
@@ -7384,15 +7378,9 @@ class Interpretation extends Fields
 			// set id lang
 			$idLangName = $langView . '_ID';
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$statusLangName]))
-			{
-				$this->langContent[$this->lang][$statusLangName] = 'Status';
-			}
+			$this->setLangContent($this->lang, $statusLangName, 'Status');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$idLangName]))
-			{
-				$this->langContent[$this->lang][$idLangName] = 'Id';
-			}
+			$this->setLangContent($this->lang, $idLangName, 'Id');
 			// set default
 			$head = '<tr>';
 			$head .= PHP_EOL . $this->_t(1) . "<?php if (\$this->canEdit&& \$this->canState): ?>";
@@ -7777,10 +7765,7 @@ class Interpretation extends Fields
 			/// set the values to use in search latter
 			$searchTabs[$tabCodeName] = $tabNr;
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$tabLangName]))
-			{
-				$this->langContent[$this->lang][$tabLangName] = $tabName;
-			}
+			$this->setLangContent($this->lang, $tabLangName, $tabName);
 			// check if linked view belongs to this tab
 			$buildLayout = true;
 			$linkedViewId = '';
@@ -7988,10 +7973,7 @@ class Interpretation extends Fields
 		// set default publishing tab lang
 		$tabLangName = $langView . '_PUBLISHING';
 		// add to lang array
-		if (!isset($this->langContent[$this->lang][$tabLangName]))
-		{
-			$this->langContent[$this->lang][$tabLangName] = 'Publishing';
-		}
+		$this->setLangContent($this->lang, $tabLangName, 'Publishing');
 		// the default publishing items
 		$items = array('left' => array(), 'right' => array());
 		// Setup the default (custom) fields
@@ -8194,10 +8176,7 @@ class Interpretation extends Fields
 			// set permissions tab code name
 			$tabCodeName = 'permissions';
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$tabLangName]))
-			{
-				$this->langContent[$this->lang][$tabLangName] = 'Permissions';
-			}
+			$this->setLangContent($this->lang, $tabLangName, 'Permissions');
 			// set the permissions tab
 			$tabs .= PHP_EOL . PHP_EOL . $this->_t(1) . "<?php if (\$this->canDo->get('core.admin')) : ?>";
 			$tabs .= PHP_EOL . $this->_t(1) . "<?php echo JHtml::_('bootstrap.addTab', '" . $view_name_single . "Tab', '" . $tabCodeName . "', JText:" . ":_('" . $tabLangName . "', true)); ?>";
@@ -8705,15 +8684,9 @@ class Interpretation extends Fields
 			// make sure only first link is used as togeler
 			$firstLink = true;
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$statusLangName]))
-			{
-				$this->langContent[$this->lang][$statusLangName] = 'Status';
-			}
+			$this->setLangContent($this->lang, $statusLangName, 'Status');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$idLangName]))
-			{
-				$this->langContent[$this->lang][$idLangName] = 'Id';
-			}
+			$this->setLangContent($this->lang, $idLangName, 'Id');
 			$head .= PHP_EOL . $this->_t(1) . "<tr>";
 			// set controller for data hiding options
 			$controller = 1;
@@ -9089,7 +9062,7 @@ class Interpretation extends Fields
 			{
 				// Load to lang
 				$keyLang = $this->langPrefix . '_' . $custom_button['NAME'];
-				$this->langContent[$this->lang][$keyLang] = ComponentbuilderHelper::safeString($custom_button['name'], 'Ww');
+				$this->setLangContent($this->lang, $keyLang, ComponentbuilderHelper::safeString($custom_button['name'], 'Ww'));
 				// add cpanel button
 				$buttons[] = $this->_t(2) . "if (\$this->canDo->get('" . $custom_button['link'] . ".access'))";
 				$buttons[] = $this->_t(2) . "{";
@@ -9143,10 +9116,7 @@ class Interpretation extends Fields
 				$method[] = $this->_t(1) . "}";
 				// add to lang array
 				$lankey = $this->langPrefix . "_ACCESS_TO_" . $custom_button['NAME'] . "_FAILED";
-				if (!isset($this->langContent[$this->lang][$lankey]))
-				{
-					$this->langContent[$this->lang][$lankey] = 'Access to ' . $custom_button['link'] . ' was denied.';
-				}
+				$this->setLangContent($this->lang, $lankey, 'Access to ' . $custom_button['link'] . ' was denied.');
 			}
 
 			return implode(PHP_EOL, $method);
@@ -9288,10 +9258,7 @@ class Interpretation extends Fields
 			$method[] = $this->_t(4) . "//" . $this->setLine(__LINE__) . " Redirect to import view.";
 			// add to lang array
 			$selectImportFileNote = $this->langPrefix . "_IMPORT_SELECT_FILE_FOR_" . ComponentbuilderHelper::safeString($viewName_list, 'U');
-			if (!isset($this->langContent[$this->lang][$selectImportFileNote]))
-			{
-				$this->langContent[$this->lang][$selectImportFileNote] = 'Select the file to import data to ' . $viewName_list . '.';
-			}
+			$this->setLangContent($this->lang, $selectImportFileNote, 'Select the file to import data to ' . $viewName_list . '.');
 			$method[] = $this->_t(4) . "\$message = JText:" . ":_('" . $selectImportFileNote . "');";
 			// if this view has custom script it must have as custom import (model, veiw, controller)
 			if (isset($this->importCustomScripts[$viewName_list]) && $this->importCustomScripts[$viewName_list])
@@ -9323,10 +9290,7 @@ class Interpretation extends Fields
 			// main lang prefix
 			$langExport = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Export Data', 'U');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$langExport]))
-			{
-				$this->langContent[$this->lang][$langExport] = 'Export Data';
-			}
+			$this->setLangContent($this->lang, $langExport, 'Export Data');
 			$button = array();
 			$button[] = PHP_EOL . PHP_EOL . $this->_t(3) . "if (\$this->canDo->get('core.export') && \$this->canDo->get('" . $viewName_single . ".export'))";
 			$button[] = $this->_t(3) . "{";
@@ -9345,10 +9309,7 @@ class Interpretation extends Fields
 			// main lang prefix
 			$langImport = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U');
 			// add to lang array
-			if (!isset($this->langContent[$this->lang][$langImport]))
-			{
-				$this->langContent[$this->lang][$langImport] = 'Import Data';
-			}
+			$this->setLangContent($this->lang, $langImport, 'Import Data');
 			$button = array();
 			$button[] = PHP_EOL . PHP_EOL . $this->_t(2) . "if (\$this->canDo->get('core.import') && \$this->canDo->get('" . $viewName_single . ".import'))";
 			$button[] = $this->_t(2) . "{";
@@ -12330,7 +12291,7 @@ class Interpretation extends Fields
 			// set lang strings
 			$viewNameLang_readonly = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single . ' readonly', 'U');
 			// load to lang
-			$this->langContent[$this->lang][$viewNameLang_readonly] = $view['settings']->name_single . ' :: Readonly';
+			$this->setLangContent($this->lang, $viewNameLang_readonly, $view['settings']->name_single . ' :: Readonly');
 
 			// build toolbar
 			$toolBar = "JFactory::getApplication()->input->set('hidemainmenu', true);";
@@ -12343,8 +12304,8 @@ class Interpretation extends Fields
 			$viewNameLang_new = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single . ' New', 'U');
 			$viewNameLang_edit = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($view['settings']->name_single . ' Edit', 'U');
 			// load to lang
-			$this->langContent[$this->lang][$viewNameLang_new] = 'A New ' . $view['settings']->name_single;
-			$this->langContent[$this->lang][$viewNameLang_edit] = 'Editing the ' . $view['settings']->name_single;
+			$this->setLangContent($this->lang, $viewNameLang_new, 'A New ' . $view['settings']->name_single);
+			$this->setLangContent($this->lang, $viewNameLang_edit, 'Editing the ' . $view['settings']->name_single);
 			// build toolbar
 			$toolBar = "JFactory::getApplication()->input->set('hidemainmenu', true);";
 			$toolBar .= PHP_EOL . $this->_t(2) . "\$user = JFactory::getUser();";
@@ -13212,7 +13173,7 @@ class Interpretation extends Fields
 					$langName = 'Add&nbsp;' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'W') . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . ComponentbuilderHelper::safeString($view['settings']->name_single, 'U') . '_ADD';
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					$counter++;
 				}
 				if (isset($view['dashboard_list']) && $view['dashboard_list'] == 1)
@@ -13240,7 +13201,7 @@ class Interpretation extends Fields
 					$langName = ComponentbuilderHelper::safeString($view['settings']->name_list, 'W') . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					$counter++;
 				}
 				if (isset($this->categoryBuilder[$name_list]) && ComponentbuilderHelper::checkArray($this->categoryBuilder[$name_list]))
@@ -13265,7 +13226,7 @@ class Interpretation extends Fields
 					{
 						// add to lang
 						$langKey = $this->langPrefix . '_DASHBOARD_' . ComponentbuilderHelper::safeString($otherViews, 'U') . '_' . ComponentbuilderHelper::safeString($catCode, 'U');
-						$this->langContent[$this->lang][$langKey] = $langName;
+						$this->setLangContent($this->lang, $langKey, $langName);
 						// get image type
 						$type = ComponentbuilderHelper::imageInfo($view['settings']->icon_category);
 						if ($type)
@@ -13482,7 +13443,7 @@ class Interpretation extends Fields
 					$langName = $menu['settings']->name . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $menu['settings']->CODE;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					// set icon
 					if ($counter == 0)
 					{
@@ -13512,7 +13473,7 @@ class Interpretation extends Fields
 					$langName = $menu['settings']->name . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $menu['settings']->CODE;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 					// set icon
 					$this->lastCustomDashboardIcon[$nr] = ", '" . $type . $menu['settings']->code . "'";
 				}
@@ -13542,7 +13503,7 @@ class Interpretation extends Fields
 					$langName = $menu['name'] . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $nameUpper;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 
 					// if this is a link build the icon values with pipe
 					if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
@@ -13590,7 +13551,7 @@ class Interpretation extends Fields
 					$langName = $menu['name'] . '<br /><br />';
 					$langKey = $this->langPrefix . '_DASHBOARD_' . $nameUpper;
 					// add to lang
-					$this->langContent[$this->lang][$langKey] = $langName;
+					$this->setLangContent($this->lang, $langKey, $langName);
 
 					// if this is a link build the icon values with pipe
 					if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
@@ -13622,7 +13583,7 @@ class Interpretation extends Fields
 			if (!ComponentbuilderHelper::checkString($this->dynamicDashboard))
 			{
 				$menus .= "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_DASHBOARD'), 'index.php?option=com_" . $codeName . "&view=" . $codeName . "', \$submenu === '" . $codeName . "');";
-				$this->langContent[$this->lang][$lang . '_DASHBOARD'] = 'Dashboard';
+				$this->setLangContent($this->lang, $lang . '_DASHBOARD', 'Dashboard');
 			}
 			$catArray = array();
 			foreach ($this->componentData->admin_views as $view)
@@ -13651,7 +13612,7 @@ class Interpretation extends Fields
 						$tab = $this->_t(1);
 					}
 					$menus .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), 'index.php?option=com_" . $codeName . "&view=" . $nameList . "', \$submenu === '" . $nameList . "');";
-					$this->langContent[$this->lang][$lang . "_" . $nameUpper] = $view['settings']->name_list;
+					$this->setLangContent($this->lang, $lang . "_" . $nameUpper, $view['settings']->name_list);
 					// check if category has another name
 					if (isset($this->catOtherName[$nameList]) && ComponentbuilderHelper::checkArray($this->catOtherName[$nameList]))
 					{
@@ -13693,8 +13654,8 @@ class Interpretation extends Fields
 					$menus .= PHP_EOL . $this->_t(3) . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "_FIELDS'), 'index.php?option=com_fields&context=com_" . $codeName . "." . $nameSingle . "', \$submenu === 'fields.fields');";
 					$menus .= PHP_EOL . $this->_t(3) . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "_FIELDS_GROUPS'), 'index.php?option=com_fields&view=groups&context=com_" . $codeName . "." . $nameSingle . "', \$submenu === 'fields.groups');";
 					$menus .= PHP_EOL . $this->_t(2) . "}";
-					$this->langContent[$this->lang][$lang . "_" . $nameUpper . "_FIELDS"] = $view['settings']->name_list . ' Fields';
-					$this->langContent[$this->lang][$lang . "_" . $nameUpper . "_FIELDS_GROUPS"] = $view['settings']->name_list . ' Field Groups';
+					$this->setLangContent($this->lang, $lang . "_" . $nameUpper . "_FIELDS", $view['settings']->name_list . ' Fields');
+					$this->setLangContent($this->lang, $lang . "_" . $nameUpper . "_FIELDS_GROUPS", $view['settings']->name_list . ' Field Groups');
 					// build uninstall script for fields
 					$this->uninstallScriptBuilder[$nameSingle] = 'com_' . $codeName . '.' . $nameSingle;
 					$this->uninstallScriptFields[$nameSingle] = $nameSingle;
@@ -13793,13 +13754,13 @@ class Interpretation extends Fields
 			if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
 			{
 
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$custom .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), '" . $menu['link'] . "', \$submenu === '" . $nameList . "');";
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$custom .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), 'index.php?option=com_" . $codeName . "&view=" . $nameList . "', \$submenu === '" . $nameList . "');";
 			}
@@ -13837,13 +13798,13 @@ class Interpretation extends Fields
 			}
 			if (isset($menu['link']) && ComponentbuilderHelper::checkString($menu['link']))
 			{
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), '" . $menu['link'] . "', \$submenu === '" . $nameList . "');";
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_' . $nameUpper] = $name;
+				$this->setLangContent($this->lang, $lang . '_' . $nameUpper, $name);
 				// add custom menu
 				$this->lastCustomSubMenu[$nr] .= PHP_EOL . $this->_t(2) . $tab . "JHtmlSidebar::addEntry(JText:" . ":_('" . $lang . "_" . $nameUpper . "'), 'index.php?option=com_" . $codeName . "&view=" . $nameList . "', \$submenu === '" . $nameList . "');";
 			}
@@ -13886,11 +13847,11 @@ class Interpretation extends Fields
 			// add the prefix
 			if ($addPrefix == 1)
 			{
-				$this->langContent['adminsys'][$lang] = $prefix . $this->componentData->name;
+				$this->setLangContent('adminsys', $lang, $prefix . $this->componentData->name);
 			}
 			else
 			{
-				$this->langContent['adminsys'][$lang] = $this->componentData->name;
+				$this->setLangContent('adminsys', $lang, $this->componentData->name);
 			}
 			// loop over the admin views
 			foreach ($this->componentData->admin_views as $view)
@@ -13902,7 +13863,7 @@ class Interpretation extends Fields
 					$nameList = ComponentbuilderHelper::safeString($view['settings']->name_list);
 					$nameUpper = ComponentbuilderHelper::safeString($view['settings']->name_list, 'U');
 					$menus .= PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $nameList . '">' . $lang . '_' . $nameUpper . '</menu>';
-					$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $view['settings']->name_list;
+					$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $view['settings']->name_list);
 				}
 			}
 			if (isset($this->lastCustomMainMenu) && ComponentbuilderHelper::checkArray($this->lastCustomMainMenu))
@@ -13930,13 +13891,13 @@ class Interpretation extends Fields
 				{
 					if (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && $view['adminview'] == $menu['before'])
 					{
-						$this->langContent['adminsys'][$lang . '_' . $menu['settings']->CODE] = $menu['settings']->name;
+						$this->setLangContent('adminsys', $lang . '_' . $menu['settings']->CODE, $menu['settings']->name);
 						// add custom menu
 						$customMenu .= PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $menu['settings']->code . '">' . $lang . '_' . $menu['settings']->CODE . '</menu>';
 					}
 					elseif (isset($menu['mainmenu']) && $menu['mainmenu'] == 1 && empty($menu['before']))
 					{
-						$this->langContent['adminsys'][$lang . '_' . $menu['settings']->CODE] = $menu['settings']->name;
+						$this->setLangContent('adminsys', $lang . '_' . $menu['settings']->CODE, $menu['settings']->name);
 						// add custom menu
 						$this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $menu['settings']->code . '">' . $lang . '_' . $menu['settings']->CODE . '</menu>';
 					}
@@ -13955,7 +13916,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// sanitize url
 						if (strpos($menu['link'], 'http') === false)
 						{
@@ -13977,7 +13938,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name_code']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// add custom menu
 						$customMenu .= PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $nameList . '">' . $lang . '_' . $nameUpper . '</menu>';
 					}
@@ -13988,7 +13949,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// sanitize url
 						if (strpos($menu['link'], 'http') === false)
 						{
@@ -14010,7 +13971,7 @@ class Interpretation extends Fields
 					{
 						$nameList = ComponentbuilderHelper::safeString($menu['name_code']);
 						$nameUpper = ComponentbuilderHelper::safeString($menu['name_code'], 'U');
-						$this->langContent['adminsys'][$lang . '_' . $nameUpper] = $menu['name'];
+						$this->setLangContent('adminsys', $lang . '_' . $nameUpper, $menu['name']);
 						// add custom menu
 						$this->lastCustomMainMenu[$nr] = PHP_EOL . $this->_t(3) . '<menu option="com_' . $codeName . '" view="' . $nameList . '">' . $lang . '_' . $nameUpper . '</menu>';
 					}
@@ -14271,7 +14232,7 @@ class Interpretation extends Fields
 				if (ComponentbuilderHelper::checkArray($bucket))
 				{
 					// setup lang
-					$this->langContent[$this->lang][$lang . '_' . $tabUpper] = $tab;
+					$this->setLangContent($this->lang, $lang . '_' . $tabUpper, $tab);
 					// start field set
 					$this->configFieldSets[] = $this->_t(1) . "<fieldset";
 					$this->configFieldSets[] = $this->_t(2) . 'name="' . $tabCode . '"';
@@ -14298,9 +14259,9 @@ class Interpretation extends Fields
 			$this->configFieldSets[] = $this->_t(2) . 'label="' . $lang . '_GROUPS_LABEL"';
 			$this->configFieldSets[] = $this->_t(2) . 'description="' . $lang . '_GROUPS_DESC">';
 			// setup lang
-			$this->langContent[$this->lang][$lang . '_GROUPS_LABEL'] = "Target Groups";
-			$this->langContent[$this->lang][$lang . '_GROUPS_DESC'] = "The Parameters for the targeted groups are set here.";
-			$this->langContent[$this->lang][$lang . '_TARGET_GROUP_DESC'] = "Set the group/s being targeted by this user type.";
+			$this->setLangContent($this->lang, $lang . '_GROUPS_LABEL', "Target Groups");
+			$this->setLangContent($this->lang, $lang . '_GROUPS_DESC', "The Parameters for the targeted groups are set here.");
+			$this->setLangContent($this->lang, $lang . '_TARGET_GROUP_DESC', "Set the group/s being targeted by this user type.");
 
 			foreach ($this->setGroupControl as $selector => $label)
 			{
@@ -14342,8 +14303,8 @@ class Interpretation extends Fields
 		$this->configFieldSets[] = $this->_t(2) . 'label="' . $lang . '_GLOBAL_LABEL"';
 		$this->configFieldSets[] = $this->_t(2) . 'description="' . $lang . '_GLOBAL_DESC">';
 		// setup lang
-		$this->langContent[$this->lang][$lang . '_GLOBAL_LABEL'] = "Global";
-		$this->langContent[$this->lang][$lang . '_GLOBAL_DESC'] = "The Global Parameters";
+		$this->setLangContent($this->lang, $lang . '_GLOBAL_LABEL', "Global");
+		$this->setLangContent($this->lang, $lang . '_GLOBAL_DESC', "The Global Parameters");
 		// add auto checin if required
 		if ($this->addCheckin)
 		{
@@ -14368,14 +14329,14 @@ class Interpretation extends Fields
 			$this->configFieldSets[] = $this->_t(2) . "</field>";
 			$this->configFieldSets[] = $this->_t(2) . '<field type="spacer" name="spacerAuthor" hr="true" />';
 			// setup lang
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_LABEL'] = "Check in timer";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_DESC'] = "Set the intervals for the auto checkin fuction of tables that checks out the items to an user.";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_ONE'] = "Every five hours";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_TWO'] = "Every twelve hours";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_THREE'] = "Once a day";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_FOUR'] = "Every second day";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_FIVE'] = "Once a week";
-			$this->langContent[$this->lang][$lang . '_CHECK_TIMER_OPTION_SIX'] = "Never";
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_LABEL', "Check in timer");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_DESC', "Set the intervals for the auto checkin fuction of tables that checks out the items to an user.");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_ONE', "Every five hours");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_TWO', "Every twelve hours");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_THREE', "Once a day");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_FOUR', "Every second day");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_FIVE', "Once a week");
+			$this->setLangContent($this->lang, $lang . '_CHECK_TIMER_OPTION_SIX', "Never");
 			// load the Global checkin defautls
 			$this->extensionsParams[] = '"check_in":"-1 day"';
 		}
@@ -14435,11 +14396,11 @@ class Interpretation extends Fields
 		$this->configFieldSets[] = $this->_t(3) . 'class="readonly"';
 		$this->configFieldSets[] = $this->_t(2) . "/>";
 		// setup lang
-		$this->langContent[$this->lang][$lang . '_AUTHOR'] = "Author Info";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_NAME_LABEL'] = "Author Name";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_NAME_DESC'] = "The name of the author of this component.";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_EMAIL_LABEL'] = "Author Email";
-		$this->langContent[$this->lang][$lang . '_AUTHOR_EMAIL_DESC'] = "The email address of the author of this component.";
+		$this->setLangContent($this->lang, $lang . '_AUTHOR', "Author Info");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_NAME_LABEL', "Author Name");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_NAME_DESC', "The name of the author of this component.");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_EMAIL_LABEL', "Author Email");
+		$this->setLangContent($this->lang, $lang . '_AUTHOR_EMAIL_DESC', "The email address of the author of this component.");
 		// set if contributors were added
 		$langCont = $lang . '_CONTRIBUTOR';
 		if (isset($this->addContributors) && $this->addContributors && isset($this->componentData->contributors) && ComponentbuilderHelper::checkArray($this->componentData->contributors))
@@ -14513,7 +14474,7 @@ class Interpretation extends Fields
 				$this->theContributors .= PHP_EOL . $this->_t(1) . "@" . strtolower($contributor['title']) . $this->_t(2) . $contributor['name'] . ' <' . $contributor['website'] . '>';
 				// setup lang
 				$Counter = ComponentbuilderHelper::safeString($counter, 'Ww');
-				$this->langContent[$this->lang][$langCont . '_' . $COUNTER] = "Contributor " . $Counter;
+				$this->setLangContent($this->lang, $langCont . '_' . $COUNTER, "Contributor " . $Counter);
 				// load the Global checkin defautls
 				$this->extensionsParams[] = '"titleContributor' . $counter . '":"' . $cbTitle . '"';
 				$this->extensionsParams[] = '"nameContributor' . $counter . '":"' . $cbName . '"';
@@ -14596,31 +14557,31 @@ class Interpretation extends Fields
 				$this->configFieldSets[] = $this->_t(2) . "</field>";
 				// setup lang
 				$Counter = ComponentbuilderHelper::safeString($counter, 'Ww');
-				$this->langContent[$this->lang][$langCont . '_' . $COUNTER] = "Contributor " . $Counter;
+				$this->setLangContent($this->lang, $langCont . '_' . $COUNTER, "Contributor " . $Counter);
 			}
 		}
 		if ($this->addContributors || $this->componentData->emptycontributors == 1)
 		{
 			// setup lang
-			$this->langContent[$this->lang][$langCont . '_TITLE_LABEL'] = "Contributor Job Title";
-			$this->langContent[$this->lang][$langCont . '_TITLE_DESC'] = "The job title that best describes the contributor's relationship to this component.";
-			$this->langContent[$this->lang][$langCont . '_NAME_LABEL'] = "Contributor Name";
-			$this->langContent[$this->lang][$langCont . '_NAME_DESC'] = "The name of this contributor.";
-			$this->langContent[$this->lang][$langCont . '_EMAIL_LABEL'] = "Contributor Email";
-			$this->langContent[$this->lang][$langCont . '_EMAIL_DESC'] = "The email of this contributor.";
-			$this->langContent[$this->lang][$langCont . '_LINK_LABEL'] = "Contributor Website";
-			$this->langContent[$this->lang][$langCont . '_LINK_DESC'] = "The link to this contributor's website.";
-			$this->langContent[$this->lang][$langCont . '_USE_LABEL'] = "Use";
-			$this->langContent[$this->lang][$langCont . '_USE_DESC'] = "How should we link to this contributor.";
-			$this->langContent[$this->lang][$langCont . '_USE_NONE'] = "None";
-			$this->langContent[$this->lang][$langCont . '_USE_EMAIL'] = "Email";
-			$this->langContent[$this->lang][$langCont . '_USE_WWW'] = "Website";
-			$this->langContent[$this->lang][$langCont . '_SHOW_LABEL'] = "Show";
-			$this->langContent[$this->lang][$langCont . '_SHOW_DESC'] = "Select where you want this contributor's details to show in the component.";
-			$this->langContent[$this->lang][$langCont . '_SHOW_NONE'] = "Hide";
-			$this->langContent[$this->lang][$langCont . '_SHOW_BACK'] = "Back-end";
-			$this->langContent[$this->lang][$langCont . '_SHOW_FRONT'] = "Front-end";
-			$this->langContent[$this->lang][$langCont . '_SHOW_ALL'] = "Both Front & Back-end";
+			$this->setLangContent($this->lang, $langCont . '_TITLE_LABEL', "Contributor Job Title");
+			$this->setLangContent($this->lang, $langCont . '_TITLE_DESC', "The job title that best describes the contributor's relationship to this component.");
+			$this->setLangContent($this->lang, $langCont . '_NAME_LABEL', "Contributor Name");
+			$this->setLangContent($this->lang, $langCont . '_NAME_DESC', "The name of this contributor.");
+			$this->setLangContent($this->lang, $langCont . '_EMAIL_LABEL', "Contributor Email");
+			$this->setLangContent($this->lang, $langCont . '_EMAIL_DESC', "The email of this contributor.");
+			$this->setLangContent($this->lang, $langCont . '_LINK_LABEL', "Contributor Website");
+			$this->setLangContent($this->lang, $langCont . '_LINK_DESC', "The link to this contributor's website.");
+			$this->setLangContent($this->lang, $langCont . '_USE_LABEL', "Use");
+			$this->setLangContent($this->lang, $langCont . '_USE_DESC', "How should we link to this contributor.");
+			$this->setLangContent($this->lang, $langCont . '_USE_NONE', "None");
+			$this->setLangContent($this->lang, $langCont . '_USE_EMAIL', "Email");
+			$this->setLangContent($this->lang, $langCont . '_USE_WWW', "Website");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_LABEL', "Show");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_DESC', "Select where you want this contributor's details to show in the component.");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_NONE', "Hide");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_BACK', "Back-end");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_FRONT', "Front-end");
+			$this->setLangContent($this->lang, $langCont . '_SHOW_ALL', "Both Front & Back-end");
 		}
 		// close that fieldset
 		$this->configFieldSets[] = $this->_t(1) . "</fieldset>";
@@ -14640,31 +14601,31 @@ class Interpretation extends Fields
 			// set tab lang
 			if (1 == $this->uikit)
 			{
-				$this->langContent[$this->lang][$lang . '_UIKIT_LABEL'] = "Uikit2 Settings";
-				$this->langContent[$this->lang][$lang . '_UIKIT_DESC'] = "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">https://getuikit.com/v2/</a>";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_LABEL', "Uikit2 Settings");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_DESC', "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">https://getuikit.com/v2/</a>");
 			}
 			elseif (2 == $this->uikit)
 			{
-				$this->langContent[$this->lang][$lang . '_UIKIT_LABEL'] = "Uikit2 and Uikit3 Settings";
-				$this->langContent[$this->lang][$lang . '_UIKIT_DESC'] = "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">version 2</a> or <a href=\"https://getuikit.com/\" target=\"_blank\">version 3</a>";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_LABEL', "Uikit2 and Uikit3 Settings");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_DESC', "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/v2/\" target=\"_blank\">version 2</a> or <a href=\"https://getuikit.com/\" target=\"_blank\">version 3</a>");
 			}
 			elseif (3 == $this->uikit)
 			{
-				$this->langContent[$this->lang][$lang . '_UIKIT_LABEL'] = "Uikit3 Settings";
-				$this->langContent[$this->lang][$lang . '_UIKIT_DESC'] = "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
-for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/\" target=\"_blank\">https://getuikit.com/</a>";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_LABEL', "Uikit3 Settings");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_DESC', "<b>The Parameters for the uikit are set here.</b><br />Uikit is a lightweight and modular front-end framework
+for developing fast and powerful web interfaces. For more info visit <a href=\"https://getuikit.com/\" target=\"_blank\">https://getuikit.com/</a>");
 			}
 
 			// add version selection
 			if (2 == $this->uikit)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_UIKIT_VERSION_LABEL'] = "Uikit Versions";
-				$this->langContent[$this->lang][$lang . '_UIKIT_VERSION_DESC'] = "Select what version you would like to use";
-				$this->langContent[$this->lang][$lang . '_UIKIT_V2'] = "Version 2";
-				$this->langContent[$this->lang][$lang . '_UIKIT_V3'] = "Version 3";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_VERSION_LABEL', "Uikit Versions");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_VERSION_DESC', "Select what version you would like to use");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_V2', "Version 2");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_V3', "Version 3");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_version"';
 				$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14683,12 +14644,12 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			}
 
 			// set field lang
-			$this->langContent[$this->lang][$lang . '_UIKIT_LOAD_LABEL'] = "Loading Options";
-			$this->langContent[$this->lang][$lang . '_UIKIT_LOAD_DESC'] = "Set the uikit loading option.";
-			$this->langContent[$this->lang][$lang . '_AUTO_LOAD'] = "Auto";
-			$this->langContent[$this->lang][$lang . '_FORCE_LOAD'] = "Force";
-			$this->langContent[$this->lang][$lang . '_DONT_LOAD'] = "Not";
-			$this->langContent[$this->lang][$lang . '_ONLY_EXTRA'] = "Only Extra";
+			$this->setLangContent($this->lang, $lang . '_UIKIT_LOAD_LABEL', "Loading Options");
+			$this->setLangContent($this->lang, $lang . '_UIKIT_LOAD_DESC', "Set the uikit loading option.");
+			$this->setLangContent($this->lang, $lang . '_AUTO_LOAD', "Auto");
+			$this->setLangContent($this->lang, $lang . '_FORCE_LOAD', "Force");
+			$this->setLangContent($this->lang, $lang . '_DONT_LOAD', "Not");
+			$this->setLangContent($this->lang, $lang . '_ONLY_EXTRA', "Only Extra");
 			// set the field
 			$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_load"';
 			$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14713,10 +14674,10 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			$this->extensionsParams[] = '"uikit_load":"1"';
 
 			// set field lang
-			$this->langContent[$this->lang][$lang . '_UIKIT_MIN_LABEL'] = "Load Minified";
-			$this->langContent[$this->lang][$lang . '_UIKIT_MIN_DESC'] = "Should the minified version of uikit files be loaded?";
-			$this->langContent[$this->lang][$lang . '_YES'] = "Yes";
-			$this->langContent[$this->lang][$lang . '_NO'] = "No";
+			$this->setLangContent($this->lang, $lang . '_UIKIT_MIN_LABEL', "Load Minified");
+			$this->setLangContent($this->lang, $lang . '_UIKIT_MIN_DESC', "Should the minified version of uikit files be loaded?");
+			$this->setLangContent($this->lang, $lang . '_YES', "Yes");
+			$this->setLangContent($this->lang, $lang . '_NO', "No");
 			// set the field
 			$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_min"';
 			$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14736,11 +14697,11 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			if (2 == $this->uikit || 1 == $this->uikit)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_UIKIT_STYLE_LABEL'] = "css Style";
-				$this->langContent[$this->lang][$lang . '_UIKIT_STYLE_DESC'] = "Set the css style that should be used.";
-				$this->langContent[$this->lang][$lang . '_FLAT_LOAD'] = "Flat";
-				$this->langContent[$this->lang][$lang . '_ALMOST_FLAT_LOAD'] = "Almost Flat";
-				$this->langContent[$this->lang][$lang . '_GRADIANT_LOAD'] = "Gradient";
+				$this->setLangContent($this->lang, $lang . '_UIKIT_STYLE_LABEL', "css Style");
+				$this->setLangContent($this->lang, $lang . '_UIKIT_STYLE_DESC', "Set the css style that should be used.");
+				$this->setLangContent($this->lang, $lang . '_FLAT_LOAD', "Flat");
+				$this->setLangContent($this->lang, $lang . '_ALMOST_FLAT_LOAD', "Almost Flat");
+				$this->setLangContent($this->lang, $lang . '_GRADIANT_LOAD', "Gradient");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field name="uikit_style"';
 				$this->configFieldSets[] = $this->_t(3) . 'type="radio"';
@@ -14781,8 +14742,8 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			// main lang prefix
 			$lang = $lang . '';
 			// set main lang string
-			$this->langContent[$this->lang][$lang . '_MAIL_CONFIGURATION'] = "Mail Configuration";
-			$this->langContent[$this->lang][$lang . '_DKIM'] = "DKIM";
+			$this->setLangContent($this->lang, $lang . '_MAIL_CONFIGURATION', "Mail Configuration");
+			$this->setLangContent($this->lang, $lang . '_DKIM', "DKIM");
 			// start building field set for email helper functions
 			$this->configFieldSets[] = PHP_EOL . $this->_t(1) . "<fieldset";
 			$this->configFieldSets[] = $this->_t(2) . "name=\"mail_configuration_custom_config\"";
@@ -14796,51 +14757,51 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			else
 			{
 				// set all the laguage strings
-				$this->langContent[$this->lang][$lang . '_MAILONLINE_LABEL'] = "Mailer Status";
-				$this->langContent[$this->lang][$lang . '_MAILONLINE_DESCRIPTION'] = "Warning this will stop all emails from going out.";
-				$this->langContent[$this->lang][$lang . '_ON'] = "On";
-				$this->langContent[$this->lang][$lang . '_OFF'] = "Off";
-				$this->langContent[$this->lang][$lang . '_MAILER_LABEL'] = "Mailer";
-				$this->langContent[$this->lang][$lang . '_MAILER_DESCRIPTION'] = "Select what mailer you would like to use to send emails.";
-				$this->langContent[$this->lang][$lang . '_GLOBAL'] = "Global";
-				$this->langContent[$this->lang][$lang . '_PHP_MAIL'] = "PHP Mail";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL'] = "Sendmail";
-				$this->langContent[$this->lang][$lang . '_SMTP'] = "SMTP";
-				$this->langContent[$this->lang][$lang . '_EMAILFROM_LABEL'] = " From Email";
-				$this->langContent[$this->lang][$lang . '_EMAILFROM_DESCRIPTION'] = "The global email address that will be used to send system email.";
-				$this->langContent[$this->lang][$lang . '_EMAILFROM_HINT'] = "Email Address Here";
-				$this->langContent[$this->lang][$lang . '_FROMNAME_LABEL'] = "From Name";
-				$this->langContent[$this->lang][$lang . '_FROMNAME_DESCRIPTION'] = "Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name.";
-				$this->langContent[$this->lang][$lang . '_FROMNAME_HINT'] = "From Name Here";
-				$this->langContent[$this->lang][$lang . '_EMAILREPLY_LABEL'] = " Reply to Email";
-				$this->langContent[$this->lang][$lang . '_EMAILREPLY_DESCRIPTION'] = "The global email address that will be used to set as the reply email. (leave blank for none)";
-				$this->langContent[$this->lang][$lang . '_EMAILREPLY_HINT'] = "Email Address Here";
-				$this->langContent[$this->lang][$lang . '_REPLYNAME_LABEL'] = "Reply to Name";
-				$this->langContent[$this->lang][$lang . '_REPLYNAME_DESCRIPTION'] = "Text displayed in the header &quot;Reply To:&quot; field when replying to the site email. Usually the the person that receives the response. (leave blank for none)";
-				$this->langContent[$this->lang][$lang . '_REPLYNAME_HINT'] = "Reply Name Here";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL_LABEL'] = "Sendmail Path";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL_DESCRIPTION'] = "Enter the path to the sendmail program directory on your host server.";
-				$this->langContent[$this->lang][$lang . '_SENDMAIL_HINT'] = "/usr/sbin/sendmail";
-				$this->langContent[$this->lang][$lang . '_SMTPAUTH_LABEL'] = "SMTP Authentication";
-				$this->langContent[$this->lang][$lang . '_SMTPAUTH_DESCRIPTION'] = "Select yes if your SMTP host requires SMTP Authentication.";
-				$this->langContent[$this->lang][$lang . '_YES'] = "Yes";
-				$this->langContent[$this->lang][$lang . '_NO'] = "No";
-				$this->langContent[$this->lang][$lang . '_SMTPSECURE_LABEL'] = "SMTP Security";
-				$this->langContent[$this->lang][$lang . '_SMTPSECURE_DESCRIPTION'] = "Select the security model that your SMTP server uses.";
-				$this->langContent[$this->lang][$lang . '_NONE'] = "None";
-				$this->langContent[$this->lang][$lang . '_SSL'] = "SSL";
-				$this->langContent[$this->lang][$lang . '_TLS'] = "TLS";
-				$this->langContent[$this->lang][$lang . '_SMTPPORT_LABEL'] = "SMTP Port";
-				$this->langContent[$this->lang][$lang . '_SMTPPORT_DESCRIPTION'] = "Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers.";
-				$this->langContent[$this->lang][$lang . '_SMTPPORT_HINT'] = "25";
-				$this->langContent[$this->lang][$lang . '_SMTPUSER_LABEL'] = "SMTP Username";
-				$this->langContent[$this->lang][$lang . '_SMTPUSER_DESCRIPTION'] = "Enter the username for access to the SMTP host.";
-				$this->langContent[$this->lang][$lang . '_SMTPUSER_HINT'] = "email@demo.com";
-				$this->langContent[$this->lang][$lang . '_SMTPPASS_LABEL'] = "SMTP Password";
-				$this->langContent[$this->lang][$lang . '_SMTPPASS_DESCRIPTION'] = "Enter the password for access to the SMTP host.";
-				$this->langContent[$this->lang][$lang . '_SMTPHOST_LABEL'] = "SMTP Host";
-				$this->langContent[$this->lang][$lang . '_SMTPHOST_DESCRIPTION'] = "Enter the name of the SMTP host.";
-				$this->langContent[$this->lang][$lang . '_SMTPHOST_HINT'] = "localhost";
+				$this->setLangContent($this->lang, $lang . '_MAILONLINE_LABEL', "Mailer Status");
+				$this->setLangContent($this->lang, $lang . '_MAILONLINE_DESCRIPTION', "Warning this will stop all emails from going out.");
+				$this->setLangContent($this->lang, $lang . '_ON', "On");
+				$this->setLangContent($this->lang, $lang . '_OFF', "Off");
+				$this->setLangContent($this->lang, $lang . '_MAILER_LABEL', "Mailer");
+				$this->setLangContent($this->lang, $lang . '_MAILER_DESCRIPTION', "Select what mailer you would like to use to send emails.");
+				$this->setLangContent($this->lang, $lang . '_GLOBAL', "Global");
+				$this->setLangContent($this->lang, $lang . '_PHP_MAIL', "PHP Mail");
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL', "Sendmail");
+				$this->setLangContent($this->lang, $lang . '_SMTP', "SMTP");
+				$this->setLangContent($this->lang, $lang . '_EMAILFROM_LABEL', " From Email");
+				$this->setLangContent($this->lang, $lang . '_EMAILFROM_DESCRIPTION', "The global email address that will be used to send system email.");
+				$this->setLangContent($this->lang, $lang . '_EMAILFROM_HINT', "Email Address Here");
+				$this->setLangContent($this->lang, $lang . '_FROMNAME_LABEL', "From Name");
+				$this->setLangContent($this->lang, $lang . '_FROMNAME_DESCRIPTION', "Text displayed in the header &quot;From:&quot; field when sending a site email. Usually the site name."); 
+				$this->setLangContent($this->lang, $lang . '_FROMNAME_HINT', "From Name Here"); 
+				$this->setLangContent($this->lang, $lang . '_EMAILREPLY_LABEL', " Reply to Email"); 
+				$this->setLangContent($this->lang, $lang . '_EMAILREPLY_DESCRIPTION', "The global email address that will be used to set as the reply email. (leave blank for none)"); 
+				$this->setLangContent($this->lang, $lang . '_EMAILREPLY_HINT', "Email Address Here"); 
+				$this->setLangContent($this->lang, $lang . '_REPLYNAME_LABEL', "Reply to Name"); 
+				$this->setLangContent($this->lang, $lang . '_REPLYNAME_DESCRIPTION', "Text displayed in the header &quot;Reply To:&quot; field when replying to the site email. Usually the the person that receives the response. (leave blank for none)"); 
+				$this->setLangContent($this->lang, $lang . '_REPLYNAME_HINT', "Reply Name Here"); 
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL_LABEL', "Sendmail Path"); 
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL_DESCRIPTION', "Enter the path to the sendmail program directory on your host server."); 
+				$this->setLangContent($this->lang, $lang . '_SENDMAIL_HINT', "/usr/sbin/sendmail"); 
+				$this->setLangContent($this->lang, $lang . '_SMTPAUTH_LABEL', "SMTP Authentication");
+				$this->setLangContent($this->lang, $lang . '_SMTPAUTH_DESCRIPTION', "Select yes if your SMTP host requires SMTP Authentication.");
+				$this->setLangContent($this->lang, $lang . '_YES', "Yes");
+				$this->setLangContent($this->lang, $lang . '_NO', "No");
+				$this->setLangContent($this->lang, $lang . '_SMTPSECURE_LABEL', "SMTP Security");
+				$this->setLangContent($this->lang, $lang . '_SMTPSECURE_DESCRIPTION', "Select the security model that your SMTP server uses.");
+				$this->setLangContent($this->lang, $lang . '_NONE', "None");
+				$this->setLangContent($this->lang, $lang . '_SSL', "SSL");
+				$this->setLangContent($this->lang, $lang . '_TLS', "TLS");
+				$this->setLangContent($this->lang, $lang . '_SMTPPORT_LABEL', "SMTP Port");
+				$this->setLangContent($this->lang, $lang . '_SMTPPORT_DESCRIPTION', "Enter the port number of your SMTP server. Use 25 for most unsecured servers and 465 for most secure servers.");
+				$this->setLangContent($this->lang, $lang . '_SMTPPORT_HINT', "25");
+				$this->setLangContent($this->lang, $lang . '_SMTPUSER_LABEL', "SMTP Username");
+				$this->setLangContent($this->lang, $lang . '_SMTPUSER_DESCRIPTION', "Enter the username for access to the SMTP host.");
+				$this->setLangContent($this->lang, $lang . '_SMTPUSER_HINT', "email@demo.com");
+				$this->setLangContent($this->lang, $lang . '_SMTPPASS_LABEL', "SMTP Password");
+				$this->setLangContent($this->lang, $lang . '_SMTPPASS_DESCRIPTION', "Enter the password for access to the SMTP host.");
+				$this->setLangContent($this->lang, $lang . '_SMTPHOST_LABEL', "SMTP Host");
+				$this->setLangContent($this->lang, $lang . '_SMTPHOST_DESCRIPTION', "Enter the name of the SMTP host.");
+				$this->setLangContent($this->lang, $lang . '_SMTPHOST_HINT', "localhost");
 
 				// set the mailer fields
 				$this->configFieldSets[] = PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Mailonline Field. Type: Radio. (joomla) -->";
@@ -15057,27 +15018,27 @@ for developing fast and powerful web interfaces. For more info visit <a href=\"h
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_DKIM_LABEL'] = "Enable DKIM";
-				$this->langContent[$this->lang][$lang . '_DKIM_DESCRIPTION'] = "Set this option to Yes if you want to sign your emails using DKIM.";
-				$this->langContent[$this->lang][$lang . '_YES'] = "Yes";
-				$this->langContent[$this->lang][$lang . '_NO'] = "No";
-				$this->langContent[$this->lang][$lang . '_DKIM_DOMAIN_LABEL'] = "Domain";
-				$this->langContent[$this->lang][$lang . '_DKIM_DOMAIN_DESCRIPTION'] = "Set the domain. Eg. domain.com";
-				$this->langContent[$this->lang][$lang . '_DKIM_DOMAIN_HINT'] = "domain.com";
-				$this->langContent[$this->lang][$lang . '_DKIM_SELECTOR_LABEL'] = "Selector";
-				$this->langContent[$this->lang][$lang . '_DKIM_SELECTOR_DESCRIPTION'] = "Set your DKIM/DNS selector.";
-				$this->langContent[$this->lang][$lang . '_DKIM_SELECTOR_HINT'] = "vdm";
-				$this->langContent[$this->lang][$lang . '_DKIM_PASSPHRASE_LABEL'] = "Passphrase";
-				$this->langContent[$this->lang][$lang . '_DKIM_PASSPHRASE_DESCRIPTION'] = "Enter your passphrase here.";
-				$this->langContent[$this->lang][$lang . '_DKIM_IDENTITY_LABEL'] = "Identity";
-				$this->langContent[$this->lang][$lang . '_DKIM_IDENTITY_DESCRIPTION'] = "Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email.";
-				$this->langContent[$this->lang][$lang . '_DKIM_IDENTITY_HINT'] = "you@yourdomain.com";
-				$this->langContent[$this->lang][$lang . '_DKIM_PRIVATE_KEY_LABEL'] = "Private key";
-				$this->langContent[$this->lang][$lang . '_DKIM_PRIVATE_KEY_DESCRIPTION'] = "set private key";
-				$this->langContent[$this->lang][$lang . '_DKIM_PUBLIC_KEY_LABEL'] = "Public key";
-				$this->langContent[$this->lang][$lang . '_DKIM_PUBLIC_KEY_DESCRIPTION'] = "set public key";
-				$this->langContent[$this->lang][$lang . '_NOTE_DKIM_USE_LABEL'] = "Server Configuration";
-				$this->langContent[$this->lang][$lang . '_NOTE_DKIM_USE_DESCRIPTION'] = "<p>Using the below details, you need to configure your DNS by adding a TXT record on your domain: <b><span id='a_dkim_domain'></span></b></p>
+				$this->setLangContent($this->lang, $lang . '_DKIM_LABEL', "Enable DKIM");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DESCRIPTION', "Set this option to Yes if you want to sign your emails using DKIM.");
+				$this->setLangContent($this->lang, $lang . '_YES', "Yes");
+				$this->setLangContent($this->lang, $lang . '_NO', "No");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DOMAIN_LABEL', "Domain");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DOMAIN_DESCRIPTION', "Set the domain. Eg. domain.com");
+				$this->setLangContent($this->lang, $lang . '_DKIM_DOMAIN_HINT', "domain.com");
+				$this->setLangContent($this->lang, $lang . '_DKIM_SELECTOR_LABEL', "Selector");
+				$this->setLangContent($this->lang, $lang . '_DKIM_SELECTOR_DESCRIPTION', "Set your DKIM/DNS selector.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_SELECTOR_HINT', "vdm");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PASSPHRASE_LABEL', "Passphrase");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PASSPHRASE_DESCRIPTION', "Enter your passphrase here.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_IDENTITY_LABEL', "Identity");
+				$this->setLangContent($this->lang, $lang . '_DKIM_IDENTITY_DESCRIPTION', "Set DKIM identity. This can be in the format of an email address 'you@yourdomain.com' typically used as the source of the email.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_IDENTITY_HINT', "you@yourdomain.com");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PRIVATE_KEY_LABEL', "Private key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PRIVATE_KEY_DESCRIPTION', "set private key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PUBLIC_KEY_LABEL', "Public key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_PUBLIC_KEY_DESCRIPTION', "set public key");
+				$this->setLangContent($this->lang, $lang . '_NOTE_DKIM_USE_LABEL', "Server Configuration");
+				$this->setLangContent($this->lang, $lang . '_NOTE_DKIM_USE_DESCRIPTION', "<p>Using the below details, you need to configure your DNS by adding a TXT record on your domain: <b><span id='a_dkim_domain'></span></b></p>
 <script>
 jQuery(document).ready(function()
 {
@@ -15103,13 +15064,13 @@ function vdm_dkim() {
 	        jQuery('#jform_dkim_value').val('v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=' + jQuery('#jform_dkim_public_key').val());
         }
 }
-</script>";
-				$this->langContent[$this->lang][$lang . '_DKIM_KEY_LABEL'] = "Key";
-				$this->langContent[$this->lang][$lang . '_DKIM_KEY_DESCRIPTION'] = "This is the KEY to use in the DNS record.";
-				$this->langContent[$this->lang][$lang . '_DKIM_KEY_HINT'] = "vdm._domainkey";
-				$this->langContent[$this->lang][$lang . '_DKIM_VALUE_LABEL'] = "Value";
-				$this->langContent[$this->lang][$lang . '_DKIM_VALUE_DESCRIPTION'] = "This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key.";
-				$this->langContent[$this->lang][$lang . '_DKIM_VALUE_HINT'] = "v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY";
+</script>");
+				$this->setLangContent($this->lang, $lang . '_DKIM_KEY_LABEL', "Key");
+				$this->setLangContent($this->lang, $lang . '_DKIM_KEY_DESCRIPTION', "This is the KEY to use in the DNS record.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_KEY_HINT', "vdm._domainkey");
+				$this->setLangContent($this->lang, $lang . '_DKIM_VALUE_LABEL', "Value");
+				$this->setLangContent($this->lang, $lang . '_DKIM_VALUE_DESCRIPTION', "This is the TXT value to use in the DNS. Replace the PUBLICKEY with your public key.");
+				$this->setLangContent($this->lang, $lang . '_DKIM_VALUE_HINT', "v=DKIM1;k=rsa;g=*;s=email;h=sha1;t=s;p=PUBLICKEY");
 
 
 				$this->configFieldSets[] = PHP_EOL . $this->_t(2) . "<!--" . $this->setLine(__LINE__) . " Dkim Field. Type: Radio. (joomla) -->";
@@ -15496,38 +15457,38 @@ function vdm_dkim() {
 			$this->extensionsParams[] = '"admin_chartbackground":"#F7F7FA","admin_mainwidth":"1000","admin_chartareatop":"20","admin_chartarealeft":"20","admin_chartareawidth":"170","admin_legendtextstylefontcolor":"10","admin_legendtextstylefontsize":"20","admin_vaxistextstylefontcolor":"#63B1F2","admin_haxistextstylefontcolor":"#63B1F2","admin_haxistitletextstylefontcolor":"#63B1F2","site_chartbackground":"#F7F7FA","site_mainwidth":"1000","site_chartareatop":"20","site_chartarealeft":"20","site_chartareawidth":"170","site_legendtextstylefontcolor":"10","site_legendtextstylefontsize":"20","site_vaxistextstylefontcolor":"#63B1F2","site_haxistextstylefontcolor":"#63B1F2","site_haxistitletextstylefontcolor":"#63B1F2"';
 
 			// set field lang
-			$this->langContent[$this->lang][$lang . '_CHART_SETTINGS_LABEL'] = "Chart Settings";
-			$this->langContent[$this->lang][$lang . '_CHART_SETTINGS_DESC'] = "The Google Chart Display Settings Are Made Here.";
-			$this->langContent[$this->lang][$lang . '_ADMIN_CHART_NOTE_LABEL'] = "Admin Settings";
-			$this->langContent[$this->lang][$lang . '_ADMIN_CHART_NOTE_DESC'] = "The following settings are used on the back-end of the site called (admin).";
-			$this->langContent[$this->lang][$lang . '_SITE_CHART_NOTE_LABEL'] = "Site Settings";
-			$this->langContent[$this->lang][$lang . '_SITE_CHART_NOTE_DESC'] = "The following settings are used on the front-end of the site called (site).";
+			$this->setLangContent($this->lang, $lang . '_CHART_SETTINGS_LABEL', "Chart Settings");
+			$this->setLangContent($this->lang, $lang . '_CHART_SETTINGS_DESC', "The Google Chart Display Settings Are Made Here.");
+			$this->setLangContent($this->lang, $lang . '_ADMIN_CHART_NOTE_LABEL', "Admin Settings");
+			$this->setLangContent($this->lang, $lang . '_ADMIN_CHART_NOTE_DESC', "The following settings are used on the back-end of the site called (admin).");
+			$this->setLangContent($this->lang, $lang . '_SITE_CHART_NOTE_LABEL', "Site Settings");
+			$this->setLangContent($this->lang, $lang . '_SITE_CHART_NOTE_DESC', "The following settings are used on the front-end of the site called (site).");
 
-			$this->langContent[$this->lang][$lang . '_CHARTAREALEFT_DESC'] = "Set in pixels the spacing from the left of the chart area to the beginning of the chart it self. Please don't add the px sign";
-			$this->langContent[$this->lang][$lang . '_CHARTAREALEFT_HINT'] = "170";
-			$this->langContent[$this->lang][$lang . '_CHARTAREALEFT_LABEL'] = "Left Spacing";
-			$this->langContent[$this->lang][$lang . '_CHARTAREATOP_DESC'] = "Set in pixels the spacing from the top of the chart area to the beginning of the chart it self. Please don't add the px sign";
-			$this->langContent[$this->lang][$lang . '_CHARTAREATOP_HINT'] = "20";
-			$this->langContent[$this->lang][$lang . '_CHARTAREATOP_LABEL'] = "Top Spacing";
-			$this->langContent[$this->lang][$lang . '_CHARTAREAWIDTH_DESC'] = "Set in % the width of the chart it self inside the chart area. Please don't add the % sign";
-			$this->langContent[$this->lang][$lang . '_CHARTAREAWIDTH_HINT'] = "60";
-			$this->langContent[$this->lang][$lang . '_CHARTAREAWIDTH_LABEL'] = "Chart Width";
-			$this->langContent[$this->lang][$lang . '_CHARTBACKGROUND_DESC'] = "Select the chart background color here.";
-			$this->langContent[$this->lang][$lang . '_CHARTBACKGROUND_LABEL'] = "Chart Background";
-			$this->langContent[$this->lang][$lang . '_HAXISTEXTSTYLEFONTCOLOR_DESC'] = "Select the horizontal axis font color.";
-			$this->langContent[$this->lang][$lang . '_HAXISTEXTSTYLEFONTCOLOR_LABEL'] = "hAxis Font Color";
-			$this->langContent[$this->lang][$lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_DESC'] = "Select the horizontal axis title's font color.";
-			$this->langContent[$this->lang][$lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL'] = "hAxis Title Font Color";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTCOLOR_DESC'] = "Select the legend font color.";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTCOLOR_LABEL'] = "Legend Font Color";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTSIZE_DESC'] = "Set in pixels the font size of the legend";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTSIZE_HINT'] = "10";
-			$this->langContent[$this->lang][$lang . '_LEGENDTEXTSTYLEFONTSIZE_LABEL'] = "Legend Font Size";
-			$this->langContent[$this->lang][$lang . '_MAINWIDTH_DESC'] = "Set the width of the entire chart area";
-			$this->langContent[$this->lang][$lang . '_MAINWIDTH_HINT'] = "1000";
-			$this->langContent[$this->lang][$lang . '_MAINWIDTH_LABEL'] = "Chart Area Width";
-			$this->langContent[$this->lang][$lang . '_VAXISTEXTSTYLEFONTCOLOR_DESC'] = "Select the vertical axis font color.";
-			$this->langContent[$this->lang][$lang . '_VAXISTEXTSTYLEFONTCOLOR_LABEL'] = "vAxis Font Color";
+			$this->setLangContent($this->lang, $lang . '_CHARTAREALEFT_DESC', "Set in pixels the spacing from the left of the chart area to the beginning of the chart it self. Please don't add the px sign");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREALEFT_HINT', "170");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREALEFT_LABEL', "Left Spacing");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREATOP_DESC', "Set in pixels the spacing from the top of the chart area to the beginning of the chart it self. Please don't add the px sign");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREATOP_HINT', "20");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREATOP_LABEL', "Top Spacing");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREAWIDTH_DESC', "Set in % the width of the chart it self inside the chart area. Please don't add the % sign");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREAWIDTH_HINT', "60");
+			$this->setLangContent($this->lang, $lang . '_CHARTAREAWIDTH_LABEL', "Chart Width");
+			$this->setLangContent($this->lang, $lang . '_CHARTBACKGROUND_DESC', "Select the chart background color here.");
+			$this->setLangContent($this->lang, $lang . '_CHARTBACKGROUND_LABEL', "Chart Background");
+			$this->setLangContent($this->lang, $lang . '_HAXISTEXTSTYLEFONTCOLOR_DESC', "Select the horizontal axis font color.");
+			$this->setLangContent($this->lang, $lang . '_HAXISTEXTSTYLEFONTCOLOR_LABEL', "hAxis Font Color");
+			$this->setLangContent($this->lang, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_DESC', "Select the horizontal axis title's font color.");
+			$this->setLangContent($this->lang, $lang . '_HAXISTITLETEXTSTYLEFONTCOLOR_LABEL', "hAxis Title Font Color");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_DESC', "Select the legend font color.");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTCOLOR_LABEL', "Legend Font Color");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_DESC', "Set in pixels the font size of the legend");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_HINT', "10");
+			$this->setLangContent($this->lang, $lang . '_LEGENDTEXTSTYLEFONTSIZE_LABEL', "Legend Font Size");
+			$this->setLangContent($this->lang, $lang . '_MAINWIDTH_DESC', "Set the width of the entire chart area");
+			$this->setLangContent($this->lang, $lang . '_MAINWIDTH_HINT', "1000");
+			$this->setLangContent($this->lang, $lang . '_MAINWIDTH_LABEL', "Chart Area Width");
+			$this->setLangContent($this->lang, $lang . '_VAXISTEXTSTYLEFONTCOLOR_DESC', "Select the vertical axis font color.");
+			$this->setLangContent($this->lang, $lang . '_VAXISTEXTSTYLEFONTCOLOR_LABEL', "vAxis Font Color");
 		}
 	}
 
@@ -15558,8 +15519,8 @@ function vdm_dkim() {
 				(isset($this->whmcsEncryption) && $this->whmcsEncryption)) &&
 				$this->componentData->add_license && $this->componentData->license_type == 3)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "License & Encryption Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The license & encryption keys are set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "License & Encryption Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The license & encryption keys are set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "License & Encryption Settings";
 			}
@@ -15568,38 +15529,38 @@ function vdm_dkim() {
 				(isset($this->whmcsEncryption) && $this->whmcsEncryption)) &&
 				$this->componentData->add_license && $this->componentData->license_type == 2)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "Update & Encryption Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The update & encryption keys are set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "Update & Encryption Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The update & encryption keys are set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "Update & Encryption Settings";
 			}
 			elseif ($this->componentData->add_license && $this->componentData->license_type == 3)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "License Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The license key is set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL',  "License Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC',  "The license key is set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "License Settings";
 			}
 			elseif ($this->componentData->add_license && $this->componentData->license_type == 2)
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "Update Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The update key is set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "Update Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The update key is set here.");
 				// add the next dynamic option
 				$dynamicAddFields[] = "Update Settings";
 			}
 			else
 			{
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_LABEL'] = "Encryption Settings";
-				$this->langContent[$this->lang][$lang . '_ENCRYPTION_DESC'] = "The encryption key for the field encryption is set here.";
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_LABEL', "Encryption Settings");
+				$this->setLangContent($this->lang, $lang . '_ENCRYPTION_DESC', "The encryption key for the field encryption is set here.");
 			}
 
 			if (isset($this->basicEncryption) && $this->basicEncryption)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_LABEL'] = "Basic Key";
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_DESC'] = "Set the basic local key here.";
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_NOTE_LABEL'] = "Basic Encryption";
-				$this->langContent[$this->lang][$lang . '_BASIC_KEY_NOTE_DESC'] = "When using the basic encryption please use set a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_LABEL', "Basic Key");
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_DESC', "Set the basic local key here.");
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_NOTE_LABEL', "Basic Encryption");
+				$this->setLangContent($this->lang, $lang . '_BASIC_KEY_NOTE_DESC', "When using the basic encryption please use set a 32 character passphrase.<br />Never change this passphrase once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="basic_key_note" class="alert alert-info" label="' . $lang . '_BASIC_KEY_NOTE_LABEL" description="' . $lang . '_BASIC_KEY_NOTE_DESC"  />';
 				$this->configFieldSets[] = $this->_t(2) . '<field name="basic_key"';
@@ -15613,10 +15574,10 @@ function vdm_dkim() {
 			if (isset($this->mediumEncryption) && $this->mediumEncryption)
 			{
 				// set field lang
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_LABEL'] = "Medium Key (Path)";
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_DESC'] = "Set the full path to where the key file must be stored. Make sure it is behind the root folder of your website, so that it is not public accessible.";
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_NOTE_LABEL'] = "Medium Encryption";
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_NOTE_DESC'] = "When using the medium encryption option, the system generates its own key and stores it in a file at the folder/path you set here.<br />Never change this key once it is set, or remove the key file! <b>DATA WILL GET CORRUPTED IF YOU DO!</b> Also make sure the full path to where the the key file should be stored, is behind the root folder of your website/system, so that it is not public accessible. Making a backup of this key file over a <b>secure connection</b> is recommended!";
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_LABEL', "Medium Key (Path)");
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_DESC', "Set the full path to where the key file must be stored. Make sure it is behind the root folder of your website, so that it is not public accessible.");
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_NOTE_LABEL', "Medium Encryption");
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_NOTE_DESC', "When using the medium encryption option, the system generates its own key and stores it in a file at the folder/path you set here.<br />Never change this key once it is set, or remove the key file! <b>DATA WILL GET CORRUPTED IF YOU DO!</b> Also make sure the full path to where the the key file should be stored, is behind the root folder of your website/system, so that it is not public accessible. Making a backup of this key file over a <b>secure connection</b> is recommended!");
 				// set the field
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="medium_key_note" class="alert alert-info" label="' . $lang . '_MEDIUM_KEY_NOTE_LABEL" description="' . $lang . '_MEDIUM_KEY_NOTE_DESC" />';
 				$this->configFieldSets[] = $this->_t(2) . '<field name="medium_key_path"';
@@ -15629,54 +15590,54 @@ function vdm_dkim() {
 				$this->configFieldSets[] = $this->_t(3) . 'default=""';
 				$this->configFieldSets[] = $this->_t(2) . "/>";
 				// set some error message if the path does not exist
-				$this->langContent[$this->lang][$lang . '_MEDIUM_KEY_PATH_ERROR'] = "Medium key path (for encryption of various fields) does not exist, or is not writable. Please check the path and update it in the global option of this component.";
+				$this->setLangContent($this->lang, $lang . '_MEDIUM_KEY_PATH_ERROR', "Medium key path (for encryption of various fields) does not exist, or is not writable. Please check the path and update it in the global option of this component.");
 			}
 			if (isset($this->whmcsEncryption) && $this->whmcsEncryption || $this->componentData->add_license)
 			{
 				// set field lang label and description
 				if ($this->componentData->add_license && $this->componentData->license_type == 3)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " License Key";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the license key you recieved from " . $this->componentData->companyname . " here.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_LABEL', $this->componentData->companyname . " License Key");
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_DESC', "Add the license key you recieved from " . $this->componentData->companyname . " here.");
 				}
 				elseif ($this->componentData->add_license && $this->componentData->license_type == 2)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Update Key";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the update key you recieved from " . $this->componentData->companyname . " here.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_LABEL', $this->componentData->companyname . " Update Key");
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_DESC', "Add the update key you recieved from " . $this->componentData->companyname . " here.");
 				}
 				else
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_LABEL'] = $this->componentData->companyname . " Key";
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_DESC'] = "Add the key you recieved from " . $this->componentData->companyname . " here.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_LABEL', $this->componentData->companyname . " Key");
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_DESC', "Add the key you recieved from " . $this->componentData->companyname . " here.");
 				}
 				// ajust the notice based on license
 				if ($this->componentData->license_type == 3)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " License Key";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " License Key");
 				}
 				elseif ($this->componentData->license_type == 2)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Update Key";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " Update Key");
 				}
 				else
 				{
 					if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
 					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Field Encryption Key";
+						$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " Field Encryption Key");
 					}
 					else
 					{
-						$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_LABEL'] = "Your " . $this->componentData->companyname . " Key";
+						$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_LABEL', "Your " . $this->componentData->companyname . " Key");
 					}
 				}
 				// add the description based on global settings
 				if (isset($this->whmcsEncryption) && $this->whmcsEncryption)
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.<br />When using the " . $this->componentData->companyname . " field encryption you can never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_DESC', "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.<br />When using the " . $this->componentData->companyname . " field encryption you can never change this key once it is set! <b>DATA WILL GET CORRUPTED IF YOU DO!</b>");
 				}
 				else
 				{
-					$this->langContent[$this->lang][$lang . '_WHMCS_KEY_NOTE_DESC'] = "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.";
+					$this->setLangContent($this->lang, $lang . '_WHMCS_KEY_NOTE_DESC', "You need to get this key from <a href='".$this->componentData->whmcs_buy_link."' target='_blank'>" . $this->componentData->companyname . "</a>.");
 				}
 				// set the fields
 				$this->configFieldSets[] = $this->_t(2) . '<field type="note" name="whmcs_key_note" class="alert alert-info" label="' . $lang . '_WHMCS_KEY_NOTE_LABEL" description="' . $lang . '_WHMCS_KEY_NOTE_DESC"  />';
@@ -15760,27 +15721,27 @@ function vdm_dkim() {
 		{
 			$exportTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Export Data', 'U');
 			$exportDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Export Data', 'U') . '_DESC';
-			$this->langContent['bothadmin'][$exportTitle] = 'Export Data';
-			$this->langContent['bothadmin'][$exportDesc] = ' Allows users in this group to export data.';
+			$this->setLangContent('bothadmin', $exportTitle, 'Export Data');
+			$this->setLangContent('bothadmin', $exportDesc, ' Allows users in this group to export data.');
 			$this->componentHead[] = $this->_t(2) . '<action name="core.export" title="' . $exportTitle . '" description="' . $exportDesc . '" />';
 
 			$importTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U');
 			$importDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Import Data', 'U') . '_DESC';
-			$this->langContent['bothadmin'][$importTitle] = 'Import Data';
-			$this->langContent['bothadmin'][$importDesc] = ' Allows users in this group to import data.';
+			$this->setLangContent('bothadmin', $importTitle, 'Import Data');
+			$this->setLangContent('bothadmin', $importDesc, ' Allows users in this group to import data.');
 			$this->componentHead[] = $this->_t(2) . '<action name="core.import" title="' . $importTitle . '" description="' . $importDesc . '" />';
 		}
 		// version permission
 		$batchTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Use Batch', 'U');
 		$batchDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Use Batch', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$batchTitle] = 'Use Batch';
-		$this->langContent['bothadmin'][$batchDesc] = ' Allows users in this group to use batch copy/update method.';
+		$this->setLangContent('bothadmin', $batchTitle, 'Use Batch');
+		$this->setLangContent('bothadmin', $batchDesc, ' Allows users in this group to use batch copy/update method.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.batch" title="' . $batchTitle . '" description="' . $batchDesc . '" />';
 		// version permission
 		$importTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Versions', 'U');
 		$importDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Versions', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$importTitle] = 'Edit Version';
-		$this->langContent['bothadmin'][$importDesc] = ' Allows users in this group to edit versions.';
+		$this->setLangContent('bothadmin', $importTitle, 'Edit Version');
+		$this->setLangContent('bothadmin', $importDesc, ' Allows users in this group to edit versions.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.version" title="' . $importTitle . '" description="' . $importDesc . '" />';
 		// set the defaults
 		$this->componentHead[] = $this->_t(2) . '<action name="core.create" title="JACTION_CREATE" description="JACTION_CREATE_COMPONENT_DESC" />';
@@ -15796,14 +15757,14 @@ function vdm_dkim() {
 		// new custom created by permissions
 		$created_byTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created By', 'U');
 		$created_byDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created By', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$created_byTitle] = 'Edit Created By';
-		$this->langContent['bothadmin'][$created_byDesc] = ' Allows users in this group to edit created by.';
+		$this->setLangContent('bothadmin', $created_byTitle, 'Edit Created By');
+		$this->setLangContent('bothadmin', $created_byDesc, ' Allows users in this group to edit created by.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.edit.created_by" title="' . $created_byTitle . '" description="' . $created_byDesc . '" />';
 		// new custom created date permissions
 		$createdTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created Date', 'U');
 		$createdDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString('Edit Created Date', 'U') . '_DESC';
-		$this->langContent['bothadmin'][$createdTitle] = 'Edit Created Date';
-		$this->langContent['bothadmin'][$createdDesc] = ' Allows users in this group to edit created date.';
+		$this->setLangContent('bothadmin', $createdTitle, 'Edit Created Date');
+		$this->setLangContent('bothadmin', $createdDesc, ' Allows users in this group to edit created date.');
 		$this->componentHead[] = $this->_t(2) . '<action name="core.edit.created" title="' . $createdTitle . '" description="' . $createdDesc . '" />';
 
 		// set the menu controller lookup
@@ -15819,8 +15780,8 @@ function vdm_dkim() {
 				$customAdminTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($customAdminName . ' Access', 'U');
 				$customAdminDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($customAdminName . ' Access', 'U') . '_DESC';
 				$sortKey = ComponentbuilderHelper::safeString($customAdminName . ' Access');
-				$this->langContent['bothadmin'][$customAdminTitle] = $customAdminName . ' Access';
-				$this->langContent['bothadmin'][$customAdminDesc] = ' Allows the users in this group to access ' . ComponentbuilderHelper::safeString($customAdminName, 'w') . '.';
+				$this->setLangContent('bothadmin', $customAdminTitle, $customAdminName . ' Access');
+				$this->setLangContent('bothadmin', $customAdminDesc,  ' Allows the users in this group to access ' . ComponentbuilderHelper::safeString($customAdminName, 'w') . '.');
 				$this->componentGlobal[$sortKey] = $this->_t(2) . '<action name="' . $customAdminCode . '.access" title="' . $customAdminTitle . '" description="' . $customAdminDesc . '" />';
 				// add the custom permissions to use the buttons of this view
 				$this->addCustomButtonPermissions($custom_admin_view['settings'], $customAdminName, $customAdminCode);
@@ -15866,8 +15827,8 @@ function vdm_dkim() {
 				$sortKey = ComponentbuilderHelper::safeString($siteName . ' Access Site');
 				if (isset($site_view['access']) && $site_view['access'] == 1)
 				{
-					$this->langContent['bothadmin'][$siteTitle] = $siteName . ' (Site) Access';
-					$this->langContent['bothadmin'][$siteDesc] = ' Allows the users in this group to access site ' . ComponentbuilderHelper::safeString($siteName, 'w') . '.';
+					$this->setLangContent('bothadmin', $siteTitle, $siteName . ' (Site) Access');
+					$this->setLangContent('bothadmin', $siteDesc, ' Allows the users in this group to access site ' . ComponentbuilderHelper::safeString($siteName, 'w') . '.');
 					$this->componentGlobal[$sortKey] = $this->_t(2) . '<action name="site.' . $siteCode . '.access" title="' . $siteTitle . '" description="' . $siteDesc . '" />';
 
 					// check if this site view requires access rule to default to public
@@ -16030,8 +15991,8 @@ function vdm_dkim() {
 				$customButtonTitle = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($nameView . ' ' . $customButtonName . ' Button Access', 'U');
 				$customButtonDesc = $this->langPrefix . '_' . ComponentbuilderHelper::safeString($nameView . ' ' . $customButtonName . ' Button Access', 'U') . '_DESC';
 				$sortButtonKey = ComponentbuilderHelper::safeString($nameView . ' ' . $customButtonName . ' Button Access');
-				$this->langContent['bothadmin'][$customButtonTitle] = $nameView . ' ' . $customButtonName . ' Button Access';
-				$this->langContent['bothadmin'][$customButtonDesc] = ' Allows the users in this group to access the ' . ComponentbuilderHelper::safeString($customButtonName, 'w') . ' button.';
+				$this->setLangContent('bothadmin', $customButtonTitle, $nameView . ' ' . $customButtonName . ' Button Access');
+				$this->setLangContent('bothadmin', $customButtonDesc, ' Allows the users in this group to access the ' . ComponentbuilderHelper::safeString($customButtonName, 'w') . ' button.');
 				$this->componentGlobal[$sortButtonKey] = $this->_t(2) . '<action name="' . $code . '.' . $customButtonCode . '" title="' . $customButtonTitle . '" description="' . $customButtonDesc . '" />';
 			}
 		}
@@ -16318,8 +16279,8 @@ function vdm_dkim() {
 					}
 				}
 				// set to language file
-				$this->langContent['bothadmin'][$title] = trim($permission['title']);
-				$this->langContent['bothadmin'][$title . '_DESC'] = trim($permission['description']);
+				$this->setLangContent('bothadmin', $title, $permission['title']);
+				$this->setLangContent('bothadmin', $title . '_DESC', $permission['description']);
 			}
 		}
 	}
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index d26981031..61e1c5041 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -628,14 +628,8 @@ class Infusion extends Interpretation
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'sviews' . $this->hhh] = $view['settings']->code;
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SVIEWS' . $this->hhh] = $view['settings']->CODE;
 					// add to lang array
-					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE]))
-					{
-						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE] = $view['settings']->name;
-					}
-					if (!isset($this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
-					{
-						$this->langContent[$this->lang][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-					}
+					$this->setLangContent($this->lang, $this->langPrefix . '_' . $view['settings']->CODE, $view['settings']->name);
+					$this->setLangContent($this->lang, $this->langPrefix . '_' . $view['settings']->CODE . '_DESC', $view['settings']->description);
 					// ICOMOON <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'ICOMOON' . $this->hhh] = $view['icomoon'];
 
@@ -929,14 +923,8 @@ class Infusion extends Interpretation
 						$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_AFTER_GET_ITEMS' . $this->hhh] = $this->getCustomScriptBuilder($this->target . '_php_after_getitems', $view['settings']->code, PHP_EOL, null, true);
 					}
 					// add to lang array
-					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE]))
-					{
-						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE] = $view['settings']->name;
-					}
-					if (!isset($this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC']))
-					{
-						$this->langContent['site'][$this->langPrefix . '_' . $view['settings']->CODE . '_DESC'] = $view['settings']->description;
-					}
+					$this->setLangContent('site', $this->langPrefix . '_' . $view['settings']->CODE, $view['settings']->name);
+					$this->setLangContent('site', $this->langPrefix . '_' . $view['settings']->CODE . '_DESC', $view['settings']->description);
 					// SITE_CUSTOM_METHODS <<<DYNAMIC>>>
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_CUSTOM_METHODS' . $this->hhh] = $this->setCustomViewCustomItemMethods($view['settings']->main_get, $view['settings']->code);
 					$this->fileContentDynamic[$view['settings']->code][$this->hhh . 'SITE_CUSTOM_METHODS' . $this->hhh] .= $this->setCustomViewCustomMethods($view, $view['settings']->code);
diff --git a/admin/helpers/componentbuilder.php b/admin/helpers/componentbuilder.php
index 2fb2979ad..7ead4e459 100644
--- a/admin/helpers/componentbuilder.php
+++ b/admin/helpers/componentbuilder.php
@@ -132,19 +132,21 @@ abstract class ComponentbuilderHelper
 	/**
 	* Making field names safe
 	*
-	* @input	string   The you would like to make safe
+	* @input	string       The you would like to make safe
+	* @input	boolean      The switch to return an ALL UPPER CASE string
+	* @input	string       The string to use in white space
 	*
 	* @returns string on success
 	**/
-	public static function safeFieldName($string, $spacer = '_')
+	public static function safeFieldName($string, $allcap = false, $spacer = '_')
 	{
 		// get global value
 		if (self::$fieldNameBuilder === false)
 		{
-			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 0); // change this to 1 for testing the new convention
+			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 1);
 		}
 		// use the new convention
-		if (1 == self::$fieldNameBuilder)
+		if (2 == self::$fieldNameBuilder)
 		{
 			// 0nly continue if we have a string
 			if (self::checkString($string))
@@ -162,12 +164,22 @@ abstract class ComponentbuilderHelper
 				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
 				// replace white space with underscore (SAFEST OPTION)
 				$string = preg_replace('/\s+/', $spacer, $string);
+				// return all caps
+				if ($allcap)
+				{
+					return strtoupper($string);
+				}
 				// default is to return lower
 				return strtolower($string);
 			}
 			// not a string
 			return '';
 		}
+		// return all caps
+		if ($allcap)
+		{
+			return self::safeString($string, 'U');
+		}
 		// use the default (original behaviour/convention)
 		return self::safeString($string);
 	}
@@ -5526,38 +5538,42 @@ abstract class ComponentbuilderHelper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $component = 'Componentbuilder', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_ADMINISTRATOR, $Component = 'Componentbuilder', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index 93a24ce12..b01a19532 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -203,7 +203,7 @@ COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NAME_MESSAGE="Error! Please add name here
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_NEW="A New Admin Custom Tabs"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_ORDERING_LABEL="Ordering"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION="Permissions"
-COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_DESCRIPTION="control "
+COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_DESCRIPTION="control"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_PERMISSION_LABEL="Permission"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_POSITION_DESCRIPTION="position of custom tab"
 COM_COMPONENTBUILDER_ADMIN_CUSTOM_TABS_POSITION_LABEL="Target"
@@ -549,7 +549,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_ALIAS_BUILDER_TYPE_LABEL="Alias Builder Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_DESCRIPTION="null & zero values"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALLOW_ZERO_LABEL="Allow"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ALNUM="ALNUM"
-COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="Archive"
+COM_COMPONENTBUILDER_ADMIN_VIEW_ARCHIVE="ARCHIVE"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_ARMSCIIEIGHT_ARMENIAN_MOST_SUITABLE_COLLATION_ARMSCIIEIGHT_GENERAL_CI="armscii8 - ARMSCII-8 Armenian (most suitable collation = armscii8_general_ci)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_BIN_CHARSET_ARMSCIIEIGHT="armscii8_bin (charset = armscii8)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_ARMSCIIEIGHT_GENERAL_CI_CHARSET_ARMSCIIEIGHT="armscii8_general_ci (charset = armscii8)"
@@ -942,7 +942,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CREATE_EDIT_NOTICE_LABEL="Fields &amp; Cond
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_CUSTOM_TABS_NOTE_DESCRIPTION="You can add more custom tabs to this admin view, these tabs are generally used for static HTML content or Ajax generated fields/content. You can not have an admin view with only custom tabs, they can only be used as an add-on, not a stand alone."
 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_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."
 COM_COMPONENTBUILDER_ADMIN_VIEW_NOTE_ON_PERMISSIONS_LABEL="Permission Implementation"
@@ -1094,7 +1094,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_REDUNDANT="REDUNDANT"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REMOVE="Remove"
 COM_COMPONENTBUILDER_ADMIN_VIEW_REPLY="Reply"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
-COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_COPY="Save Copy"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_NEW="Save New"
 COM_COMPONENTBUILDER_ADMIN_VIEW_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Admin View to customise the alias."
@@ -1173,7 +1173,7 @@ COM_COMPONENTBUILDER_ADMIN_VIEW_TISSIX_HUNDRED_AND_TWENTY_TISSIX_HUNDRED_AND_TWE
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE="Tree"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TREE_TWO="Tree 2"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE="Type"
-COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="for list target"
+COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_DESCRIPTION="Set the type of view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_BIN_CHARSET_UCSTWO="ucs2_bin (charset = ucs2)"
 COM_COMPONENTBUILDER_ADMIN_VIEW_UCSTWO_CROATIAN_CI_CHARSET_UCSTWO="ucs2_croatian_ci (charset = ucs2)"
@@ -1441,18 +1441,18 @@ COM_COMPONENTBUILDER_COMPANY_NAME="Company Name"
 COM_COMPONENTBUILDER_COMPANY_S="Company: %s"
 COM_COMPONENTBUILDER_COMPILER="Compiler"
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
-COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
+COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC="Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
-COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_DESC="The compiler"
 COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS="Compiler Translate Button Access"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the translate button."
+COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the translate button."
 COM_COMPONENTBUILDER_COMPILE_COMPONENT="Compile Component"
 COM_COMPONENTBUILDER_COMPONENTS="Components"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS="Components Admin Views"
@@ -2603,7 +2603,7 @@ COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTE_CONSTANT_PATHS_LABEL="Constant
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_ORDERING_LABEL="Ordering"
-COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure. "
+COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure."
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_HINT="Target Path Here"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_LABEL="Target Path"
 COM_COMPONENTBUILDER_COMPONENT_FILES_FOLDERS_PATH_MESSAGE="Error! Please add target path."
@@ -2767,7 +2767,7 @@ COM_COMPONENTBUILDER_COMPONENT_UPDATES_URL_MESSAGE="Error! Please add url here."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESC="A count of the number of times this Component Updates has been revised."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_DESCRIPTION="1.0.0"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_HINT="1.0.0"
-COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL="SQL Update Version"
+COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_MESSAGE="Error! Please add some text here."
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE="Version Update"
 COM_COMPONENTBUILDER_COMPONENT_UPDATES_VERSION_UPDATE_DESCRIPTION="Add Version Updates Here!"
@@ -2778,6 +2778,7 @@ COM_COMPONENTBUILDER_CONFIG_ACTIVE="Active"
 COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_DESCRIPTION="Would you like to add a prefix to the Joomla menu name of your components"
 COM_COMPONENTBUILDER_CONFIG_ADD_MENU_PREFIX_LABEL="Add Menu Prefix"
 COM_COMPONENTBUILDER_CONFIG_ALMOST_FLAT_LOAD="Almost Flat"
+COM_COMPONENTBUILDER_CONFIG_ALPHANUMERIC="Alphanumeric"
 COM_COMPONENTBUILDER_CONFIG_API_DESCRIPTION="This User will be used to log the API call."
 COM_COMPONENTBUILDER_CONFIG_API_LABEL="API User"
 COM_COMPONENTBUILDER_CONFIG_AUTHOR="Author Info"
@@ -2923,10 +2924,10 @@ COM_COMPONENTBUILDER_CONFIG_EDITOR_DESCRIPTION="Select the editor you would like
 COM_COMPONENTBUILDER_CONFIG_EDITOR_LABEL="Select an editor"
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_DESCRIPTION="The global email address that will be used to send system email."
 COM_COMPONENTBUILDER_CONFIG_EMAILFROM_HINT="Email Address Here"
-COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL=" From Email"
+COM_COMPONENTBUILDER_CONFIG_EMAILFROM_LABEL="From Email"
 COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_DESCRIPTION="The global email address that will be used to set as the reply email. (leave blank for none)"
 COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_HINT="Email Address Here"
-COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL=" Reply to Email"
+COM_COMPONENTBUILDER_CONFIG_EMAILREPLY_LABEL="Reply to Email"
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_DESC="The encryption key for the field encryption is set here."
 COM_COMPONENTBUILDER_CONFIG_ENCRYPTION_LABEL="Encryption Settings"
 COM_COMPONENTBUILDER_CONFIG_EVERY_DAY="Every Day"
@@ -2999,6 +3000,8 @@ COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_LABEL="Website"
 COM_COMPONENTBUILDER_CONFIG_EXPORT_WEBSITE_MESSAGE="Error! Please add website here."
 COM_COMPONENTBUILDER_CONFIG_FALSE="False"
+COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_DESCRIPTION="The default option only uses alphabetical characters and converts all numbers in field names to the English equivalent like <em>1</em> becomes <b>one</b>.<br />Alphanumeric keeps the numbers unconverted unless it is at the beginning of the field name.<br />Should you change this it will cause a database updates <i>(during your next compilation)</i> for all fields that has numbers in the name of the field. So it is really not a good idea to change this option every so often, you should rather select what you would like to use and keep it like that.<br />All VDM/JCB components work on the <b>Default</b> option."
+COM_COMPONENTBUILDER_CONFIG_FIELD_NAME_BUILDER_LABEL="Field Name Builder<br /><small>(in compiler)</small>"
 COM_COMPONENTBUILDER_CONFIG_FLAT_LOAD="Flat"
 COM_COMPONENTBUILDER_CONFIG_FOLDER_PATHS="Folder Paths"
 COM_COMPONENTBUILDER_CONFIG_FORCE_LOAD="Force"
@@ -3017,7 +3020,7 @@ COM_COMPONENTBUILDER_CONFIG_INACTIVE="Inactive"
 COM_COMPONENTBUILDER_CONFIG_INSTALL_DESCRIPTION="Component locally"
 COM_COMPONENTBUILDER_CONFIG_INSTALL_LABEL="Install"
 COM_COMPONENTBUILDER_CONFIG_JCB_COMMUNITY_PACKAGES="JCB Community Packages"
-COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area.  "
+COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_DESCRIPTION="Here you can manage what package directories show in the JCB package import area."
 COM_COMPONENTBUILDER_CONFIG_JCB_PACKAGE_DIRECTORIES_LABEL="Directories"
 COM_COMPONENTBUILDER_CONFIG_LANGUAGE_LABEL="Language"
 COM_COMPONENTBUILDER_CONFIG_LOCAL_FOLDER="Local Folder"
@@ -3159,7 +3162,7 @@ COM_COMPONENTBUILDER_COPYRIGHT_S="Copyright: %s"
 COM_COMPONENTBUILDER_COULD_NOT_CLEAR_THE_TMP_FOLDER="Could not clear the tmp folder!"
 COM_COMPONENTBUILDER_CREATE="Create"
 COM_COMPONENTBUILDER_CREATE_A_SNIPPET="create a snippet"
-COM_COMPONENTBUILDER_CREATE_NEW_S="Create New %s"
+COM_COMPONENTBUILDER_CREATE_NEW_S="Create new %s"
 COM_COMPONENTBUILDER_CREATE_S_FOR_THIS_S="Create %s for this %s"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW="Custom Admin View"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS="Custom Admin Views"
@@ -3380,7 +3383,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FORWARD_CIRCLE="Forward Circle"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_FORWARD_TWO="Forward 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GENERIC="Generic"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin View Get Snippets Button Access"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GRID_TWO="Grid 2"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_HEALTH="Health"
@@ -3838,7 +3841,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS="PHP/JS"
 COM_COMPONENTBUILDER_CUSTOM_CODE_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_CUSTOM_CODE_REPLACEMENT="Replacement"
 COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
-COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_CUSTOM_CODE_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Custom Code to customise the alias."
 COM_COMPONENTBUILDER_CUSTOM_CODE_STATUS="Status"
 COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME="System Name"
@@ -4027,7 +4030,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_DESCRIPTION="The type of filter you
 COM_COMPONENTBUILDER_DYNAMIC_GET_FILTER_TYPE_LABEL="Filter Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_FUNCTIONVAR="FunctionVar"
 COM_COMPONENTBUILDER_DYNAMIC_GET_G="g"
-COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM="Getcustom"
+COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM="getCustom"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOMS="getCustoms"
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_DESCRIPTION="Set the Method name for this dynamic get."
 COM_COMPONENTBUILDER_DYNAMIC_GET_GETCUSTOM_HINT="getMethodName"
@@ -4095,10 +4098,10 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_MODIFIED_DATE_LABEL="Modified Date"
 COM_COMPONENTBUILDER_DYNAMIC_GET_MULTIPLE="Multiple"
 COM_COMPONENTBUILDER_DYNAMIC_GET_N="n"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME="Name"
-COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_DESCRIPTION="The variable name."
-COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_HINT="variableName"
+COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_DESCRIPTION="Enter Name Here"
+COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_LABEL="Name"
-COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_MESSAGE="Error! Please add variable name here."
+COM_COMPONENTBUILDER_DYNAMIC_GET_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_DYNAMIC_GET_NEW="A New Dynamic Get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NN="nn"
 COM_COMPONENTBUILDER_DYNAMIC_GET_NO="No"
@@ -4172,7 +4175,7 @@ COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_DESCRIPTION="Single row or Multiple ro
 COM_COMPONENTBUILDER_DYNAMIC_GET_ROW_TYPE_LABEL="Return Row Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RR="rr"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
-COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_DYNAMIC_GET_S="s"
 COM_COMPONENTBUILDER_DYNAMIC_GET_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Dynamic Get to customise the alias."
 COM_COMPONENTBUILDER_DYNAMIC_GET_SELECTION_DESCRIPTION="Fields to be selected from table."
@@ -4198,7 +4201,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="Set Type"
+COM_COMPONENTBUILDER_DYNAMIC_GET_TYPE_LABEL="Type"
 COM_COMPONENTBUILDER_DYNAMIC_GET_U="u"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER="User"
 COM_COMPONENTBUILDER_DYNAMIC_GET_USER_GROUPS="User Groups"
@@ -4237,13 +4240,13 @@ COM_COMPONENTBUILDER_EDIT="Edit"
 COM_COMPONENTBUILDER_EDITCREATE_SITE_VIEW="Edit/Create Site View"
 COM_COMPONENTBUILDER_EDITING="Editing"
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
-COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
+COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
-COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
+COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date."
 COM_COMPONENTBUILDER_EDIT_S="Edit %s"
 COM_COMPONENTBUILDER_EDIT_S_FOR_THIS_S="Edit %s for this %s"
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
-COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
+COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EDIT_VIEW="Edit View"
 COM_COMPONENTBUILDER_EMAIL="Email"
 COM_COMPONENTBUILDER_EMAIL_S="Email %s"
@@ -4267,7 +4270,7 @@ COM_COMPONENTBUILDER_EXPANSION_FAILED_PLEASE_CHECK_YOUR_SETTINGS_IN_THE_GLOBAL_O
 COM_COMPONENTBUILDER_EXPORTIMPORT_DATA="Export/Import Data"
 COM_COMPONENTBUILDER_EXPORT_COMPLETED="Export Completed!"
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
-COM_COMPONENTBUILDER_EXPORT_DATA_DESC=" Allows users in this group to export data."
+COM_COMPONENTBUILDER_EXPORT_DATA_DESC="Allows users in this group to export data."
 COM_COMPONENTBUILDER_EXPORT_FAILED="Export Failed"
 COM_COMPONENTBUILDER_EXPORT_FAILED_PLEASE_TRY_AGAIN_LATTER="Export failed, please try again latter!"
 COM_COMPONENTBUILDER_EXPORT_JCB_PACKAGES="Export JCB Packages"
@@ -4701,7 +4704,7 @@ COM_COMPONENTBUILDER_FIELD_OTHER="Other"
 COM_COMPONENTBUILDER_FIELD_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_FIELD_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
-COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_FIELD_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Field to customise the alias."
 COM_COMPONENTBUILDER_FIELD_SCRIPTS="Scripts"
 COM_COMPONENTBUILDER_FIELD_SELECT_AN_OPTION="Select an option"
@@ -4749,24 +4752,24 @@ COM_COMPONENTBUILDER_GET_PACKAGE="Get Package"
 COM_COMPONENTBUILDER_GET_SNIPPET="Get snippet"
 COM_COMPONENTBUILDER_GET_SNIPPETS="Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group to access get snippets."
+COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the custom admin views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DESC="Get the sinppets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC="Allows the users in this group to access the layouts button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the libraries button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the libraries button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the site views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the site views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the snippets button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the snippets button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the templates button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC="Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_INSTALL_IT_LOCALLY="Get the snippet from gitHub and install it locally"
 COM_COMPONENTBUILDER_GET_THE_SNIPPET_FROM_GITHUB_AND_UPDATE_THE_LOCAL_VERSION="Get the snippet from gitHub and update the local version"
 COM_COMPONENTBUILDER_GLOBAL="Global"
@@ -4876,7 +4879,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENT_TITLE_MESSAGE="Error! Please add title here."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE="Type"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_DESCRIPTION="Select the help type."
 COM_COMPONENTBUILDER_HELP_DOCUMENT_TYPE_LABEL="Type"
-COM_COMPONENTBUILDER_HELP_DOCUMENT_URL="Url"
+COM_COMPONENTBUILDER_HELP_DOCUMENT_URL="URL"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_DESCRIPTION="Enter url"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_HINT="http://www.example.com"
 COM_COMPONENTBUILDER_HELP_DOCUMENT_URL_LABEL="URL"
@@ -4901,7 +4904,7 @@ COM_COMPONENTBUILDER_ICON="Icon"
 COM_COMPONENTBUILDER_IEMAILI_BSB="<i>Email:</i> <b>%s</b>"
 COM_COMPONENTBUILDER_IMPORT_CONTINUE="Continue"
 COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_DATA_DESC=" Allows users in this group to import data."
+COM_COMPONENTBUILDER_IMPORT_DATA_DESC="Allows users in this group to import data."
 COM_COMPONENTBUILDER_IMPORT_ERROR="Import error."
 COM_COMPONENTBUILDER_IMPORT_FAILED="Import Failed"
 COM_COMPONENTBUILDER_IMPORT_FILE_COLUMNS="File Columns"
@@ -4947,7 +4950,7 @@ COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_SNIPPETS="Select the file to import
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_TEMPLATES="Select the file to import data to templates."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_FOR_VALIDATION_RULES="Select the file to import data to validation_rules."
 COM_COMPONENTBUILDER_IMPORT_SELECT_FILE_URL="Enter file URL"
-COM_COMPONENTBUILDER_IMPORT_SUCCESS="Great! Import successful."
+COM_COMPONENTBUILDER_IMPORT_SUCCESS="Import Success!"
 COM_COMPONENTBUILDER_IMPORT_TABLE_COLUMNS="Table Columns"
 COM_COMPONENTBUILDER_IMPORT_TITLE="Data Importer"
 COM_COMPONENTBUILDER_IMPORT_UNABLE_TO_FIND_IMPORT_PACKAGE="Package to import not found."
@@ -5086,7 +5089,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_LABEL="Author"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_AUTHOR_MESSAGE="Error! Please add author name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACK="Back"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC="Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM="Bom"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_DESCRIPTION="Select the file that should be used for licensing all files (files found in: administrator/components/com_componentbuilder/compiler)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BOM_LABEL="Licensing Template"
@@ -5100,9 +5103,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_DESCRIPTION="To build the compon
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDCOMP_LABEL="Build Backend-views Dynamically"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BUILDER_BACKUP_KEY="Joomla Component Builder - Backup Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clone button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC="Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME="Companyname"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_DESCRIPTION="Enter Company Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_COMPANYNAME_HINT="Company Name Here"
@@ -5169,10 +5172,10 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_BUILD_BETA="Dynamic Build (beta)"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_DYNAMIC_INTEGRATION="Dynamic Integration"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EDIT="Editing the Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL="Email"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION="Enter Email"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT="demo@example.com"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL="Email"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE="Error! Please add email address here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_DESCRIPTION="Enter Author Email"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_HINT="Author Email Here"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_LABEL="Author Email"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMAIL_MESSAGE="Error! Please author email address here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS="Emptycontributors"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_DESCRIPTION="Set if a list of empty contributor fields should be added."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EMPTYCONTRIBUTORS_LABEL="Empty Contributor Fields"
@@ -5183,7 +5186,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_HINT="http://www.example.c
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_LABEL="Buy Link<br /><small>(to get key)</small>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_BUY_LINK_MESSAGE="Error! Please add link here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the export jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the export jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY="Export Key"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_DESCRIPTION="The key used to lock the data during export."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_KEY_HINT="Export Key Here"
@@ -5195,7 +5198,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE="Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_DESCRIPTION="The component image (product box) for the dashboard and install page, must be 300px X 300px."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMAGE_LABEL="Component Image"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT="Javascript"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_DESCRIPTION="Add JavaScript for the entire back-end. Do not add the script tags."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_JAVASCRIPT_LABEL="Javascript"
@@ -5236,9 +5239,9 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_HINT="codename"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_LABEL="Name in Code"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_CODE_MESSAGE="Error! Please add name in code here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_DESCRIPTION="Enter Name Here"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Component Name"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_HINT="Name Here"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_LABEL="Name"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add component name here."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NAME_MESSAGE="Error! Please add name here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NEW="A New Joomla Component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NO="No"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NONE="None"
@@ -5252,8 +5255,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_DESCRIPTION="
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_BUILDCOMP_DYNAMIC_MYSQL_LABEL="Dynamic Builder (mySql) Option"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_DESCRIPTION="You can add custom files and folders to the component, simply add the files to the administrator/components/com_componentbuilder/custom folder and then select them here.<span id='jform_button_component_files_folders'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_COMPONENT_FILES_FOLDERS_LABEL="Adding Custom Files & Folder"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_CROWDIN_DESCRIPTION="
-<div class='alert alert-warning'>
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_CROWDIN_DESCRIPTION="<div class='alert alert-warning'>
 <h4>Feature not ready?</h4>
 <p>We are still working on this integration, so it is not fully ready. Hopefully with the next update.</p>
 </div>
@@ -5278,7 +5280,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_DYNAMIC_DASHBOARD_LABEL="Dynamic Dash
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_DESCRIPTION="We have moved the views in to their own tabs for your convenience.<span id='jform_button_create_edit_views'></span>"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MOVED_VIEWS_LABEL="To add views, please open the corresponding tab."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_DESCRIPTION="In each admin view you can add data from a MySQL Table (this is done in the admin view MySQL tab). Here you can limit that data in relation to this component. This feature is useful when an admin view with demo data is used in more then one component, and you would like to exclude some demo data without creating a new admin view.<span id='jform_button_mysql_tweak_options'></span>"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL=" MySql Tweak Options"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_MYSQL_TWEAK_OPTIONS_LABEL="MySql Tweak Options"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_DESCRIPTION="Do not add the same view twice it will not work. Please <a href='https://youtu.be/39vY66X7GGU?list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE' target='_blank'>watch this tutorial for more help</a>."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_ADMIN_VIEWS_LABEL="Setting Admin Views"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_NOTE_ON_CONTRIBUTORS_DESCRIPTION="Only add contributors if you would like them listed on the component dashboard."
@@ -5394,7 +5396,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README="Readme"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_README_LABEL="README.md"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER="Sales Server"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_DESCRIPTION="Select your sales server for this component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_SALES_SERVER_LABEL="Sales Server"
@@ -5459,7 +5461,7 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENT_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE="Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_DESCRIPTION="Enter website address"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_HINT="http://www.example.com"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Website"
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_LABEL="Author Website"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WEBSITE_MESSAGE="Error! Please add website here."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK="Whmcs Buy Link"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_WHMCS_BUY_LINK_DESCRIPTION="Enter link where your WHMCS License key can be bought."
@@ -5535,7 +5537,7 @@ COM_COMPONENTBUILDER_LANGUAGES_N_ITEMS_UNPUBLISHED_1="%s Language unpublished."
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
-COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC=" Allows the users in this group to access the build button."
+COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC="Allows the users in this group to access the build button."
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_DESC="The user that created this Language."
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_LANGUAGE_CREATED_DATE_DESC="The date this Language was created."
@@ -5638,7 +5640,7 @@ COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_STATUS="Status"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION="Translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_DESCRIPTION="The translation strings."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_HINT="Translated String Here"
-COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translated String"
+COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_LABEL="Translation"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_TRANSLATION_MESSAGE="Error! Please add translated string here."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_DESC="A count of the number of times this Language Translation has been revised."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATION_VERSION_LABEL="Revision"
@@ -5722,7 +5724,7 @@ COM_COMPONENTBUILDER_LAYOUT_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_LAYOUT_EDIT="Editing the Layout"
 COM_COMPONENTBUILDER_LAYOUT_ERROR_UNIQUE_ALIAS="Another Layout has the same alias."
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Button Access"
-COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LAYOUT_ID="Id"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT="Layout"
 COM_COMPONENTBUILDER_LAYOUT_LAYOUT_DESCRIPTION="Add the layout code here."
@@ -5764,7 +5766,7 @@ COM_COMPONENTBUILDER_LAYOUT_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LAYOUT_YES="Yes"
 COM_COMPONENTBUILDER_LEFT_IN_TAB="Left in Tab"
 COM_COMPONENTBUILDER_LEFT_OF_TABS="Left of Tabs"
-COM_COMPONENTBUILDER_LIBRARIES="Libraries"
+COM_COMPONENTBUILDER_LIBRARIES="libraries"
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS="Libraries Access"
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS_DESC="Allows the users in this group to access access libraries"
 COM_COMPONENTBUILDER_LIBRARIES_BATCH_OPTIONS="Batch process the selected Libraries"
@@ -5893,7 +5895,7 @@ COM_COMPONENTBUILDER_LIBRARY_ANY_SELECTION_ONLY_FOUR_LISTRADIOCHECKBOXESDYNAMIC_
 COM_COMPONENTBUILDER_LIBRARY_BEHAVIOUR="Behaviour"
 COM_COMPONENTBUILDER_LIBRARY_BUNDLE="Bundle"
 COM_COMPONENTBUILDER_LIBRARY_CHAIN="Chain"
-COM_COMPONENTBUILDER_LIBRARY_CONFIG="Library Config"
+COM_COMPONENTBUILDER_LIBRARY_CONFIG="Config"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG="Addconfig"
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_DESCRIPTION="Setup config fields."
 COM_COMPONENTBUILDER_LIBRARY_CONFIG_ADDCONFIG_LABEL="Config"
@@ -5946,7 +5948,7 @@ COM_COMPONENTBUILDER_LIBRARY_EXCLUDE="exclude"
 COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_HINT="Options here"
 COM_COMPONENTBUILDER_LIBRARY_FIELD_OPTIONS_LABEL="Field Options"
 COM_COMPONENTBUILDER_LIBRARY_FILE="File"
-COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS="Library Files, Folders & URLs"
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS="Files, Folders & URLs"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILES="Addfiles"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH="Addfilesfullpath"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ADDFILESFULLPATH_DESCRIPTION="Add files to this component using the full path."
@@ -6046,7 +6048,7 @@ COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTE_CONSTANT_PATHS_LABEL="Const
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_DESCRIPTION="Should file be updated."
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_NOTNEW_LABEL="Update"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_ORDERING_LABEL="Ordering"
-COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure. "
+COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_DESCRIPTION="Path in relation to the folder structure in the install package, <b>unzip the compiled zip file</b> to see the structure."
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_HINT="Target Path Here"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_LABEL="Target Path"
 COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_PATH_MESSAGE="Error! Please add target path."
@@ -6066,7 +6068,7 @@ COM_COMPONENTBUILDER_LIBRARY_FILES_FOLDERS_URLS_VERSION_LABEL="Revision"
 COM_COMPONENTBUILDER_LIBRARY_FILE_DESCRIPTION="to library"
 COM_COMPONENTBUILDER_LIBRARY_FILE_LABEL="Target File Linked"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
-COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LIBRARY_HOW="How"
 COM_COMPONENTBUILDER_LIBRARY_HOW_DESCRIPTION="Select how you want to control the behaviour of the library file inclusion."
 COM_COMPONENTBUILDER_LIBRARY_HOW_LABEL="File Behaviour"
@@ -6179,7 +6181,7 @@ COM_COMPONENTBUILDER_NONE_DB="None DB"
 COM_COMPONENTBUILDER_NONE_SELECTED="None selected"
 COM_COMPONENTBUILDER_NOTICE_BOARD="Notice Board"
 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!"
@@ -6758,7 +6760,7 @@ COM_COMPONENTBUILDER_SITE_VIEW_FORWARD_CIRCLE="Forward Circle"
 COM_COMPONENTBUILDER_SITE_VIEW_FORWARD_TWO="Forward 2"
 COM_COMPONENTBUILDER_SITE_VIEW_GENERIC="Generic"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippets Button Access"
-COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SITE_VIEW_GRID="Grid"
 COM_COMPONENTBUILDER_SITE_VIEW_GRID_TWO="Grid 2"
 COM_COMPONENTBUILDER_SITE_VIEW_HEALTH="Health"
@@ -7074,7 +7076,7 @@ COM_COMPONENTBUILDER_SNIPPET_DETAILS="Details"
 COM_COMPONENTBUILDER_SNIPPET_EDIT="Editing the Snippet"
 COM_COMPONENTBUILDER_SNIPPET_ERROR_UNIQUE_ALIAS="Another Snippet has the same alias."
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPET_HEADING="Heading"
 COM_COMPONENTBUILDER_SNIPPET_HEADING_DESCRIPTION="Enter short heading"
 COM_COMPONENTBUILDER_SNIPPET_HEADING_HINT="Your Heading Here"
@@ -7101,12 +7103,12 @@ COM_COMPONENTBUILDER_SNIPPET_PERMISSION="Permissions"
 COM_COMPONENTBUILDER_SNIPPET_PUBLISHING="Publishing"
 COM_COMPONENTBUILDER_SNIPPET_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Snippet to customise the alias."
 COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS="Snippet Share Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the share snippets button."
+COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the share snippets button."
 COM_COMPONENTBUILDER_SNIPPET_SNIPPET="Snippet"
 COM_COMPONENTBUILDER_SNIPPET_SNIPPET_HINT="// Add the snippets code here"
 COM_COMPONENTBUILDER_SNIPPET_SNIPPET_LABEL="Snippet"
 COM_COMPONENTBUILDER_SNIPPET_STATUS="Status"
-COM_COMPONENTBUILDER_SNIPPET_TYPE="Snippet Type"
+COM_COMPONENTBUILDER_SNIPPET_TYPE="Type"
 COM_COMPONENTBUILDER_SNIPPET_TYPES="Snippet Types"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS="Snippet Types Access"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS_DESC="Allows the users in this group to access access snippet types"
@@ -7147,7 +7149,7 @@ COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_DESC="The user that created this Sn
 COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_BY_LABEL="Created By"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_DESC="The date this Snippet Type was created."
 COM_COMPONENTBUILDER_SNIPPET_TYPE_CREATED_DATE_LABEL="Created Date"
-COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION="Description"
+COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION="Snippet Types"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_DESCRIPTION="Enter some description"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_HINT="Description Here"
 COM_COMPONENTBUILDER_SNIPPET_TYPE_DESCRIPTION_LABEL="Description"
@@ -7303,7 +7305,7 @@ COM_COMPONENTBUILDER_TEMPLATE_DYNAMIC_VALUES_LABEL="Dynamic Values"
 COM_COMPONENTBUILDER_TEMPLATE_EDIT="Editing the Template"
 COM_COMPONENTBUILDER_TEMPLATE_ERROR_UNIQUE_ALIAS="Another Template has the same alias."
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets Button Access"
-COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_TEMPLATE_ID="Id"
 COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES="Libraries"
 COM_COMPONENTBUILDER_TEMPLATE_LIBRARIES_DESCRIPTION="Select the libraries you want to use here."
@@ -7432,7 +7434,7 @@ COM_COMPONENTBUILDER_UP_TO_DATE="Up to date"
 COM_COMPONENTBUILDER_USAGE="Usage"
 COM_COMPONENTBUILDER_USED_IN="used in"
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
-COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
+COM_COMPONENTBUILDER_USE_BATCH_DESC="Allows users in this group to use batch copy/update method."
 COM_COMPONENTBUILDER_USE_KEY="Use Key"
 COM_COMPONENTBUILDER_VALIDATE="Validate"
 COM_COMPONENTBUILDER_VALIDATES_THAT_THE_VALUE_DOES_NOT_APPEAR_AS_A_USERNAME_ON_THE_SYSTEM_THAT_IS_THAT_IT_IS_A_VALID_NEW_USERNAME_DOES_NOT_SYNTAX_CHECK_IT_AS_A_VALID_NAME="Validates that the value does NOT appear as a username on the system; that is, that it is a valid new username. Does not syntax check it as a valid name."
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
index 3bf832b79..4d342ddc2 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.sys.ini
@@ -110,19 +110,19 @@ COM_COMPONENTBUILDER_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU="Admin Views Submenu"
 COM_COMPONENTBUILDER_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of admin view"
 COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS="Admin View Run Expansion Button Access"
-COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_ADMIN_VIEW_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_ACCESS="Compiler Access"
-COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC=" Allows the users in this group to access compiler."
+COM_COMPONENTBUILDER_COMPILER_ACCESS_DESC="Allows the users in this group to access compiler."
 COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS="Compiler Clear tmp Button Access"
-COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_COMPILER_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST="Compiler Dashboard List"
 COM_COMPONENTBUILDER_COMPILER_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Compiler"
 COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS="Compiler Run Expansion Button Access"
-COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_COMPILER_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_COMPILER_SUBMENU="Compiler Submenu"
 COM_COMPONENTBUILDER_COMPILER_SUBMENU_DESC="Allows the users in this group to submenu of Compiler"
 COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS="Compiler Translate Button Access"
-COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the translate button."
+COM_COMPONENTBUILDER_COMPILER_TRANSLATE_BUTTON_ACCESS_DESC="Allows the users in this group to access the translate button."
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS="Components Admin Views Access"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_ACCESS_DESC="Allows the users in this group to access access components admin views"
 COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_USE="Components Admin Views Batch Use"
@@ -351,7 +351,7 @@ COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_IMPORT_DESC="Allows the users in this gr
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU="Custom Admin Views Submenu"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of custom admin view"
 COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Custom Admin View Get Snippets Button Access"
-COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS="Custom Codes Access"
 COM_COMPONENTBUILDER_CUSTOM_CODES_ACCESS_DESC="Allows the users in this group to access access custom codes"
 COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_USE="Custom Codes Batch Use"
@@ -381,7 +381,7 @@ COM_COMPONENTBUILDER_CUSTOM_CODES_IMPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU="Custom Codes Submenu"
 COM_COMPONENTBUILDER_CUSTOM_CODES_SUBMENU_DESC="Allows the users in this group to submenu of custom code"
 COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS="Custom Code Run Expansion Button Access"
-COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_CUSTOM_CODE_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS="Dynamic Gets Access"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_ACCESS_DESC="Allows the users in this group to access access dynamic gets"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_USE="Dynamic Gets Batch Use"
@@ -409,15 +409,15 @@ COM_COMPONENTBUILDER_DYNAMIC_GETS_IMPORT_DESC="Allows the users in this group to
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU="Dynamic Gets Submenu"
 COM_COMPONENTBUILDER_DYNAMIC_GETS_SUBMENU_DESC="Allows the users in this group to submenu of dynamic get"
 COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS="Dynamic Get Run Expansion Button Access"
-COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_DYNAMIC_GET_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_EDIT_CREATED_BY="Edit Created By"
-COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC=" Allows users in this group to edit created by."
+COM_COMPONENTBUILDER_EDIT_CREATED_BY_DESC="Allows users in this group to edit created by."
 COM_COMPONENTBUILDER_EDIT_CREATED_DATE="Edit Created Date"
-COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC=" Allows users in this group to edit created date."
+COM_COMPONENTBUILDER_EDIT_CREATED_DATE_DESC="Allows users in this group to edit created date."
 COM_COMPONENTBUILDER_EDIT_VERSIONS="Edit Version"
-COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC=" Allows users in this group to edit versions."
+COM_COMPONENTBUILDER_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
 COM_COMPONENTBUILDER_EXPORT_DATA="Export Data"
-COM_COMPONENTBUILDER_EXPORT_DATA_DESC=" Allows users in this group to export data."
+COM_COMPONENTBUILDER_EXPORT_DATA_DESC="Allows users in this group to export data."
 COM_COMPONENTBUILDER_FIELDS_ACCESS="Fields Access"
 COM_COMPONENTBUILDER_FIELDS_ACCESS_DESC="Allows the users in this group to access access fields"
 COM_COMPONENTBUILDER_FIELDS_BATCH_USE="Fields Batch Use"
@@ -469,25 +469,25 @@ COM_COMPONENTBUILDER_FIELDTYPES_IMPORT_DESC="Allows the users in this group to i
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU="Fieldtypes Submenu"
 COM_COMPONENTBUILDER_FIELDTYPES_SUBMENU_DESC="Allows the users in this group to submenu of fieldtype"
 COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS="Field Run Expansion Button Access"
-COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_FIELD_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS="Get Snippets Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC=" Allows the users in this group to access get snippets."
+COM_COMPONENTBUILDER_GET_SNIPPETS_ACCESS_DESC="Allows the users in this group to access get snippets."
 COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS="Get Snippets Custom Admin Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the custom admin views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_CUSTOM_ADMIN_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the custom admin views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST="Get Snippets Dashboard List"
 COM_COMPONENTBUILDER_GET_SNIPPETS_DASHBOARD_LIST_DESC="Allows the users in this group to dashboard list of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS="Get Snippets Layouts Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the layouts button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LAYOUTS_BUTTON_ACCESS_DESC="Allows the users in this group to access the layouts button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS="Get Snippets Libraries Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the libraries button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_LIBRARIES_BUTTON_ACCESS_DESC="Allows the users in this group to access the libraries button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS="Get Snippets Site Views Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the site views button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SITE_VIEWS_BUTTON_ACCESS_DESC="Allows the users in this group to access the site views button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS="Get Snippets Snippets Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the snippets button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the snippets button."
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU="Get Snippets Submenu"
 COM_COMPONENTBUILDER_GET_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of Get Snippets"
 COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS="Get Snippets Templates Button Access"
-COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the templates button."
+COM_COMPONENTBUILDER_GET_SNIPPETS_TEMPLATES_BUTTON_ACCESS_DESC="Allows the users in this group to access the templates button."
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS="Help Documents Access"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_ACCESS_DESC="Allows the users in this group to access access help documents"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_USE="Help Documents Batch Use"
@@ -513,7 +513,7 @@ COM_COMPONENTBUILDER_HELP_DOCUMENTS_IMPORT_DESC="Allows the users in this group
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
 COM_COMPONENTBUILDER_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_COMPONENTBUILDER_IMPORT_DATA="Import Data"
-COM_COMPONENTBUILDER_IMPORT_DATA_DESC=" Allows users in this group to import data."
+COM_COMPONENTBUILDER_IMPORT_DATA_DESC="Allows users in this group to import data."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS="Joomla Components Access"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_ACCESS_DESC="Allows the users in this group to access access joomla components"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_USE="Joomla Components Batch Use"
@@ -541,17 +541,17 @@ COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_EDIT_VERSION_DESC="Allows users in this g
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU="Joomla Components Submenu"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_SUBMENU_DESC="Allows the users in this group to submenu of joomla component"
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS="Joomla Component Backup Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the backup button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_BACKUP_BUTTON_ACCESS_DESC="Allows the users in this group to access the backup button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS="Joomla Component Clear tmp Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clear tmp button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLEAR_TMP_BUTTON_ACCESS_DESC="Allows the users in this group to access the clear tmp button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS="Joomla Component Clone Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC=" Allows the users in this group to access the clone button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_CLONE_BUTTON_ACCESS_DESC="Allows the users in this group to access the clone button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Export JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the export jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_EXPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the export jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS="Joomla Component Import JCB Packages Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC=" Allows the users in this group to access the import jcb packages button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_IMPORT_JCB_PACKAGES_BUTTON_ACCESS_DESC="Allows the users in this group to access the import jcb packages button."
 COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS="Joomla Component Run Expansion Button Access"
-COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC=" Allows the users in this group to access the run expansion button."
+COM_COMPONENTBUILDER_JOOMLA_COMPONENT_RUN_EXPANSION_BUTTON_ACCESS_DESC="Allows the users in this group to access the run expansion button."
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS="Languages Access"
 COM_COMPONENTBUILDER_LANGUAGES_ACCESS_DESC="Allows the users in this group to access access languages"
 COM_COMPONENTBUILDER_LANGUAGES_BATCH_USE="Languages Batch Use"
@@ -575,7 +575,7 @@ COM_COMPONENTBUILDER_LANGUAGES_IMPORT_DESC="Allows the users in this group to im
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU="Languages Submenu"
 COM_COMPONENTBUILDER_LANGUAGES_SUBMENU_DESC="Allows the users in this group to submenu of language"
 COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS="Language Build Button Access"
-COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC=" Allows the users in this group to access the build button."
+COM_COMPONENTBUILDER_LANGUAGE_BUILD_BUTTON_ACCESS_DESC="Allows the users in this group to access the build button."
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS="Language Translations Access"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_ACCESS_DESC="Allows the users in this group to access access language translations"
 COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_USE="Language Translations Batch Use"
@@ -627,7 +627,7 @@ COM_COMPONENTBUILDER_LAYOUTS_IMPORT_DESC="Allows the users in this group to impo
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU="Layouts Submenu"
 COM_COMPONENTBUILDER_LAYOUTS_SUBMENU_DESC="Allows the users in this group to submenu of layout"
 COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS="Layout Get Snippets Button Access"
-COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LAYOUT_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS="Libraries Access"
 COM_COMPONENTBUILDER_LIBRARIES_ACCESS_DESC="Allows the users in this group to access access libraries"
 COM_COMPONENTBUILDER_LIBRARIES_BATCH_USE="Libraries Batch Use"
@@ -689,7 +689,7 @@ COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_EDIT_VERSION_DESC="Allows user
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU="Libraries Submenu"
 COM_COMPONENTBUILDER_LIBRARIES_SUBMENU_DESC="Allows the users in this group to submenu of library"
 COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS="Library Get Snippets Button Access"
-COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_LIBRARY_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_MENU="&#10003 Component Builder"
 COM_COMPONENTBUILDER_MENU_ADMIN_VIEWS="Admin Views"
 COM_COMPONENTBUILDER_MENU_COMPILER="Compiler"
@@ -787,7 +787,7 @@ COM_COMPONENTBUILDER_SITE_VIEWS_IMPORT_DESC="Allows the users in this group to i
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU="Site Views Submenu"
 COM_COMPONENTBUILDER_SITE_VIEWS_SUBMENU_DESC="Allows the users in this group to submenu of site view"
 COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS="Site View Get Snippets Button Access"
-COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SITE_VIEW_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPETS_ACCESS="Snippets Access"
 COM_COMPONENTBUILDER_SNIPPETS_ACCESS_DESC="Allows the users in this group to access access snippets"
 COM_COMPONENTBUILDER_SNIPPETS_BATCH_USE="Snippets Batch Use"
@@ -813,9 +813,9 @@ COM_COMPONENTBUILDER_SNIPPETS_IMPORT_DESC="Allows the users in this group to imp
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU="Snippets Submenu"
 COM_COMPONENTBUILDER_SNIPPETS_SUBMENU_DESC="Allows the users in this group to submenu of snippet"
 COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS="Snippet Get Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_SNIPPET_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS="Snippet Share Snippets Button Access"
-COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the share snippets button."
+COM_COMPONENTBUILDER_SNIPPET_SHARE_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the share snippets button."
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS="Snippet Types Access"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_ACCESS_DESC="Allows the users in this group to access access snippet types"
 COM_COMPONENTBUILDER_SNIPPET_TYPES_BATCH_USE="Snippet Types Batch Use"
@@ -859,9 +859,9 @@ COM_COMPONENTBUILDER_TEMPLATES_IMPORT_DESC="Allows the users in this group to im
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU="Templates Submenu"
 COM_COMPONENTBUILDER_TEMPLATES_SUBMENU_DESC="Allows the users in this group to submenu of template"
 COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS="Template Get Snippets Button Access"
-COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC=" Allows the users in this group to access the get snippets button."
+COM_COMPONENTBUILDER_TEMPLATE_GET_SNIPPETS_BUTTON_ACCESS_DESC="Allows the users in this group to access the get snippets button."
 COM_COMPONENTBUILDER_USE_BATCH="Use Batch"
-COM_COMPONENTBUILDER_USE_BATCH_DESC=" Allows users in this group to use batch copy/update method."
+COM_COMPONENTBUILDER_USE_BATCH_DESC="Allows users in this group to use batch copy/update method."
 COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS="Validation Rules Access"
 COM_COMPONENTBUILDER_VALIDATION_RULES_ACCESS_DESC="Allows the users in this group to access access validation rules"
 COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_USE="Validation Rules Batch Use"
diff --git a/admin/models/admin_view.php b/admin/models/admin_view.php
index f1060e295..60b101f90 100644
--- a/admin/models/admin_view.php
+++ b/admin/models/admin_view.php
@@ -215,10 +215,17 @@ class ComponentbuilderModelAdmin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/custom_admin_view.php b/admin/models/custom_admin_view.php
index 3715f696e..f7cbca17b 100644
--- a/admin/models/custom_admin_view.php
+++ b/admin/models/custom_admin_view.php
@@ -134,10 +134,17 @@ class ComponentbuilderModelCustom_admin_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/custom_code.php b/admin/models/custom_code.php
index ba4bf3597..534c3b3cd 100644
--- a/admin/models/custom_code.php
+++ b/admin/models/custom_code.php
@@ -87,10 +87,17 @@ class ComponentbuilderModelCustom_code extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/dynamic_get.php b/admin/models/dynamic_get.php
index 34de750b9..0d899b1c5 100644
--- a/admin/models/dynamic_get.php
+++ b/admin/models/dynamic_get.php
@@ -127,10 +127,17 @@ class ComponentbuilderModelDynamic_get extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/field.php b/admin/models/field.php
index 5299679ee..4ee506d06 100644
--- a/admin/models/field.php
+++ b/admin/models/field.php
@@ -113,10 +113,17 @@ class ComponentbuilderModelField extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/fieldtype.php b/admin/models/fieldtype.php
index 034c109d5..8e12d7c13 100644
--- a/admin/models/fieldtype.php
+++ b/admin/models/fieldtype.php
@@ -93,10 +93,17 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/joomla_component.php b/admin/models/joomla_component.php
index aba4c89d1..cc9b9fe04 100644
--- a/admin/models/joomla_component.php
+++ b/admin/models/joomla_component.php
@@ -238,10 +238,17 @@ class ComponentbuilderModelJoomla_component extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/layout.php b/admin/models/layout.php
index 5b0f5c243..76abad48b 100644
--- a/admin/models/layout.php
+++ b/admin/models/layout.php
@@ -91,10 +91,17 @@ class ComponentbuilderModelLayout extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/library.php b/admin/models/library.php
index b31ee1b58..113d048e8 100644
--- a/admin/models/library.php
+++ b/admin/models/library.php
@@ -104,10 +104,17 @@ class ComponentbuilderModelLibrary extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/placeholder.php b/admin/models/placeholder.php
index 085e4e3e2..6b78fa74d 100644
--- a/admin/models/placeholder.php
+++ b/admin/models/placeholder.php
@@ -71,10 +71,17 @@ class ComponentbuilderModelPlaceholder extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/site_view.php b/admin/models/site_view.php
index c834dc5b0..8192eefa8 100644
--- a/admin/models/site_view.php
+++ b/admin/models/site_view.php
@@ -137,10 +137,17 @@ class ComponentbuilderModelSite_view extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/admin/models/template.php b/admin/models/template.php
index 90b76ef76..91d6ceabb 100644
--- a/admin/models/template.php
+++ b/admin/models/template.php
@@ -91,10 +91,17 @@ class ComponentbuilderModelTemplate extends JModelAdmin
 		return JTable::getInstance($type, $prefix, $config);
 	}
 
+	/**
+	 * get VDM session key
+	 *
+	 * @return  string  the session key
+	 *
+	 */
 	public function getVDM()
 	{
 		return $this->vastDevMod;
 	}
+
     
 	/**
 	 * Method to get a single record.
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 4bef149a0..ec2992e97 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>1st July, 2019</creationDate>
+	<creationDate>4th July, 2019</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
diff --git a/script.php b/script.php
index 1e0439d9d..d093920ee 100644
--- a/script.php
+++ b/script.php
@@ -4124,7 +4124,7 @@ class com_componentbuilderInstallerScript
 			$query = $db->getQuery(true);
 			// Field to update.
 			$fields = array(
-				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"&#187;","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
+				$db->quoteName('params') . ' = ' . $db->quote('{"autorName":"Llewellyn van der Merwe","autorEmail":"llewellyn@joomlacomponentbuilder.com","editor":"none","manage_jcb_package_directories":"2","add_menu_prefix":"1","menu_prefix":"»","minify":"0","set_browser_storage":"1","storage_time_to_live":"global","language":"en-GB","percentagelanguageadd":"50","compiler_field_builder_type":"2","field_name_builder":"1","development_method":"1","expansion":"0","return_options_build":"2","cronjob_backup_type":"1","cronjob_backup_server":"0","backup_package_name":"JCB_Backup_[YEAR]_[MONTH]_[DAY]","export_license":"GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html","export_copyright":"Copyright (C) 2015. All Rights Reserved","check_in":"-1 day","save_history":"1","history_limit":"10","uikit_load":"1","uikit_min":"","uikit_style":""}'),
 			);
 			// Condition.
 			$conditions = array(
diff --git a/site/helpers/componentbuilder.php b/site/helpers/componentbuilder.php
index ec7f161ff..09f1078ac 100644
--- a/site/helpers/componentbuilder.php
+++ b/site/helpers/componentbuilder.php
@@ -132,19 +132,21 @@ abstract class ComponentbuilderHelper
 	/**
 	* Making field names safe
 	*
-	* @input	string   The you would like to make safe
+	* @input	string       The you would like to make safe
+	* @input	boolean      The switch to return an ALL UPPER CASE string
+	* @input	string       The string to use in white space
 	*
 	* @returns string on success
 	**/
-	public static function safeFieldName($string, $spacer = '_')
+	public static function safeFieldName($string, $allcap = false, $spacer = '_')
 	{
 		// get global value
 		if (self::$fieldNameBuilder === false)
 		{
-			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 0); // change this to 1 for testing the new convention
+			self::$fieldNameBuilder = JComponentHelper::getParams('com_componentbuilder')->get('field_name_builder', 1);
 		}
 		// use the new convention
-		if (1 == self::$fieldNameBuilder)
+		if (2 == self::$fieldNameBuilder)
 		{
 			// 0nly continue if we have a string
 			if (self::checkString($string))
@@ -162,12 +164,22 @@ abstract class ComponentbuilderHelper
 				$string = preg_replace("/[^A-Za-z0-9 ]/", '', $string);
 				// replace white space with underscore (SAFEST OPTION)
 				$string = preg_replace('/\s+/', $spacer, $string);
+				// return all caps
+				if ($allcap)
+				{
+					return strtoupper($string);
+				}
 				// default is to return lower
 				return strtolower($string);
 			}
 			// not a string
 			return '';
 		}
+		// return all caps
+		if ($allcap)
+		{
+			return self::safeString($string, 'U');
+		}
 		// use the default (original behaviour/convention)
 		return self::safeString($string);
 	}
@@ -4805,38 +4817,42 @@ abstract class ComponentbuilderHelper
 	/**
 	* Get any component's model
 	**/
-	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $component = 'Componentbuilder', $config = array())
+	public static function getModel($name, $path = JPATH_COMPONENT_SITE, $Component = 'Componentbuilder', $config = array())
 	{
 		// fix the name
 		$name = self::safeString($name);
-		// full path
-		$fullPath = $path . '/models';
-		// set prefix
-		$prefix = $component.'Model';
+		// full path to models
+		$fullPathModels = $path . '/models';
 		// load the model file
-		JModelLegacy::addIncludePath($fullPath, $prefix);
+		JModelLegacy::addIncludePath($fullPathModels, $Component . 'Model');
+		// make sure the table path is loaded
+		if (!isset($config['table_path']) || !self::checkString($config['table_path']))
+		{
+			// This is the JCB default path to tables in Joomla 3.x
+			$config['table_path'] = JPATH_ADMINISTRATOR . '/components/com_' . strtolower($Component) . '/tables';
+		}
 		// get instance
-		$model = JModelLegacy::getInstance($name, $prefix, $config);
+		$model = JModelLegacy::getInstance($name, $Component . 'Model', $config);
 		// if model not found (strange)
 		if ($model == false)
 		{
 			jimport('joomla.filesystem.file');
 			// get file path
-			$filePath = $path.'/'.$name.'.php';
-			$fullPath = $fullPath.'/'.$name.'.php';
+			$filePath = $path . '/' . $name . '.php';
+			$fullPathModel = $fullPathModels . '/' . $name . '.php';
 			// check if it exists
 			if (JFile::exists($filePath))
 			{
 				// get the file
 				require_once $filePath;
 			}
-			elseif (JFile::exists($fullPath))
+			elseif (JFile::exists($fullPathModel))
 			{
 				// get the file
-				require_once $fullPath;
+				require_once $fullPathModel;
 			}
 			// build class names
-			$modelClass = $prefix.$name;
+			$modelClass = $Component . 'Model' . $name;
 			if (class_exists($modelClass))
 			{
 				// initialize the model