diff --git a/README.md b/README.md
index 522730b52..d854317a9 100644
--- a/README.md
+++ b/README.md
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 11th January, 2020
++ *Last Build*: 12th January, 2020
 + *Version*: 2.10.10
 + *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*: **281402**
++ *Line count*: **281445**
 + *Field count*: **1505**
 + *File count*: **1769**
 + *Folder count*: **280**
diff --git a/admin/README.txt b/admin/README.txt
index 522730b52..d854317a9 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 11th January, 2020
++ *Last Build*: 12th January, 2020
 + *Version*: 2.10.10
 + *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*: **281402**
++ *Line count*: **281445**
 + *Field count*: **1505**
 + *File count*: **1769**
 + *Folder count*: **280**
diff --git a/admin/language/en-GB/en-GB.com_componentbuilder.ini b/admin/language/en-GB/en-GB.com_componentbuilder.ini
index bc383da50..79a0d3204 100644
--- a/admin/language/en-GB/en-GB.com_componentbuilder.ini
+++ b/admin/language/en-GB/en-GB.com_componentbuilder.ini
@@ -1431,6 +1431,7 @@ COM_COMPONENTBUILDER_BGET_THE_KEY_FROM_SB_FOR_A_SSA="<b>Get the key from %s</b>
 COM_COMPONENTBUILDER_BIMAGESB_NOT_MOVED_TO_CORRECT_LOCATION="<b>Images</b> not moved to correct location!"
 COM_COMPONENTBUILDER_BMULTIPLE_FIELD_REPEATABLE_MODEB_IDS_MISMATCH_IN_BFIELDSB_AND_WAS_EMREMOVEDEM_FROM_THE_FIELD="<b>Multiple Field (repeatable mode)</b> id:%s mismatch in <b>field:%s</b>, and was <em>removed</em> from the field."
 COM_COMPONENTBUILDER_BOILERPLATE_PLUGIN_S_DATA_COULD_NOT_BE_SAVED="Boilerplate (plugin - %s) data could not be saved"
+COM_COMPONENTBUILDER_BOTH="Both"
 COM_COMPONENTBUILDER_BSBS_IN_BSB_HAS_ID_MISMATCH_SO_THE_BSB_WAS_REMOVED="<b>%s</b>->%s in <b>%s</b> has id mismatch. So the <b>%s</b> was removed!"
 COM_COMPONENTBUILDER_BSB_COULD_NOT_BE_IMPORTEDS="<b>%s</b> could not be imported%s"
 COM_COMPONENTBUILDER_BSB_HAS_BEEN_IMPORTED="<b>%s</b> has been imported!"
diff --git a/admin/views/assistant/tmpl/default_jcbviewsplan.php b/admin/views/assistant/tmpl/default_jcbviewsplan.php
index b0c62d451..a11ea16ea 100644
--- a/admin/views/assistant/tmpl/default_jcbviewsplan.php
+++ b/admin/views/assistant/tmpl/default_jcbviewsplan.php
@@ -21,12 +21,53 @@ defined('_JEXEC') or die('Restricted access');
 </div>
 <script type="text/javascript">
 var active_view = 'view0';
