diff --git a/componentbuilderadminheaderstabs.php b/componentbuilderadminheaderstabs.php
index 6ffe6fe..e57c89c 100644
--- a/componentbuilderadminheaderstabs.php
+++ b/componentbuilderadminheaderstabs.php
@@ -5,7 +5,7 @@
  * @created    30th April, 2015
  * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
  * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -21,7 +21,7 @@ JLoader::register('ComponentbuilderHelper', JPATH_ADMINISTRATOR . '/components/c
  * Content - Componentbuilder Admin Headers Tabs plugin.
  *
  * @package   ComponentbuilderAdminHeadersTabs
- * @since     1.0.0
+ * @since     1.0.1
  */
 class PlgContentComponentbuilderAdminHeadersTabs extends CMSPlugin
 {
diff --git a/componentbuilderadminheaderstabs.xml b/componentbuilderadminheaderstabs.xml
index c67a955..cabc980 100644
--- a/componentbuilderadminheaderstabs.xml
+++ b/componentbuilderadminheaderstabs.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="plugin" version="3.8" group="content" method="upgrade">
 	<name>PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS</name>
-	<creationDate>8th December, 2020</creationDate>
+	<creationDate>20th February, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>
-	<copyright>Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.</copyright>
+	<copyright>Copyright (C) 2015 Vast Development Method. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<description>PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION</description>
 
 	<!-- Scripts to run on installation -->
diff --git a/forms/admin_view.xml b/forms/admin_view.xml
index b8159b3..83a17a8 100644
--- a/forms/admin_view.xml
+++ b/forms/admin_view.xml
@@ -8,38 +8,6 @@
 		addfieldpath="/plugins/content/componentbuilderadminheaderstabs/fields"
 	>
 	<fields name="admin_view_headers">
-		<!-- Add_admin_view_controller Field. Type: Radio. (joomla) -->
-		<field
-			type="radio"
-			name="add_admin_view_controller"
-			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_CONTROLLER_LABEL"
-			class="btn-group btn-group-yesno"
-			default="0"
-			required="true">
-			<!-- Option Set. -->
-			<option value="1">
-				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES</option>
-			<option value="0">
-				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
-		</field>
-		<!-- Admin_view_controller Field. Type: Editor. (joomla) -->
-		<field
-			type="editor"
-			name="admin_view_controller"
-			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_LABEL"
-			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_DESCRIPTION"
-			width="100%"
-			height="100px"
-			cols="15"
-			rows="10"
-			buttons="no"
-			syntax="php"
-			editor="codemirror|none"
-			filter="raw"
-			required="false"
-			validate="code"
-			showon="add_admin_view_controller:1"
-		/>
 		<!-- Add_admin_view_model Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
@@ -72,11 +40,11 @@
 			validate="code"
 			showon="add_admin_view_model:1"
 		/>
-		<!-- Add_admin_views_controller Field. Type: Radio. (joomla) -->
+		<!-- Add_admin_view Field. Type: Radio. (joomla) -->
 		<field
 			type="radio"
-			name="add_admin_views_controller"
-			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_CONTROLLER_LABEL"
+			name="add_admin_view"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_LABEL"
 			class="btn-group btn-group-yesno"
 			default="0"
 			required="true">
@@ -86,12 +54,44 @@
 			<option value="0">
 				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
 		</field>
-		<!-- Admin_views_controller Field. Type: Editor. (joomla) -->
+		<!-- Admin_view Field. Type: Editor. (joomla) -->
 		<field
 			type="editor"
-			name="admin_views_controller"
-			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_LABEL"
-			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_DESCRIPTION"
+			name="admin_view"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="safehtml"
+			required="false"
+			validate="code"
+			showon="add_admin_view:1"
+		/>
+		<!-- Add_admin_view_controller Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_admin_view_controller"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_CONTROLLER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES</option>
+			<option value="0">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
+		</field>
+		<!-- Admin_view_controller Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="admin_view_controller"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_DESCRIPTION"
 			width="100%"
 			height="100px"
 			cols="15"
@@ -102,7 +102,7 @@
 			filter="raw"
 			required="false"
 			validate="code"
-			showon="add_admin_views_controller:1"
+			showon="add_admin_view_controller:1"
 		/>
 		<!-- Add_admin_views_model Field. Type: Radio. (joomla) -->
 		<field
@@ -136,6 +136,134 @@
 			validate="code"
 			showon="add_admin_views_model:1"
 		/>
+		<!-- Add_admin_views Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_admin_views"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES</option>
+			<option value="0">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
+		</field>
+		<!-- Admin_views Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="admin_views"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+			showon="add_admin_views:1"
+		/>
+		<!-- Add_admin_views_controller Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_admin_views_controller"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_CONTROLLER_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES</option>
+			<option value="0">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
+		</field>
+		<!-- Admin_views_controller Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="admin_views_controller"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+			showon="add_admin_views_controller:1"
+		/>
+		<!-- Add_site_admin_view_model Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_site_admin_view_model"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_SITE_ADMIN_VIEW_MODEL_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES</option>
+			<option value="0">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
+		</field>
+		<!-- Site_admin_view_model Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="site_admin_view_model"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_MODEL_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_MODEL_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="raw"
+			required="false"
+			validate="code"
+			showon="add_site_admin_view_model:1"
+		/>
+		<!-- Add_site_admin_view Field. Type: Radio. (joomla) -->
+		<field
+			type="radio"
+			name="add_site_admin_view"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_SITE_ADMIN_VIEW_LABEL"
+			class="btn-group btn-group-yesno"
+			default="0"
+			required="true">
+			<!-- Option Set. -->
+			<option value="1">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES</option>
+			<option value="0">
+				PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO</option>
+		</field>
+		<!-- Site_admin_view Field. Type: Editor. (joomla) -->
+		<field
+			type="editor"
+			name="site_admin_view"
+			label="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_LABEL"
+			description="PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_DESCRIPTION"
+			width="100%"
+			height="100px"
+			cols="15"
+			rows="10"
+			buttons="no"
+			syntax="php"
+			editor="codemirror|none"
+			filter="safehtml"
+			required="false"
+			validate="code"
+			showon="add_site_admin_view:1"
+		/>
 	</fields>
 	</fieldset>
 	</fields>
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini
index d9fd701..68a7345 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.ini
@@ -1,22 +1,38 @@
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS="Content - Componentbuilder Admin Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_DESCRIPTION="This plugin is used to set admin class custom headers."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='http://www.joomlacomponentbuilder.com' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 27th October, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='http://www.joomlacomponentbuilder.com' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 27th October, 2020</small></p>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_CLASS_HEADERS="Class Headers"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_CONTROLLER_LABEL="Target Admin View<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_MODEL_LABEL="Target Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Yes"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO="No"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_LABEL="Class Header<br />
-<small>(admin.view.controller)</small>"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_DESCRIPTION="The class header for admin view controller."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_MODEL_LABEL="Target Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_MODEL_LABEL="Class Header<br />
 <small>(admin.view.model)</small>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_MODEL_DESCRIPTION="The class header for admin view model."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_LABEL="Target Admin View<br />Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_LABEL="Class Header<br />
+<small>(admin.view)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_DESCRIPTION="The class header for admin view."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_CONTROLLER_LABEL="Target Admin View<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_LABEL="Class Header<br />
+<small>(admin.view.controller)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_DESCRIPTION="The class header for admin view controller."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_MODEL_LABEL="Target Admin Views<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_LABEL="Class Header<br />
+<small>(admin.views.model)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_DESCRIPTION="The class header for admin views model."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_LABEL="Target Admin Views<br />Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_LABEL="Class Header<br />
+<small>(admin.views)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_DESCRIPTION="The class header for admin views."
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_CONTROLLER_LABEL="Target Admin Views<br />Controller Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_LABEL="Class Header<br />
 <small>(admin.views.controller)</small>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_DESCRIPTION="The class header for admin views controller."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_MODEL_LABEL="Target Admin Views<br />Model Header"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_LABEL="Class Header<br />
-<small>(admin.views.model)</small>"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_DESCRIPTION="The class header for admin views model."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_SITE_ADMIN_VIEW_MODEL_LABEL="Target Site Admin View<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_MODEL_LABEL="Class Header<br />
+<small>(site.admin.view.model)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_MODEL_DESCRIPTION="The class header for site admin view model. So only use this if you have selected the admin edit view to be added to the site area."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_SITE_ADMIN_VIEW_LABEL="Target Site Admin View<br />Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_LABEL="Class Header<br />
+<small>(site.admin.view)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_DESCRIPTION="The class header for site admin view. So only use this if you have selected the admin edit view to be added to the site area."
\ No newline at end of file
diff --git a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini
index d9fd701..68a7345 100644
--- a/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini
+++ b/language/en-GB/en-GB.plg_content_componentbuilderadminheaderstabs.sys.ini
@@ -1,22 +1,38 @@
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS="Content - Componentbuilder Admin Headers Tabs"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_DESCRIPTION="This plugin is used to set admin class custom headers."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.1.0.0)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='http://www.joomlacomponentbuilder.com' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 27th October, 2020</small></p>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_XML_DESCRIPTION="<h1>Content - Componentbuilder Admin Headers Tabs (v.1.0.1)</h1> <div style='clear: both;'></div><p>This plugin is used to set admin class custom headers.</p><p>Created by <a href='http://www.joomlacomponentbuilder.com' target='_blank'>Llewellyn van der Merwe</a><br /><small>Development started 27th October, 2020</small></p>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_CLASS_HEADERS="Class Headers"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_CONTROLLER_LABEL="Target Admin View<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_MODEL_LABEL="Target Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_YES="Yes"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_NO="No"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_LABEL="Class Header<br />
-<small>(admin.view.controller)</small>"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_DESCRIPTION="The class header for admin view controller."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_MODEL_LABEL="Target Admin View<br />Model Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_MODEL_LABEL="Class Header<br />
 <small>(admin.view.model)</small>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_MODEL_DESCRIPTION="The class header for admin view model."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_LABEL="Target Admin View<br />Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_LABEL="Class Header<br />
+<small>(admin.view)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_DESCRIPTION="The class header for admin view."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEW_CONTROLLER_LABEL="Target Admin View<br />Controller Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_LABEL="Class Header<br />
+<small>(admin.view.controller)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEW_CONTROLLER_DESCRIPTION="The class header for admin view controller."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_MODEL_LABEL="Target Admin Views<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_LABEL="Class Header<br />
+<small>(admin.views.model)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_DESCRIPTION="The class header for admin views model."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_LABEL="Target Admin Views<br />Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_LABEL="Class Header<br />
+<small>(admin.views)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_DESCRIPTION="The class header for admin views."
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_CONTROLLER_LABEL="Target Admin Views<br />Controller Header"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_LABEL="Class Header<br />
 <small>(admin.views.controller)</small>"
 PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_CONTROLLER_DESCRIPTION="The class header for admin views controller."
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_ADMIN_VIEWS_MODEL_LABEL="Target Admin Views<br />Model Header"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_LABEL="Class Header<br />
-<small>(admin.views.model)</small>"
-PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADMIN_VIEWS_MODEL_DESCRIPTION="The class header for admin views model."
\ No newline at end of file
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_SITE_ADMIN_VIEW_MODEL_LABEL="Target Site Admin View<br />Model Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_MODEL_LABEL="Class Header<br />
+<small>(site.admin.view.model)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_MODEL_DESCRIPTION="The class header for site admin view model. So only use this if you have selected the admin edit view to be added to the site area."
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_ADD_SITE_ADMIN_VIEW_LABEL="Target Site Admin View<br />Header"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_LABEL="Class Header<br />
+<small>(site.admin.view)</small>"
+PLG_CONTENT_COMPONENTBUILDERADMINHEADERSTABS_SITE_ADMIN_VIEW_DESCRIPTION="The class header for site admin view. So only use this if you have selected the admin edit view to be added to the site area."
\ No newline at end of file
diff --git a/rules/code.php b/rules/code.php
index 0f97f97..24935da 100644
--- a/rules/code.php
+++ b/rules/code.php
@@ -5,7 +5,7 @@
  * @created    30th April, 2015
  * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
  * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
diff --git a/script.php b/script.php
index 1bb285b..7d40f47 100644
--- a/script.php
+++ b/script.php
@@ -5,7 +5,7 @@
  * @created    30th April, 2015
  * @author     Llewellyn van der Merwe <http://www.joomlacomponentbuilder.com>
  * @github     Joomla Component Builder <https://github.com/vdm-io/Joomla-Component-Builder>
- * @copyright  Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
+ * @copyright  Copyright (C) 2015 Vast Development Method. All rights reserved.
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
@@ -60,8 +60,8 @@ class plgContentComponentbuilderAdminHeadersTabsInstallerScript
 			{
 				// get the version
 				$jcbVersion = explode('.', $manifest->version);
-				// check that we have JCB 2.11.7 or higher installed
-				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 2 && $jcbVersion[1] >= 11 && (($jcbVersion[1] == 11 && $jcbVersion[2] >= 7) || ($jcbVersion[1] > 11)))
+				// check that we have JCB 2.12.6 or higher installed
+				if (count($jcbVersion) == 3 && $jcbVersion[0] >= 2 && (($jcbVersion[1] == 12 && $jcbVersion[2] >= 6) || $jcbVersion[1] > 12))
 				{
 					$blockInstall = false;
 				}
@@ -69,7 +69,7 @@ class plgContentComponentbuilderAdminHeadersTabsInstallerScript
 			// allow install if all conditions are met
 			if ($blockInstall)
 			{
-				$app->enqueueMessage('Please upgrade to JCB 2.12.1 or higher before installing this plugin.', 'error');
+				$app->enqueueMessage('Please upgrade to JCB 2.12.6 or higher before installing this plugin.', 'error');
 				return false;
 			}
 		}