+var created_fields = {};
+jQuery(document).on('subform-row-add', function(event, row){
+	setFieldNames();
+	setListViewFieldOptions();
+});
 function setJCBuilder(area, view, target){
 	// set the active view 
 	active_view = view;
-	console.log(active_view);
-	console.log(jQuery(area).attr('id'));
-	console.log(target);
+	// build fields
+	if (target == 2){
+		setFieldNames();
+		setListViewFieldOptions();
+	}
+}
+function setListViewFieldOptions(){
+	// build fields
+	if (created_fields.hasOwnProperty(active_view)){
+		jQuery('#modal-listview-' + active_view).find('.list_view_field_option').each(function( i, field ) {
+			// get field ID
+			var field_id = jQuery(field).attr('id');
+			// get the value selected
+			var selected_value =  jQuery("#" + field_id + " option:selected").val();
+			// clear the options out
+			jQuery("#" + field_id).find('option').remove().end();
+			// add inactive value
+			jQuery('#' + field_id).append('<option value="0">' + Joomla.JText._('COM_COMPONENTBUILDER_INACTIVE_COLUMN') + '</option>');
+			// add fields available
+			jQuery.each( created_fields[active_view], function( id, name ) {
+				jQuery('#'+ field_id).append('<option value="' + name + '">' + name + '</option>');
+			});
+			jQuery('#' + field_id).val(selected_value);
+			jQuery('#' + field_id).trigger('liszt:updated');
+		});
+	}
+}
+function setFieldNames(){
+	// always reset
+	created_fields[active_view] = {};
+	// build fields
+	jQuery('#modal-fields-' + active_view).find('.field_name').each(function( i, field ) {
+		// get field name  ID
+		var field_name_id = jQuery(field).attr('id');
+		// get the value selected
+		var field_name_value =  jQuery("#" + field_name_id).val();
+		// add/update field
+		created_fields[active_view][field_name_id] = field_name_value;
+	});
 }
 function setFieldTypeOptions(obj){
 	// get type id
diff --git a/admin/views/assistant/view.html.php b/admin/views/assistant/view.html.php
index 71f2ffc0c..85c734fd1 100644
--- a/admin/views/assistant/view.html.php
+++ b/admin/views/assistant/view.html.php
@@ -206,7 +206,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_FIELD_NAME',
 				'size' => '40',
 				'maxlength' => '150',
-				'class' => 'text_area',
+				'class' => 'text_area field_name',
 				'hint' => 'COM_COMPONENTBUILDER_FIELD_NAME',
 				'filter' => 'STRING'
 			);
@@ -394,12 +394,12 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'description' => 'COM_COMPONENTBUILDER_AREA',
 				'required' => true,
 				'class' => 'list_class',
-				'default' => '1'
+				'default' => '3'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($targetXML, $targetAttribute);
 			// add the options
-			ComponentbuilderHelper::xmlAddOptions($targetXML, array(1 => 'COM_COMPONENTBUILDER_ADMIN', 2 => 'COM_COMPONENTBUILDER_SITE'));
+			ComponentbuilderHelper::xmlAddOptions($targetXML, array(3 => 'COM_COMPONENTBUILDER_BOTH', 1 => 'COM_COMPONENTBUILDER_ADMIN', 2 => 'COM_COMPONENTBUILDER_SITE'));
 			// now add the fields to the child form
 			ComponentbuilderHelper::xmlAppend($sub_childform, $targetXML);
 
@@ -412,7 +412,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_FIRSTTITLE_COLUMN',
 				'multiple' => false,
 				'required' => true,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -430,7 +430,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_SECOND_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -448,7 +448,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_THIRD_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -466,7 +466,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_FORTH_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -484,7 +484,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_FIFTH_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -502,7 +502,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_SITH_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -520,7 +520,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_SEVENT_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -538,7 +538,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 				'label' => 'COM_COMPONENTBUILDER_EIGHT_COLUMN',
 				'multiple' => false,
 				'required' => false,
-				'class' => 'list_class'
+				'class' => 'list_class list_view_field_option'
 			);
 			// load the subform attributes
 			ComponentbuilderHelper::xmlAddAttributes($nameXML, $nameAttribute);
@@ -743,6 +743,7 @@ class ComponentbuilderViewAssistant extends JViewLegacy
 		JText::script('COM_COMPONENTBUILDER_PROPERTY_VALUE_IS_MANDATORY');
 		JText::script('COM_COMPONENTBUILDER_PROPERTY_VALUE_IS_TRANSLATABLE');
 		JText::script('COM_COMPONENTBUILDER_NOT_AVAILABLE');
+		JText::script('COM_COMPONENTBUILDER_INACTIVE_COLUMN');
 		// Set the local plans array
 		$this->document->addScriptDeclaration("var local_plans = '';");
 		// add the document default css file
diff --git a/componentbuilder.xml b/componentbuilder.xml
index 397a43634..e0f1d7f90 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>11th January, 2020</creationDate>
+	<creationDate>12th January, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>