diff --git a/src/components/com_tjucm/administrator/access.xml b/src/components/com_tjucm/administrator/access.xml
index 54b33349..8f34851d 100644
--- a/src/components/com_tjucm/administrator/access.xml
+++ b/src/components/com_tjucm/administrator/access.xml
@@ -19,5 +19,6 @@
 		<action name="core.type.edititemstate" title="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE" description="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE_DESC" />
 		<action name="core.type.editownitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITOWN" description="COM_TJUCM_PERMISSION_TYPE_ITEM_EDITOWN_DESC" />
 		<action name="core.type.deleteitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE" description="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE_DESC" />
+		<action name="core.type.deleteownitem" title="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETEOWN" description="COM_TJUCM_PERMISSION_TYPE_ITEM_DELETEOWN_DESC" />
 	</section>
 </access>
diff --git a/src/components/com_tjucm/administrator/assets/js/ays-beforeunload-shim.js b/src/components/com_tjucm/administrator/assets/js/ays-beforeunload-shim.js
index 4b59c183..77ea344b 100644
--- a/src/components/com_tjucm/administrator/assets/js/ays-beforeunload-shim.js
+++ b/src/components/com_tjucm/administrator/assets/js/ays-beforeunload-shim.js
@@ -3,18 +3,18 @@ $(function() {
         return
     }
     $('a').bind('click', function(evt) {
-        let href = $(evt.target).closest('a').attr('href');
-        let response = '';
-        let msg = '';
-        if (href !== undefined && !(href.match(/^#/) || href.trim() == '')) {
-            response = $(window).triggerHandler('beforeunload', response);
-            if (response && response != "") {
-                msg = response + "\n\n" + "Press OK to leave this page or Cancel to stay.";
-                if (!confirm(msg)) {
+        var tjucm_href = $(evt.target).closest('a').attr('href');
+        var tjucm_response = '';
+        var tjucm_msg = '';
+        if (tjucm_href !== undefined && !(tjucm_href.match(/^#/) || tjucm_href.trim() == '')) {
+            tjucm_response = $(window).triggerHandler('beforeunload', tjucm_response);
+            if (tjucm_response && tjucm_response != "") {
+                tjucm_msg = tjucm_response + "\n\n" + "Press OK to leave this page or Cancel to stay.";
+                if (!confirm(tjucm_msg)) {
                     return !1
                 }
             }
-            window.location.href = href;
+            window.location.tjucm_href = tjucm_href;
             return !1
         }
         return !0
diff --git a/src/components/com_tjucm/administrator/assets/js/tjucm.js b/src/components/com_tjucm/administrator/assets/js/tjucm.js
index db5d9a0d..c444db6b 100644
--- a/src/components/com_tjucm/administrator/assets/js/tjucm.js
+++ b/src/components/com_tjucm/administrator/assets/js/tjucm.js
@@ -16,8 +16,8 @@ var tjUcm = {
 				return false;
 			}
 
-			let cid = jQuery("input[name='cid[]']:checked");
-			let url = Joomla.getOptions('system.paths').base + "/index.php?option=com_tjucm&task=types.export&tmpl=component&"+Joomla.getOptions('csrf.token')+"=1";
+			var cid = jQuery("input[name='cid[]']:checked");
+			var url = Joomla.getOptions('system.paths').base + "/index.php?option=com_tjucm&task=types.export&tmpl=component&"+Joomla.getOptions('csrf.token')+"=1";
 
 			jQuery.each(cid, function(index, ele) {
 				url += '&cid[]='+ele.value;
@@ -28,12 +28,12 @@ var tjUcm = {
 	},
 	admin:{
 		openTjUcmSqueezeBox: function (link, modalWidth, modalHeight){
-			let width = jQuery(window).width();
-			let height = jQuery(window).height();
+			var width = jQuery(window).width();
+			var height = jQuery(window).height();
 
-			let wwidth = width-(width*((100-modalWidth)/100));
-			let hheight = height-(height*((100-modalHeight)/100));
+			var wwidth = width-(width*((100-modalWidth)/100));
+			var hheight = height-(height*((100-modalHeight)/100));
 			parent.SqueezeBox.open(link, { handler: 'iframe', size: {x: wwidth, y: hheight},classWindow: 'tjucm-modal'});
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/src/components/com_tjucm/administrator/assets/js/tjucm_ajaxForm_save.js b/src/components/com_tjucm/administrator/assets/js/tjucm_ajaxForm_save.js
index 897435a2..a5c88610 100644
--- a/src/components/com_tjucm/administrator/assets/js/tjucm_ajaxForm_save.js
+++ b/src/components/com_tjucm/administrator/assets/js/tjucm_ajaxForm_save.js
@@ -5,30 +5,28 @@ var tjucmRelatedFieldUpdatedOptions = '';
 jQuery(document).ready(function()
 {
 	/*Code to get item state*/
-	let itemState = jQuery('#itemState').val();
+	var itemState = jQuery('#itemState').val();
 
 	/*Code for auto save on blur event add new record or editing draft record only*/
 	if (itemState == '' || itemState === 0)
 	{
-		let showDraftSuccessMsg = "0";
-
-		let tjUcmAutoSave = jQuery('#item-form #tjucm-autosave').val();
+		var tjUcmAutoSave = jQuery('#item-form #tjucm-autosave').val();
 
 		/*Check if auto save is enabled for UCM type*/
 		if (tjUcmAutoSave == 1)
 		{
 			/* Save form values */
 			jQuery("#item-form").on("change select", ":input", function(){
-				steppedFormSave(this.form.id, "draft", showDraftSuccessMsg);
+				steppedFormSave(this.form.id, "draft", 0);
 			});
 
 			/* To save calendar field value */
 			jQuery("#item-form .field-calendar input:text").blur(function(){
-				let tjUcmFormDirty = jQuery('#item-form').hasClass('dirty');
+				var tjUcmFormDirty = jQuery('#item-form').hasClass('dirty');
 
 				if (tjUcmFormDirty === true)
 				{
-					steppedFormSave(this.form.id, "draft", showDraftSuccessMsg);
+					steppedFormSave(this.form.id, "draft", 0);
 				}
 			});
 		}
@@ -36,25 +34,25 @@ jQuery(document).ready(function()
 
 	/*Update the options of related field for new record of subform*/
 	jQuery(document).on('subform-row-add', function(event, row){
-		let count = jQuery(row).attr('data-group').replace(jQuery(row).attr('data-base-name'), "");
+		var tjucmSubFormCount = jQuery(row).attr('data-group').replace(jQuery(row).attr('data-base-name'), "");
 
 		jQuery.each(tjucmRelatedFieldUpdatedOptions, function(index, value) {
 			if (value.templateId)
 			{
-				let newTemplateId = value.templateId.replace("XXX_XXX", count);
-				jQuery(row).find("#"+newTemplateId).html('');
+				var tjucmNewTemplateId = value.templateId.replace("XXX_XXX", tjucmSubFormCount);
+				jQuery(row).find("#"+tjucmNewTemplateId).html('');
 				jQuery.each(value.options, function(i, val) {
-					jQuery(row).find("#"+newTemplateId).append('<option value="'+val.value+'">'+val.text+'</option>');
+					jQuery(row).find("#"+tjucmNewTemplateId).append('<option value="'+val.value+'">'+val.text+'</option>');
 				});
 
-				jQuery(row).find("#"+newTemplateId).trigger("liszt:updated");
+				jQuery(row).find("#"+tjucmNewTemplateId).trigger("liszt:updated");
 			}
 		});
 	});
 });
 
 /* This function carries stepped saving via ajax */
-function steppedFormSave(form_id, status, showDraftSuccessMsg = "1")
+function steppedFormSave(form_id, status, showDraftSuccessMsg)
 {
 	/* For AJAX save need to add this to prevent popup message for page unload*/
 	window.onbeforeunload = null;
@@ -100,7 +98,7 @@ function steppedFormSave(form_id, status, showDraftSuccessMsg = "1")
 			datatype:'JSON',
 			async: false,
 			success: function(data) {
-				let returnedData = JSON.parse(data);
+				var returnedData = JSON.parse(data);
 
 				if (returnedData.messages !== null)
 				{
@@ -146,9 +144,9 @@ function steppedFormSave(form_id, status, showDraftSuccessMsg = "1")
 					}
 
 					/* Update item id in the URL if the data is stored successfully */
-					let url = window.location.href.split('#')[0];
-					let separator = (url.indexOf("?")===-1)?"?":"&";
-					let newParam = "id=" + returnedData.data.id;
+					var tjucmUrl = window.location.href.split('#')[0];
+					var tjucmUrlSeparator = (tjucmUrl.indexOf("?")===-1)?"?":"&";
+					var tjucmNewParam = "id=" + returnedData.data.id;
 
 					/* Add content_id in ucmsubform records */
 					jQuery.each(returnedData.data.childContentIds, function(i, val) {
@@ -161,24 +159,24 @@ function steppedFormSave(form_id, status, showDraftSuccessMsg = "1")
 						jQuery("#"+value.elementId).html('');
 
 						jQuery.each(value.options, function(i, val) {
-							let selected = '';
+							var tjucmSelectedFieldOption = '';
 
 							if (val.selected == '1'){
-								selected = ' selected="selected" ';
+								tjucmSelectedFieldOption = ' selected="selected" ';
 							}
 
-							jQuery("#"+value.elementId).append('<option value="'+val.value+'" '+selected+'>'+val.text+'</option>');
+							jQuery("#"+value.elementId).append('<option value="'+val.value+'" '+tjucmSelectedFieldOption+'>'+val.text+'</option>');
 						});
 
 						jQuery("#"+value.elementId).trigger("liszt:updated");
 					});
 
-					if (!(url.indexOf(newParam) >= 0))
+					if (!(tjucmUrl.indexOf(tjucmNewParam) >= 0))
 					{
-						url+=separator+newParam;
+						tjucmUrl+=tjucmUrlSeparator+tjucmNewParam;
 					}
 
-					history.pushState(null, null, url);
+					history.pushState(null, null, tjucmUrl);
 				}
 
 				jQuery('#draftSave').attr('disabled', false);
@@ -205,7 +203,7 @@ function itemformactions(tab_id, navDirection)
 	var prevTabName = jQuery('ul#' + getTabId).find('li.active').prev('li').children('a').attr('href');
 
 	/* Once all fields are validated, enable Final Save*/
-	steppedFormSave('item-form', 'draft');
+	steppedFormSave('item-form', 'draft', 1);
 
 	if (navDirection == "next")
 	{
diff --git a/src/components/com_tjucm/administrator/classes/funlist.php b/src/components/com_tjucm/administrator/classes/funlist.php
index 0b877f8c..33c7ffe4 100644
--- a/src/components/com_tjucm/administrator/classes/funlist.php
+++ b/src/components/com_tjucm/administrator/classes/funlist.php
@@ -1,11 +1,13 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
+
 defined('_JEXEC') or die('Restricted access');
 jimport('joomla.form.form');
 
diff --git a/src/components/com_tjucm/administrator/controller.php b/src/components/com_tjucm/administrator/controller.php
index 1d32b308..1aea136c 100644
--- a/src/components/com_tjucm/administrator/controller.php
+++ b/src/components/com_tjucm/administrator/controller.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/administrator/controllers/item.php b/src/components/com_tjucm/administrator/controllers/item.php
index c672aa6d..3e7675ca 100644
--- a/src/components/com_tjucm/administrator/controllers/item.php
+++ b/src/components/com_tjucm/administrator/controllers/item.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -329,7 +330,7 @@ public function save($key = null, $urlVar = null)
 							"clientComponent" => 'com_tjucm',
 							"client" => $this->client,
 							"view" => $client[1],
-							"layout" => 'edit')
+							"layout" => 'edit', )
 							);
 
 			if (!$formExtra)
diff --git a/src/components/com_tjucm/administrator/controllers/items.php b/src/components/com_tjucm/administrator/controllers/items.php
index 037a8c5a..8b12f8eb 100644
--- a/src/components/com_tjucm/administrator/controllers/items.php
+++ b/src/components/com_tjucm/administrator/controllers/items.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
diff --git a/src/components/com_tjucm/administrator/controllers/type.php b/src/components/com_tjucm/administrator/controllers/type.php
index b80077da..de7bcf2c 100644
--- a/src/components/com_tjucm/administrator/controllers/type.php
+++ b/src/components/com_tjucm/administrator/controllers/type.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/administrator/controllers/types.php b/src/components/com_tjucm/administrator/controllers/types.php
index 102c4f48..39ea7b3e 100644
--- a/src/components/com_tjucm/administrator/controllers/types.php
+++ b/src/components/com_tjucm/administrator/controllers/types.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -29,7 +30,7 @@
 class TjucmControllerTypes extends JControllerAdmin
 {
 	use TjControllerHouseKeeping;
-	
+
 	/**
 	 * Method to clone existing Types
 	 *
@@ -335,7 +336,7 @@ public function import()
 							$field['asset_id'] = '';
 							$field['created_by'] = $user->id;
 							$field['group_id'] = $fieldGroupId;
-							$field['saveOption'] = empty($options) ? 0 : 1 ;
+							$field['saveOption'] = empty($options) ? 0 : 1;
 							$field['params'] = (array) json_decode($field['params']);
 							$tmpName = str_replace('.', '_', $ucmTypeData['unique_identifier']) . '_';
 							$field['name'] = str_replace($tmpName, '', $field['name']);
diff --git a/src/components/com_tjucm/administrator/helpers/listhelper.php b/src/components/com_tjucm/administrator/helpers/listhelper.php
index 94651586..37c01dcb 100644
--- a/src/components/com_tjucm/administrator/helpers/listhelper.php
+++ b/src/components/com_tjucm/administrator/helpers/listhelper.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -33,7 +34,7 @@ public static function toggle($value = 0, $view = '', $field = '', $i = '')
 	{
 		$states = array(
 			0 => array('icon-remove', JText::_('Toggle'), 'inactive btn-danger'),
-			1 => array('icon-checkmark', JText::_('Toggle'), 'active btn-success')
+			1 => array('icon-checkmark', JText::_('Toggle'), 'active btn-success'),
 		);
 
 		$state  = \Joomla\Utilities\ArrayHelper::getValue($states, (int) $value, $states[0]);
diff --git a/src/components/com_tjucm/administrator/helpers/tjucm.php b/src/components/com_tjucm/administrator/helpers/tjucm.php
index 8adb6ba9..645a9c34 100644
--- a/src/components/com_tjucm/administrator/helpers/tjucm.php
+++ b/src/components/com_tjucm/administrator/helpers/tjucm.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -31,12 +32,6 @@ public static function addSubmenu($vName = '')
 			'index.php?option=com_tjucm&view=types',
 			$vName == 'types'
 		);
-
-		JHtmlSidebar::addEntry(
-			JText::_('COM_TJUCM_TITLE_ITEMS'),
-			'index.php?option=com_tjucm&view=items',
-			$vName == 'items'
-		);
 	}
 
 	/**
diff --git a/src/components/com_tjucm/administrator/houseKeeping/1.1.0/ucmSubformData.php b/src/components/com_tjucm/administrator/houseKeeping/1.1.0/ucmSubformData.php
index 5144f195..1d78ad05 100644
--- a/src/components/com_tjucm/administrator/houseKeeping/1.1.0/ucmSubformData.php
+++ b/src/components/com_tjucm/administrator/houseKeeping/1.1.0/ucmSubformData.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @package    TJ-UCM
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
  *
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2019 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/administrator/models/fields/createdby.php b/src/components/com_tjucm/administrator/models/fields/createdby.php
index e76ae155..668a8ef6 100644
--- a/src/components/com_tjucm/administrator/models/fields/createdby.php
+++ b/src/components/com_tjucm/administrator/models/fields/createdby.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/administrator/models/fields/custom_field.php b/src/components/com_tjucm/administrator/models/fields/custom_field.php
index d662dabb..4fe718b6 100644
--- a/src/components/com_tjucm/administrator/models/fields/custom_field.php
+++ b/src/components/com_tjucm/administrator/models/fields/custom_field.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/administrator/models/fields/filemultiple.php b/src/components/com_tjucm/administrator/models/fields/filemultiple.php
index 8c254fc1..8a1222cc 100644
--- a/src/components/com_tjucm/administrator/models/fields/filemultiple.php
+++ b/src/components/com_tjucm/administrator/models/fields/filemultiple.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/administrator/models/fields/foreignkey.php b/src/components/com_tjucm/administrator/models/fields/foreignkey.php
index d67a517f..75b58764 100644
--- a/src/components/com_tjucm/administrator/models/fields/foreignkey.php
+++ b/src/components/com_tjucm/administrator/models/fields/foreignkey.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
@@ -93,7 +94,7 @@ protected function getInput()
 			->select(
 				array(
 					$db->quoteName($this->key_field),
-					$fk_value
+					$fk_value,
 				)
 			)
 			->from($this->table);
diff --git a/src/components/com_tjucm/administrator/models/fields/modifiedby.php b/src/components/com_tjucm/administrator/models/fields/modifiedby.php
index 66d63787..f721f7d1 100644
--- a/src/components/com_tjucm/administrator/models/fields/modifiedby.php
+++ b/src/components/com_tjucm/administrator/models/fields/modifiedby.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/administrator/models/fields/timecreated.php b/src/components/com_tjucm/administrator/models/fields/timecreated.php
index cfad63d1..a113deda 100644
--- a/src/components/com_tjucm/administrator/models/fields/timecreated.php
+++ b/src/components/com_tjucm/administrator/models/fields/timecreated.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/administrator/models/fields/timeupdated.php b/src/components/com_tjucm/administrator/models/fields/timeupdated.php
index 39a313b0..e235de96 100644
--- a/src/components/com_tjucm/administrator/models/fields/timeupdated.php
+++ b/src/components/com_tjucm/administrator/models/fields/timeupdated.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/administrator/models/fields/ucmtypes.php b/src/components/com_tjucm/administrator/models/fields/ucmtypes.php
index 5f01517a..6793b2c6 100644
--- a/src/components/com_tjucm/administrator/models/fields/ucmtypes.php
+++ b/src/components/com_tjucm/administrator/models/fields/ucmtypes.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
diff --git a/src/components/com_tjucm/administrator/models/item.php b/src/components/com_tjucm/administrator/models/item.php
index 896353d2..1a6bf330 100644
--- a/src/components/com_tjucm/administrator/models/item.php
+++ b/src/components/com_tjucm/administrator/models/item.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -117,7 +118,7 @@ public function getForm($data = array(), $loadData = true)
 		$form = $this->loadForm(
 			'com_tjucm.item', 'item',
 			array('control' => 'jform',
-				'load_data' => $loadData
+				'load_data' => $loadData,
 			)
 		);
 
diff --git a/src/components/com_tjucm/administrator/models/items.php b/src/components/com_tjucm/administrator/models/items.php
index 8cd9774c..fa04eeb9 100644
--- a/src/components/com_tjucm/administrator/models/items.php
+++ b/src/components/com_tjucm/administrator/models/items.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
@@ -268,7 +269,7 @@ public function getItems()
 
 		foreach ($items as $item)
 		{
-			if (!empty ($item->field_values))
+			if (!empty($item->field_values))
 			{
 				$explode_field_values = explode($this->records_separator, $item->field_values);
 
diff --git a/src/components/com_tjucm/administrator/models/type.php b/src/components/com_tjucm/administrator/models/type.php
index a8c760bb..c61d2361 100644
--- a/src/components/com_tjucm/administrator/models/type.php
+++ b/src/components/com_tjucm/administrator/models/type.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2018 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -88,7 +89,7 @@ public function getForm($data = array(), $loadData = true)
 		$form = $this->loadForm(
 			'com_tjucm.type', 'type',
 			array('control' => 'jform',
-				'load_data' => $loadData
+				'load_data' => $loadData,
 			)
 		);
 
@@ -337,14 +338,25 @@ public function save($data)
 		$params['layout'] = $data['layout'];
 
 		// If UCM type is a subform then need to add content_id as hidden field in the form - For flat subform storage
-		if ($params['is_subform'] == 1 && empty($data['id']))
+		JLoader::import('components.com_tjfields.tables.field', JPATH_ADMINISTRATOR);
+		$db = JFactory::getDbo();
+		$tjfieldsFieldTable = JTable::getInstance('Field', 'TjfieldsTable', array('dbo', $db));
+		$tjfieldsFieldTable->load(array('name' => str_replace('.', '_', $data['unique_identifier']) . '_contentid'));
+
+		if ($params['is_subform'] == 1 && empty($tjfieldsFieldTable->id))
 		{
 			JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjfields/models');
 			$fieldGroup = array("name" => "hidden", "title" => "hidden", "client" => $data['unique_identifier'], "state" => 1);
 			$tjFieldsGroupModel = JModelLegacy::getInstance('Group', 'TjfieldsModel', array('ignore_request' => true));
 			$tjFieldsGroupModel->save($fieldGroup);
 			$fieldGroupId = (int) $tjFieldsGroupModel->getState($tjFieldsGroupModel->getName() . '.id');
-			$field = array("label" => "contentid", "name" => "contentid", "type" => "hidden", "client" => $data['unique_identifier'], "state" => 1, "group_id" => $fieldGroupId);
+			$field = array(
+			"label" => "contentid",
+			"name" => "contentid",
+			"type" => "hidden",
+			"client" => $data['unique_identifier'],
+			"state" => 1,
+			"group_id" => $fieldGroupId, );
 			$tjFieldsFieldModel = JModelLegacy::getInstance('Field', 'TjfieldsModel', array('ignore_request' => true));
 			$input->post->set('client_type', end(explode(".", $data['unique_identifier'])));
 			$tjFieldsFieldModel->save($field);
diff --git a/src/components/com_tjucm/administrator/models/types.php b/src/components/com_tjucm/administrator/models/types.php
index f137a4eb..bf82a305 100644
--- a/src/components/com_tjucm/administrator/models/types.php
+++ b/src/components/com_tjucm/administrator/models/types.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
@@ -61,7 +62,7 @@ public function __construct($config = array())
 	 *
 	 * @throws Exception
 	 */
-	protected function populateState($ordering = null, $direction = null)
+	protected function populateState($ordering = 'a.id', $direction = 'DESC')
 	{
 		// Initialise variables.
 		$app = JFactory::getApplication('administrator');
@@ -78,7 +79,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('params', $params);
 
 		// List state information.
-		parent::populateState('a.title', 'asc');
+		parent::populateState($ordering, $direction);
 	}
 
 	/**
@@ -175,16 +176,4 @@ protected function getListQuery()
 
 		return $query;
 	}
-
-	/**
-	 * Get an array of data items
-	 *
-	 * @return mixed Array of data items on success, false on failure.
-	 */
-	public function getItems()
-	{
-		$items = parent::getItems();
-
-		return $items;
-	}
 }
diff --git a/src/components/com_tjucm/administrator/tables/item.php b/src/components/com_tjucm/administrator/tables/item.php
index 0ce5dc2f..4e13ccb9 100644
--- a/src/components/com_tjucm/administrator/tables/item.php
+++ b/src/components/com_tjucm/administrator/tables/item.php
@@ -1,16 +1,18 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
 defined('_JEXEC') or die;
 
 use Joomla\Utilities\ArrayHelper;
+
 /**
  * item Table class
  *
diff --git a/src/components/com_tjucm/administrator/tables/type.php b/src/components/com_tjucm/administrator/tables/type.php
index 850d2c81..dfe31f4b 100644
--- a/src/components/com_tjucm/administrator/tables/type.php
+++ b/src/components/com_tjucm/administrator/tables/type.php
@@ -1,16 +1,18 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
 defined('_JEXEC') or die;
 
 use Joomla\Utilities\ArrayHelper;
+
 /**
  * type Table class
  *
diff --git a/src/components/com_tjucm/administrator/tjucm.php b/src/components/com_tjucm/administrator/tjucm.php
index 60f6493c..0bfd57c3 100644
--- a/src/components/com_tjucm/administrator/tjucm.php
+++ b/src/components/com_tjucm/administrator/tjucm.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -28,7 +29,6 @@
 	JLoader::load('TjucmFunList');
 }
 
-
 // Load backend helper
 $path = JPATH_ADMINISTRATOR . '/components/com_tjucm/helpers/tjucm.php';
 
diff --git a/src/components/com_tjucm/administrator/views/item/view.html.php b/src/components/com_tjucm/administrator/views/item/view.html.php
index 58156741..e5ccfae0 100644
--- a/src/components/com_tjucm/administrator/views/item/view.html.php
+++ b/src/components/com_tjucm/administrator/views/item/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -55,7 +56,7 @@ public function display($tpl = null)
 			"client" => $this->client,
 			"view" => $view[1],
 			"layout" => 'default',
-			"content_id" => $id)
+			"content_id" => $id, )
 			);
 
 		$this->form_extra = array_filter($this->form_extra);
diff --git a/src/components/com_tjucm/administrator/views/items/tmpl/default.php b/src/components/com_tjucm/administrator/views/items/tmpl/default.php
index 422469cb..3517d6bf 100644
--- a/src/components/com_tjucm/administrator/views/items/tmpl/default.php
+++ b/src/components/com_tjucm/administrator/views/items/tmpl/default.php
@@ -179,7 +179,7 @@
 							<?php endif; ?>
 
 							<th class='left'>
-								<?php echo JHtml::_('grid.sort',  'COM_TJUCM_ITEMS_ID', 'a.`id`', $listDirn, $listOrder); ?>
+								<?php echo JHtml::_('grid.sort', 'COM_TJUCM_ITEMS_ID', 'a.`id`', $listDirn, $listOrder); ?>
 							</th>
 							<?php
 							if (!empty($this->listcolumn))
@@ -251,7 +251,7 @@
 								</td>
 
 								<?php
-								if (!empty ($item->field_values))
+								if (!empty($item->field_values))
 								{
 									foreach ($item->field_values as $field_values)
 									{?>
diff --git a/src/components/com_tjucm/administrator/views/items/view.html.php b/src/components/com_tjucm/administrator/views/items/view.html.php
index 21d08862..7df465d5 100644
--- a/src/components/com_tjucm/administrator/views/items/view.html.php
+++ b/src/components/com_tjucm/administrator/views/items/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/administrator/views/type/tmpl/edit.php b/src/components/com_tjucm/administrator/views/type/tmpl/edit.php
index 81552ebd..5002f066 100644
--- a/src/components/com_tjucm/administrator/views/type/tmpl/edit.php
+++ b/src/components/com_tjucm/administrator/views/type/tmpl/edit.php
@@ -15,7 +15,7 @@
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 
-JHtml::script( JUri::root().'administrator/components/com_tjucm/assets/js/tjucm_type.js' );
+JHtml::script(JUri::root() . 'administrator/components/com_tjucm/assets/js/tjucm_type.js');
 ?>
 <script type="text/javascript">
 	js = jQuery.noConflict();
@@ -75,7 +75,7 @@
 				</div>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 
-			<?php if (JFactory::getUser()->authorise('core.admin','tjucm')) : ?>
+			<?php if (JFactory::getUser()->authorise('core.admin', 'tjucm')) : ?>
 				<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'permissions', JText::_('JGLOBAL_ACTION_PERMISSIONS_LABEL', true)); ?>
 				<?php echo $this->form->getInput('rules'); ?>
 				<?php echo JHtml::_('bootstrap.endTab'); ?>
diff --git a/src/components/com_tjucm/administrator/views/type/view.html.php b/src/components/com_tjucm/administrator/views/type/view.html.php
index ce0271bb..0a0ab0e6 100644
--- a/src/components/com_tjucm/administrator/views/type/view.html.php
+++ b/src/components/com_tjucm/administrator/views/type/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/administrator/views/types/tmpl/default.php b/src/components/com_tjucm/administrator/views/types/tmpl/default.php
index b4b70ace..e8cb471a 100644
--- a/src/components/com_tjucm/administrator/views/types/tmpl/default.php
+++ b/src/components/com_tjucm/administrator/views/types/tmpl/default.php
@@ -178,14 +178,14 @@
 						<?php endif; ?>
 
 						<th class='left'>
-							<?php echo JHtml::_('grid.sort',  'COM_TJUCM_TYPES_ID', 'a.`id`', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('grid.sort', 'COM_TJUCM_TYPES_ID', 'a.`id`', $listDirn, $listOrder); ?>
 						</th>
 
 						<th class='left'>
-							<?php echo JHtml::_('grid.sort',  'COM_TJUCM_TYPES_TITLE', 'a.`title`', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('grid.sort', 'COM_TJUCM_TYPES_TITLE', 'a.`title`', $listDirn, $listOrder); ?>
 
 						<th class='left'>
-							<?php echo JHtml::_('grid.sort',  'COM_TJUCM_TYPES_ALIAS', 'a.`alias`', $listDirn, $listOrder); ?>
+							<?php echo JHtml::_('grid.sort', 'COM_TJUCM_TYPES_ALIAS', 'a.`alias`', $listDirn, $listOrder); ?>
 						</th>
 
 						<th class='center'>
@@ -265,7 +265,7 @@
 								<?php endif; ?>
 
 								<?php if ($canEdit) : ?>
-									<a href="<?php echo JRoute::_('index.php?option=com_tjucm&task=type.edit&id='.(int) $item->id); ?>">
+									<a href="<?php echo JRoute::_('index.php?option=com_tjucm&task=type.edit&id=' . (int) $item->id); ?>">
 										<?php echo $this->escape($item->title); ?>
 									</a>
 								<?php else : ?>
diff --git a/src/components/com_tjucm/administrator/views/types/view.html.php b/src/components/com_tjucm/administrator/views/types/view.html.php
index 36e11584..41e0f94e 100644
--- a/src/components/com_tjucm/administrator/views/types/view.html.php
+++ b/src/components/com_tjucm/administrator/views/types/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -73,7 +74,9 @@ protected function addToolbar()
 		$formPath = JPATH_COMPONENT_ADMINISTRATOR . '/views/type';
 
 		$toolbar = JToolbar::getInstance('toolbar');
-		$toolbar->appendButton('Custom', '<a id="tjHouseKeepingFixDatabasebutton" class="btn btn-default hidden"><span class="icon-refresh"></span>' . JText::_('COM_TJUCM_FIX_DATABASE') . '</a>');
+		$toolbar->appendButton(
+		'Custom', '<a id="tjHouseKeepingFixDatabasebutton" class="btn btn-default hidden"><span class="icon-refresh"></span>'
+		. JText::_('COM_TJUCM_FIX_DATABASE') . '</a>');
 
 		if (file_exists($formPath))
 		{
diff --git a/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini b/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini
index b209ccef..7bb53a42 100644
--- a/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini
+++ b/src/components/com_tjucm/languages/administrator/en-GB/en-GB.com_tjucm.ini
@@ -148,15 +148,15 @@ COM_TJUCM_TITLE_FIX_DATABASE="Fix Database"
 COM_TJUCM_PERMISSION_VIEW="View"
 COM_TJUCM_PERMISSION_TYPE_ITEM_CREATE="Create Item"
 COM_TJUCM_PERMISSION_TYPE_ITEM_CREATE_DESC="Allows users in the group to create item in this UCM type."
-COM_TJUCM_PERMISSION_TYPE_ITEM_VIEW="View all Items"
+COM_TJUCM_PERMISSION_TYPE_ITEM_VIEW="View All Items"
 COM_TJUCM_PERMISSION_TYPE_ITEM_VIEW_DESC="Allows users in the group to view items created by any user in this UCM type."
-COM_TJUCM_PERMISSION_TYPE_ITEM_EDIT="Edit all Items"
+COM_TJUCM_PERMISSION_TYPE_ITEM_EDIT="Edit All Items"
 COM_TJUCM_PERMISSION_TYPE_ITEM_EDIT_DESC="Allows users in the group to edit items created by any user in this UCM type."
-COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE="Edit all Item State"
+COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE="Edit All Item State"
 COM_TJUCM_PERMISSION_TYPE_ITEM_EDITSTATE_DESC="Allows users in the group to edit state of any item created by any user in this UCM type."
 COM_TJUCM_PERMISSION_TYPE_ITEM_EDITOWN="Edit Own Item"
 COM_TJUCM_PERMISSION_TYPE_ITEM_EDITOWN_DESC="Allows users in the group to edit own items in this UCM type."
-COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE="Delete all Items"
+COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE="Delete All Items"
 COM_TJUCM_PERMISSION_TYPE_ITEM_DELETE_DESC="Allows users in the group to delete items created by any user in this UCM type."
 COM_TJUCM_FORM_LBL_TYPE_IS_SUBFORM="Is Subform"
 COM_TJUCM_FORM_DESC_TYPE_IS_SUBFORM="Set whether this UCM type is a subform. If you select YES then you can create a field of this UCM type as a subform field in any other UCM type."
@@ -167,3 +167,7 @@ COM_TJUCM_FORM_DESC_TYPE_PUBLISH_ITEMS_BY_DEFAULT="Publish items by default"
 
 ; Added in version 1.1
 COM_TJUCM_FIX_DATABASE="Fix Database"
+
+; Added in version 1.2.0
+COM_TJUCM_PERMISSION_TYPE_ITEM_DELETEOWN="Delete Own Item"
+COM_TJUCM_PERMISSION_TYPE_ITEM_DELETEOWN_DESC="Allows users in the group to delete own items in this UCM type."
diff --git a/src/components/com_tjucm/plugins/api/tjucm/tjucm.php b/src/components/com_tjucm/plugins/api/tjucm/tjucm.php
index cd52e16f..1f59a2a8 100644
--- a/src/components/com_tjucm/plugins/api/tjucm/tjucm.php
+++ b/src/components/com_tjucm/plugins/api/tjucm/tjucm.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * @package     TjUcm
- * @subpackage  Plg_Api_ucm
- * 
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
  * @author      Techjoomla <extensions@techjoomla.com>
- * @copyright   Copyright (c) 2009-2019 TechJoomla. All rights reserved.
- * @license     GNU General Public License version 2 or later.
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
-defined('_JEXEC') or die( 'Restricted access');
+defined('_JEXEC') or die('Restricted access');
 jimport('joomla.plugin.plugin');
 jimport('joomla.application.component.model');
 
diff --git a/src/components/com_tjucm/plugins/api/tjucm/tjucm/item.php b/src/components/com_tjucm/plugins/api/tjucm/tjucm/item.php
index 37ade760..2e4e9230 100644
--- a/src/components/com_tjucm/plugins/api/tjucm/tjucm/item.php
+++ b/src/components/com_tjucm/plugins/api/tjucm/tjucm/item.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @package     TjUcm
- * @subpackage  Plg_Api_ucm
- * 
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
  * @author      Techjoomla <extensions@techjoomla.com>
- * @copyright   Copyright (c) 2009-2019 TechJoomla. All rights reserved.
- * @license     GNU General Public License version 2 or later.
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
@@ -81,7 +81,7 @@ public function post()
 
 		unset($tjFields);
 
-		// Mapping field name with its value 
+		// Mapping field name with its value
 		foreach ($fields as $k => $field)
 		{
 			$extra_jform_data[$fieldsAssoc[(int) $field["id"]]] = $field["value"];
diff --git a/src/components/com_tjucm/plugins/api/tjucm/tjucm/type.php b/src/components/com_tjucm/plugins/api/tjucm/tjucm/type.php
index 441e55b5..0e3ed031 100644
--- a/src/components/com_tjucm/plugins/api/tjucm/tjucm/type.php
+++ b/src/components/com_tjucm/plugins/api/tjucm/tjucm/type.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * @package     TjUcm
- * @subpackage  Plg_Api_ucm
- * 
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
  * @author      Techjoomla <extensions@techjoomla.com>
- * @copyright   Copyright (c) 2009-2019 TechJoomla. All rights reserved.
- * @license     GNU General Public License version 2 or later.
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
@@ -42,11 +42,11 @@ public function get()
 
 		// Variable to store creator name and id
 		$created_by = JFactory::getUser($ucmType->created_by);
-		$ucmType->created_by = array("id" => $created_by->id,"name" => $created_by->name);
+		$ucmType->created_by = array("id" => $created_by->id, "name" => $created_by->name);
 
 		// Variable to store modifier name and id
 		$modified_by = JFactory::getUser($ucmType->modified_by);
-		$ucmType->modified_by = array("id" => $modified_by->id,"name" => $modified_by->name);
+		$ucmType->modified_by = array("id" => $modified_by->id, "name" => $modified_by->name);
 
 		$tjFieldsModelGroups = JModelLegacy::getInstance('Groups', 'TjfieldsModel', array('ignore_request' => true));
 		$tjFieldsModelGroups->setState('list.ordering', 'a.ordering');
diff --git a/src/components/com_tjucm/script.php b/src/components/com_tjucm/script.php
index 45ac710b..bbe893a7 100644
--- a/src/components/com_tjucm/script.php
+++ b/src/components/com_tjucm/script.php
@@ -1,9 +1,11 @@
 <?php
 /**
- * @package    TJ-UCM
- * @author     TechJoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2018 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
diff --git a/src/components/com_tjucm/site/controller.php b/src/components/com_tjucm/site/controller.php
index ccaed857..5489300a 100644
--- a/src/components/com_tjucm/site/controller.php
+++ b/src/components/com_tjucm/site/controller.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/site/controllers/item.php b/src/components/com_tjucm/site/controllers/item.php
index c1b49a31..bfca6a61 100644
--- a/src/components/com_tjucm/site/controllers/item.php
+++ b/src/components/com_tjucm/site/controllers/item.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
diff --git a/src/components/com_tjucm/site/controllers/itemform.php b/src/components/com_tjucm/site/controllers/itemform.php
index bc0fd999..0517aa72 100644
--- a/src/components/com_tjucm/site/controllers/itemform.php
+++ b/src/components/com_tjucm/site/controllers/itemform.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2018 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -12,7 +13,6 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\User\User;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Session\Session;
 use Joomla\CMS\Router\Route;
 
@@ -325,7 +325,7 @@ public function save($key = null, $urlVar = null)
 							"clientComponent" => 'com_tjucm',
 							"client" => $this->client,
 							"view" => $client[1],
-							"layout" => 'edit')
+							"layout" => 'edit', )
 							);
 
 			if (!$formExtra)
diff --git a/src/components/com_tjucm/site/controllers/items.php b/src/components/com_tjucm/site/controllers/items.php
index 64dce66a..697c3dbe 100644
--- a/src/components/com_tjucm/site/controllers/items.php
+++ b/src/components/com_tjucm/site/controllers/items.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
diff --git a/src/components/com_tjucm/site/helpers/tjucm.php b/src/components/com_tjucm/site/helpers/tjucm.php
index af4aaad0..830226a4 100644
--- a/src/components/com_tjucm/site/helpers/tjucm.php
+++ b/src/components/com_tjucm/site/helpers/tjucm.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
diff --git a/src/components/com_tjucm/site/layouts/detail/fields.php b/src/components/com_tjucm/site/layouts/detail/fields.php
new file mode 100644
index 00000000..fe5b0f90
--- /dev/null
+++ b/src/components/com_tjucm/site/layouts/detail/fields.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * @package	TJ-UCM
+ * 
+ * @author	 TechJoomla <extensions@techjoomla.com>
+ * @copyright  Copyright (c) 2009-2019 TechJoomla. All rights reserved.
+ * @license	GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+// No direct access
+defined('_JEXEC') or die('Restricted access');
+
+if (!key_exists('formObject', $displayData) || !key_exists('xmlFormObject', $displayData))
+{
+	return;
+}
+
+$app = JFactory::getApplication();
+$user = JFactory::getUser();
+
+// Layout for field types
+$fieldLayout = array();
+$fieldLayout['File'] = $fieldLayout['Image'] = "file";
+$fieldLayout['Checkbox'] = "checkbox";
+$fieldLayout['Radio'] = $fieldLayout['List'] = "list";
+$fieldLayout['Itemcategory'] = "itemcategory";
+$fieldLayout['Video'] = $fieldLayout['Audio'] = $fieldLayout['Url'] = "link";
+$fieldLayout['Calendar'] = "calendar";
+
+// Load the tj-fields helper
+JLoader::import('components.com_tjfields.helpers.tjfields', JPATH_SITE);
+$TjfieldsHelper = new TjfieldsHelper;
+
+// Get JLayout data
+$xmlFormObject = $displayData['xmlFormObject'];
+$formObject = $displayData['formObject'];
+$itemData = $displayData['itemData'];
+$isSubForm = $displayData['isSubForm'];
+
+// Define the classes for subform and normal form rendering
+$controlGroupDivClass = ($isSubForm) ? 'col-xs-12' : 'col-xs-12 col-md-6';
+$labelDivClass = ($isSubForm) ? 'col-xs-6' : 'col-xs-4';
+$controlDivClass = ($isSubForm) ? 'col-xs-6' : 'col-xs-8';
+
+// Get Field table
+$fieldTableData = new stdClass;
+JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjfields/tables');
+$fieldTableData->tjFieldFieldTable = JTable::getInstance('field', 'TjfieldsTable');
+
+$fieldSets = $formObject->getFieldsets();
+$count = 0;
+
+// Iterate through the normal form fieldsets and display each one
+foreach ($fieldSets as $fieldName => $fieldset)
+{
+	$xmlFieldSet = $xmlFormObject[$count];
+	$count++;
+	$fieldCount = 0;
+	?>
+	<div class="row">
+		<?php
+		foreach ($formObject->getFieldset($fieldset->name) as $field)
+		{
+			// No need to show tooltip/description for field on details view
+			$field->description = '';
+		
+			// Get the field data by field name to check the field type
+			$fieldTableData->tjFieldFieldTable->load(array('name' => $field->__get("fieldname")));
+			$canView = false;
+
+			if ($user->authorise('core.field.viewfieldvalue', 'com_tjfields.group.' . $fieldTableData->tjFieldFieldTable->group_id))
+			{
+				$canView = $user->authorise('core.field.viewfieldvalue', 'com_tjfields.field.' . $fieldTableData->tjFieldFieldTable->id);
+			}
+
+			if ($canView || ($itemData->created_by == $user->id))
+			{
+				// Get xml for the field
+				$xmlField = $xmlFieldSet->field[$fieldCount];
+				$fieldCount++;
+
+				if ($field->hidden)
+				{
+					echo $field->input;
+					continue;
+				}
+
+				if ($field->type == 'Subform' || $field->type == 'Ucmsubform')
+				{
+					?>
+					<div class="col-xs-12 col-md-6">
+						<div class="col-xs-4"><?php echo $field->label; ?>:</div>
+						<div class="col-xs-8">
+							<?php
+							$count = 0;
+							$ucmSubFormXmlFieldSets = array();
+
+							// Call to extra fields
+							JLoader::import('components.com_tjucm.models.item', JPATH_SITE);
+							$tjucmItemModel = JModelLegacy::getInstance('Item', 'TjucmModel');
+
+							// Get Subform field data
+							$formData = $TjfieldsHelper->getFieldData($field->getAttribute('name'));
+							$ucmSubFormFieldValue = json_decode($formObject->getvalue($field->getAttribute('name')));
+
+							$ucmSubFormFieldParams = json_decode($formData->params);
+							$ucmSubFormFormSource = explode('/', $ucmSubFormFieldParams->formsource);
+							$ucmSubFormClient = $ucmSubFormFormSource[1] . '.' . str_replace('form_extra.xml', '', $ucmSubFormFormSource[4]);
+							$view = explode('.', $ucmSubFormClient);
+
+							if (!empty($ucmSubFormFieldValue))
+							{
+								foreach ($ucmSubFormFieldValue as $ucmSubFormData)
+								{
+									$contentIdFieldname = str_replace('.', '_', $ucmSubFormClient) . '_contentid';
+
+									$ucmSubformFormObject = $tjucmItemModel->getFormExtra(
+										array(
+											"clientComponent" => 'com_tjucm',
+											"client" => $ucmSubFormClient,
+											"view" => $view[1],
+											"layout" => 'default',
+											"content_id" => $ucmSubFormData->$contentIdFieldname, )
+											);
+
+									$ucmSubFormFormXml = simplexml_load_file($field->formsource);
+
+									$ucmSubFormCount = 0;
+
+									foreach ($ucmSubFormFormXml as $ucmSubFormXmlFieldSet)
+									{
+										$ucmSubFormXmlFieldSets[$ucmSubFormCount] = $ucmSubFormXmlFieldSet;
+										$ucmSubFormCount++;
+									}
+
+									// Call the JLayout recursively to render fields of ucmsubform
+									$layout = new JLayoutFile('fields', JPATH_ROOT . '/components/com_tjucm/layouts/detail');
+									echo $layout->render(array('xmlFormObject' => $ucmSubFormXmlFieldSets, 'formObject' => $ucmSubformFormObject, 'itemData' => $this->item, 'isSubForm' => 1));
+									echo "<hr>";
+								}
+							}
+							?>
+						</div>
+					</div>
+					<?php
+				}
+				else
+				{
+					$layoutToUse = (array_key_exists($field->type, $fieldLayout)) ? $fieldLayout[$field->type] : 'field';
+					?>
+					<div class="<?php echo $controlGroupDivClass;?>">
+						<div class="<?php echo $labelDivClass;?>"><?php echo $field->label; ?>:</div>
+						<div class="<?php echo $controlDivClass;?>">
+							<?php
+							$layout = new JLayoutFile($layoutToUse, JPATH_ROOT . '/components/com_tjfields/layouts/fields');
+							$output = $layout->render(array('fieldXml' => $xmlField, 'field' => $field));
+							echo $output;
+							?>
+						</div>
+					</div>
+					<?php
+				}
+			}
+		}
+	?>
+	</div>
+	<?php
+}
diff --git a/src/components/com_tjucm/site/layouts/detail/index.html b/src/components/com_tjucm/site/layouts/detail/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/src/components/com_tjucm/site/layouts/detail/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/src/components/com_tjucm/site/layouts/index.html b/src/components/com_tjucm/site/layouts/index.html
new file mode 100644
index 00000000..42682b47
--- /dev/null
+++ b/src/components/com_tjucm/site/layouts/index.html
@@ -0,0 +1 @@
+<html><body></body></html>
\ No newline at end of file
diff --git a/src/components/com_tjucm/site/models/fields/createdby.php b/src/components/com_tjucm/site/models/fields/createdby.php
index 903e4167..4704329e 100644
--- a/src/components/com_tjucm/site/models/fields/createdby.php
+++ b/src/components/com_tjucm/site/models/fields/createdby.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/site/models/fields/filemultiple.php b/src/components/com_tjucm/site/models/fields/filemultiple.php
index e34320d0..0400591e 100644
--- a/src/components/com_tjucm/site/models/fields/filemultiple.php
+++ b/src/components/com_tjucm/site/models/fields/filemultiple.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/site/models/fields/foreignkey.php b/src/components/com_tjucm/site/models/fields/foreignkey.php
index 92a9b84b..8ea5a304 100644
--- a/src/components/com_tjucm/site/models/fields/foreignkey.php
+++ b/src/components/com_tjucm/site/models/fields/foreignkey.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
@@ -93,7 +94,7 @@ protected function getInput()
 			->select(
 				array(
 					$db->quoteName($this->key_field),
-					$fk_value
+					$fk_value,
 				)
 			)
 			->from($this->table);
diff --git a/src/components/com_tjucm/site/models/fields/modifiedby.php b/src/components/com_tjucm/site/models/fields/modifiedby.php
index 0eeee105..dc70031d 100644
--- a/src/components/com_tjucm/site/models/fields/modifiedby.php
+++ b/src/components/com_tjucm/site/models/fields/modifiedby.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/site/models/fields/submit.php b/src/components/com_tjucm/site/models/fields/submit.php
index d198253e..7ff31ddd 100644
--- a/src/components/com_tjucm/site/models/fields/submit.php
+++ b/src/components/com_tjucm/site/models/fields/submit.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // Check to ensure this file is included in Joomla!
diff --git a/src/components/com_tjucm/site/models/fields/timecreated.php b/src/components/com_tjucm/site/models/fields/timecreated.php
index b86bc993..a241fd3e 100644
--- a/src/components/com_tjucm/site/models/fields/timecreated.php
+++ b/src/components/com_tjucm/site/models/fields/timecreated.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/site/models/fields/timeupdated.php b/src/components/com_tjucm/site/models/fields/timeupdated.php
index 5b398792..fd2e620e 100644
--- a/src/components/com_tjucm/site/models/fields/timeupdated.php
+++ b/src/components/com_tjucm/site/models/fields/timeupdated.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('JPATH_BASE') or die;
diff --git a/src/components/com_tjucm/site/models/item.php b/src/components/com_tjucm/site/models/item.php
index 09024f8b..02e31596 100644
--- a/src/components/com_tjucm/site/models/item.php
+++ b/src/components/com_tjucm/site/models/item.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -39,7 +40,6 @@ class TjucmModelItem extends JModelAdmin
 	 * @return void
 	 *
 	 * @since    1.6
-	 *
 	 */
 	protected function populateState()
 	{
@@ -54,6 +54,25 @@ protected function populateState()
 		// Get UCM type id from uniquue identifier
 		$ucmType = $app->input->get('client', '');
 
+		if (empty($ucmType))
+		{
+			// Get the active item
+			$menuitem   = $app->getMenu()->getActive();
+
+			// Get the params
+			$menuparams = $menuitem->params;
+
+			if (!empty($menuparams))
+			{
+				$ucm_type   = $menuparams->get('ucm_type');
+
+				if (!empty($ucm_type))
+				{
+					$ucmType     = 'com_tjucm.' . $ucm_type;
+				}
+			}
+		}
+
 		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjucm/models');
 		$tjUcmModelType = JModelLegacy::getInstance('Type', 'TjucmModel');
 		$ucmId = $tjUcmModelType->getTypeId($ucmType);
@@ -92,7 +111,6 @@ protected function populateState()
 	 * @return  object|boolean|JException  Menu item data object on success, boolean false or JException instance on error
 	 * 
 	 * @since    _DEPLOY_VERSION_
-	 * 
 	 */
 	public function getItem($pk = null)
 	{
@@ -105,12 +123,12 @@ public function getItem($pk = null)
 
 		// Variable to store creator name and id
 		$created_by = JFactory::getUser($item->created_by);
-		$created_by = array("id" => $created_by->id,"name" => $created_by->name);
+		$created_by = array("id" => $created_by->id, "name" => $created_by->name);
 		$item->created_by = $created_by;
 
 		// Variable to store modifier name and id
 		$modified_by = JFactory::getUser($item->modified_by);
-		$modified_by = array("id" => $modified_by->id,"name" => $modified_by->name);
+		$modified_by = array("id" => $modified_by->id, "name" => $modified_by->name);
 		$item->modified_by = $modified_by;
 
 		// Getting UCM Type Details
diff --git a/src/components/com_tjucm/site/models/itemform.php b/src/components/com_tjucm/site/models/itemform.php
index 08cd6f4d..fef4e9f4 100644
--- a/src/components/com_tjucm/site/models/itemform.php
+++ b/src/components/com_tjucm/site/models/itemform.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -361,7 +362,7 @@ public function getForm($data = array(), $loadData = true)
 		$form = $this->loadForm(
 			'com_tjucm.itemform', 'itemform',
 			array('control' => 'jform',
-				'load_data' => $loadData
+				'load_data' => $loadData,
 			)
 		);
 
@@ -484,7 +485,8 @@ public function save($data, $extra_jform_data = '')
 			return false;
 		}
 
-		$ucmTypeData = $this->common->getDataValues('#__tj_ucm_types', 'id AS type_id, params', 'unique_identifier = "' . $data['client'] . '"', 'loadAssoc');
+		$ucmTypeData = $this->common->getDataValues('#__tj_ucm_types', 'id AS type_id, params', 'unique_identifier = "'
+		. $data['client'] . '"', 'loadAssoc');
 
 		$data['type_id'] = empty($data['type_id']) ? $ucmTypeData['type_id'] : $data['type_id'];
 
@@ -654,8 +656,15 @@ public function delete($contentId)
 		$table = $this->getTable();
 		$table->load($contentId);
 		$canDelete = $user->authorise('core.type.deleteitem', 'com_tjucm.type.' . $table->type_id);
+		$canDeleteown = $user->authorise('core.type.deleteownitem', 'com_tjucm.type.' . $table->type_id);
 
-		if ($canDelete)
+		$deleteOwn = false;
+		if ($canDeleteown)
+		{
+			$deleteOwn = (JFactory::getUser()->id == $table->created_by ? true : false);
+		}
+
+		if ($canDelete || $deleteOwn)
 		{
 			$id = (!empty($contentId)) ? $contentId : (int) $this->getState('item.id');
 			$table = $this->getTable();
@@ -879,6 +888,11 @@ public function getFormattedUcmSubFormRecords($validData, &$extra_jform_data)
 		// Sort all the ucmsubform records as per client
 		foreach ($ucmSubFormFields as $ucmSubFormField)
 		{
+			if (!isset($extra_jform_data[$ucmSubFormField->name]))
+			{
+				continue;
+			}
+
 			$subformRecords = $extra_jform_data[$ucmSubFormField->name];
 
 			if (!empty($subformRecords))
@@ -934,6 +948,7 @@ public function getFormattedUcmSubFormRecords($validData, &$extra_jform_data)
 	 */
 	public function saveUcmSubFormRecords(&$validData, $ucmSubFormDataSet)
 	{
+		$db = JFactory::getDbo();
 		$subFormContentIds = array();
 
 		$isNew = empty($validData['id']) ? 1 : 0;
@@ -941,7 +956,6 @@ public function saveUcmSubFormRecords(&$validData, $ucmSubFormDataSet)
 		// Delete removed subform details
 		if (!$isNew)
 		{
-			$db = JFactory::getDbo();
 			$query = $db->getQuery(true);
 			$query->select('id');
 			$query->from($db->quoteName('#__tj_ucm_data'));
@@ -950,6 +964,8 @@ public function saveUcmSubFormRecords(&$validData, $ucmSubFormDataSet)
 			$oldSubFormContentIds = $db->loadColumn();
 		}
 
+		JLoader::import('components.com_tjfields.tables.fieldsvalue', JPATH_ADMINISTRATOR);
+		JLoader::import('components.com_tjfields.tables.field', JPATH_ADMINISTRATOR);
 		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_tjucm/models');
 		$tjUcmModelType = JModelLegacy::getInstance('Type', 'TjucmModel');
 
@@ -984,7 +1000,26 @@ public function saveUcmSubFormRecords(&$validData, $ucmSubFormDataSet)
 						$subFormContentIds[] = array('elementName' => $ucmSubformContentFieldElementId, 'content_id' => $insertedId);
 
 						$ucmSubFormData[$ucmSubformContentIdFieldName] = $insertedId;
-						$this->save($validData, $ucmSubFormData);
+
+						// Get field id of contentid field
+						$fieldTable = JTable::getInstance('Field', 'TjfieldsTable', array('dbo', $db));
+						$fieldTable->load(array('name' => $ucmSubformContentIdFieldName));
+
+						// Add-Update the value of content id field in the fields value table - start
+						$fieldsValueTable = JTable::getInstance('Fieldsvalue', 'TjfieldsTable', array('dbo', $db));
+						$fieldsValueTable->load(array('field_id' => $fieldTable->id, 'content_id' => $insertedId, 'client' => $validData['client']));
+
+						if (empty($fieldsValueTable->id))
+						{
+							$fieldsValueTable->field_id = $fieldTable->id;
+							$fieldsValueTable->value = $fieldsValueTable->content_id = $insertedId;
+							$fieldsValueTable->client = $validData['client'];
+						}
+
+						$fieldsValueTable->user_id = JFactory::getUser()->id;
+						$fieldsValueTable->store();
+
+						// Add-Update the value of content id field in the fields value table - end
 					}
 				}
 			}
@@ -1131,97 +1166,95 @@ public function getUdatedRelatedFieldOptions($contentId)
 			}
 			elseif ($field->type == 'ucmsubform')
 			{
-				// This is to get the options of related fields in the subforms of the parent UCM
-				$sfFieldName = $field->name;
-
-				// Get fields of the subform of the parent form
-				$tjFieldsModelFields = JModelLegacy::getInstance('Fields', 'TjfieldsModel', array('ignore_request' => true));
-				$tjFieldsModelFields->setState("filter.client", $ucmData[$field->id]->value);
-				$tjFieldsModelFields->setState("filter.state", 1);
-				$ucmSubFormfields = $tjFieldsModelFields->getItems();
-
-				// Get the content_id of the subform records of the parent record
-				$query = $db->getQuery(true);
-				$query->select('id');
-				$query->from($db->quoteName('#__tj_ucm_data'));
-				$query->where($db->quoteName('parent_id') . '=' . $contentId);
-				$query->where($db->quoteName('client') . '=' . $db->quote($ucmData[$field->id]->value));
-				$db->setQuery($query);
-				$subFormContentIds = $db->loadColumn();
-
-				if (!empty($subFormContentIds))
+				if (isset($ucmData[$field->id]) && !empty($ucmData[$field->id]->value))
 				{
-					$count = 0;
-
-					// Loop through the subform data to get the updated options of the subform related fields
-					foreach ($subFormContentIds as $subFormContentId)
+					// This is to get the options of related fields in the subforms of the parent UCM
+					$sfFieldName = $field->name;
+
+					// Get fields of the subform of the parent form
+					$tjFieldsModelFields = JModelLegacy::getInstance('Fields', 'TjfieldsModel', array('ignore_request' => true));
+					$tjFieldsModelFields->setState("filter.client", $ucmData[$field->id]->value);
+					$tjFieldsModelFields->setState("filter.state", 1);
+					$ucmSubFormfields = $tjFieldsModelFields->getItems();
+
+					// Get the content_id of the subform records of the parent record
+					$query = $db->getQuery(true);
+					$query->select('id');
+					$query->from($db->quoteName('#__tj_ucm_data'));
+					$query->where($db->quoteName('parent_id') . '=' . $contentId);
+					$query->where($db->quoteName('client') . '=' . $db->quote($ucmData[$field->id]->value));
+					$db->setQuery($query);
+					$subFormContentIds = $db->loadColumn();
+
+					if (!empty($subFormContentIds))
 					{
-						$ucmSubFormData = $tjFieldsHelper->FetchDatavalue(array('client' => $ucmData[$field->id]->value, 'content_id' => $subFormContentId));
+						$count = 0;
 
-						foreach ($ucmSubFormfields as $ucmSubFormfield)
+						// Loop through the subform data to get the updated options of the subform related fields
+						foreach ($subFormContentIds as $subFormContentId)
 						{
-							$fieldParams = new Registry($ucmSubFormfield->params);
+							$ucmSubFormData = $tjFieldsHelper->FetchDatavalue(array('client' => $ucmData[$field->id]->value, 'content_id' => $subFormContentId));
 
-							if ($ucmSubFormfield->type == 'related' && !empty($fieldParams->get('showParentRecordsOnly', '')))
+							foreach ($ucmSubFormfields as $ucmSubFormfield)
 							{
-								$options = $tjFieldsModelField->getRelatedFieldOptions($ucmSubFormfield->id);
-								$selectedValues = $ucmSubFormData[$ucmSubFormfield->id]->value;
+								$fieldParams = new Registry($ucmSubFormfield->params);
 
-								// Mark previously selected options as selected
-								if (is_array($selectedValues))
+								if ($ucmSubFormfield->type == 'related' && !empty($fieldParams->get('showParentRecordsOnly', '')))
 								{
-									foreach ($options as &$option)
+									$options = $tjFieldsModelField->getRelatedFieldOptions($ucmSubFormfield->id);
+									$selectedValues = $ucmSubFormData[$ucmSubFormfield->id]->value;
+
+									// Mark previously selected options as selected
+									if (is_array($selectedValues))
 									{
-										foreach ($selectedValues as $selectedValue)
+										foreach ($options as &$option)
 										{
-											if ($option['value'] == $selectedValue->value)
+											foreach ($selectedValues as $selectedValue)
 											{
-												$option['selected'] = 1;
+												if ($option['value'] == $selectedValue->value)
+												{
+													$option['selected'] = 1;
+												}
 											}
 										}
 									}
-								}
-								else
-								{
-									foreach ($options as &$option)
+									else
 									{
-										if ($option['value'] == $selectedValues)
+										foreach ($options as &$option)
 										{
-											$option['selected'] = 1;
+											if ($option['value'] == $selectedValues)
+											{
+												$option['selected'] = 1;
+											}
 										}
 									}
-								}
 
-								// This is required to replace the options of related field of subform in the DOM
-								$ucmSubFormFieldElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . $count . '__' . $ucmSubFormfield->name;
-								$ucmSubFormFieldElementId = str_replace('-', '_', $ucmSubFormFieldElementId);
-								$ucmSubFormFieldTemplateElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . 'XXX_XXX__' . $ucmSubFormfield->name;
-								$ucmSubFormFieldTemplateElementId = str_replace('-', '_', $ucmSubFormFieldTemplateElementId);
-								$returnData[] = array('templateId' => $ucmSubFormFieldTemplateElementId, 'elementId' => $ucmSubFormFieldElementId, 'options' => $options);
+									// This is required to replace the options of related field of subform in the DOM
+									$ucmSubFormFieldElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . $count . '__' . $ucmSubFormfield->name;
+									$ucmSubFormFieldElementId = str_replace('-', '_', $ucmSubFormFieldElementId);
+									$ucmSubFormFieldTemplateElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . 'XXX_XXX__' . $ucmSubFormfield->name;
+									$ucmSubFormFieldTemplateElementId = str_replace('-', '_', $ucmSubFormFieldTemplateElementId);
+									$returnData[] = array('templateId' => $ucmSubFormFieldTemplateElementId, 'elementId' => $ucmSubFormFieldElementId, 'options' => $options);
+								}
 							}
-						}
 
-						$count++;
+							$count++;
+						}
 					}
-				}
-				else
-				{
-					$parentUcmFieldParams = new Registry($field->params);
+					else
+					{
+						$parentUcmFieldParams = new Registry($field->params);
 
-					$minimumUcmRecords = $parentUcmFieldParams->get('min', 0, 'INT');
+						$minimumUcmRecords = $parentUcmFieldParams->get('min', 0, 'INT');
 
-					for ($i = 0; $i <= $minimumUcmRecords; $i++)
-					{
-						foreach ($ucmSubFormfields as $ucmSubFormfield)
+						for ($i = 0; $i <= $minimumUcmRecords; $i++)
 						{
-							$fieldParams = new Registry($ucmSubFormfield->params);
-
-							if ($ucmSubFormfield->type == 'related' && !empty($fieldParams->get('showParentRecordsOnly', '')))
+							foreach ($ucmSubFormfields as $ucmSubFormfield)
 							{
 								$options = $tjFieldsModelField->getRelatedFieldOptions($ucmSubFormfield->id);
 
 								// This is required to replace the options of related field of subform in the DOM
-								$ucmSubFormFieldElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . $i .'__' . $ucmSubFormfield->name;
+								$ucmSubFormFieldElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . $i . '__' . $ucmSubFormfield->name;
 								$ucmSubFormFieldElementId = str_replace('-', '_', $ucmSubFormFieldElementId);
 								$ucmSubFormFieldTemplateElementId = 'jform_' . $sfFieldName . '__' . $sfFieldName . 'XXX_XXX__' . $ucmSubFormfield->name;
 								$ucmSubFormFieldTemplateElementId = str_replace('-', '_', $ucmSubFormFieldTemplateElementId);
diff --git a/src/components/com_tjucm/site/models/items.php b/src/components/com_tjucm/site/models/items.php
index 27e93607..08302d06 100644
--- a/src/components/com_tjucm/site/models/items.php
+++ b/src/components/com_tjucm/site/models/items.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
@@ -171,7 +172,7 @@ protected function getListQuery()
 
 		// Join over the users for the checked out user
 		$query->select($db->quoteName('uc.name', 'uEditor'));
-		$query->join("LEFT",  $db->quoteName('#__users', 'uc') . ' ON (' . $db->quoteName('uc.id') . ' = ' . $db->quoteName('a.checked_out') . ')');
+		$query->join("LEFT", $db->quoteName('#__users', 'uc') . ' ON (' . $db->quoteName('uc.id') . ' = ' . $db->quoteName('a.checked_out') . ')');
 
 		// Join over the foreign key 'type_id'
 		$query->join("INNER", $db->quoteName('#__tj_ucm_types', 'types') .
@@ -181,20 +182,20 @@ protected function getListQuery()
 		// Join over the user field 'created_by'
 
 		$query->select($db->quoteName('ucby.name', 'created_by_name'));
-		$query->join("INNER",  $db->quoteName('#__users', 'ucby') . ' ON (' . $db->quoteName('ucby.id') .
+		$query->join("INNER", $db->quoteName('#__users', 'ucby') . ' ON (' . $db->quoteName('ucby.id') .
 		' = ' . $db->quoteName('a.created_by') . ')');
 
 		// Join over the user field 'modified_by'
 		$query->select($db->quoteName('um.name', 'modified_by_name'));
-		$query->join("LEFT",  $db->quoteName('#__users', 'um') .
+		$query->join("LEFT", $db->quoteName('#__users', 'um') .
 		' ON (' . $db->quoteName('um.id') . ' = ' . $db->quoteName('a.modified_by') . ')');
 
 		// Join over the tjfield
-		$query->join("INNER",  $db->quoteName('#__tjfields_fields', 'fields') .
+		$query->join("INNER", $db->quoteName('#__tjfields_fields', 'fields') .
 		' ON (' . $db->quoteName('fields.client') . ' = ' . $db->quoteName('a.client') . ')');
 
 		// Join over the tjfield value
-		$query->join("INNER",  $db->quoteName('#__tjfields_fields_value', 'fieldValue') .
+		$query->join("INNER", $db->quoteName('#__tjfields_fields_value', 'fieldValue') .
 		' ON (' . $db->quoteName('fieldValue.content_id') . ' = ' . $db->quoteName('a.id') . ')');
 
 		$this->client = $this->getState('ucm.client');
@@ -269,8 +270,9 @@ protected function getListQuery()
 	public function getFields()
 	{
 		JLoader::import('components.com_tjfields.models.fields', JPATH_ADMINISTRATOR);
-		$items_model = JModelLegacy::getInstance('Fields', 'TjfieldsModel');
+		$items_model = JModelLegacy::getInstance('Fields', 'TjfieldsModel', array('ignore_request'=> true));
 		$items_model->setState('filter.showonlist', 1);
+		$items_model->setState('filter.state', 1);
 		$this->client = $this->getState('ucm.client');
 
 		if (!empty($this->client))
@@ -301,7 +303,7 @@ public function getItems()
 		$createdBy = $this->getState('created_by', '');
 
 		JLoader::import('components.com_tjucm.models.item', JPATH_SITE);
-		$itemModel = new TjucmModelItem();
+		$itemModel = new TjucmModelItem;
 		$canView = $itemModel->canView($typeId);
 		$user = JFactory::getUser();
 
@@ -323,7 +325,7 @@ public function getItems()
 
 		foreach ($items as $item)
 		{
-			if (!empty ($item->field_values))
+			if (!empty($item->field_values))
 			{
 				$explode_field_values = explode($this->records_separator, $item->field_values);
 
diff --git a/src/components/com_tjucm/site/router.php b/src/components/com_tjucm/site/router.php
index d5e59312..0eb0898f 100644
--- a/src/components/com_tjucm/site/router.php
+++ b/src/components/com_tjucm/site/router.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @package	TJ-UCM
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
  *
- * @author	 TechJoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2019 TechJoomla. All rights reserved.
- * @license	GNU General Public License version 2 or later; see LICENSE.txt
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -20,13 +21,13 @@
  *
  * @subpackage  com_tjucm
  *
- * @since	   _DEPLOY_VERSION_
+ * @since       _DEPLOY_VERSION_
  */
-class tjUcmRouter extends JComponentRouterBase
+class TjUcmRouter extends JComponentRouterBase
 {
-	private  $views = array('itemform', 'items', 'item');
+	private $views = array('itemform', 'items', 'item');
 
-	private  $menu_views = array('itemform', 'items');
+	private $menu_views = array('itemform', 'items');
 
 	/**
 	 * Build the route for the com_tjucm component
@@ -114,15 +115,6 @@ public function build(&$query)
 			unset($query['client']);
 		}
 
-		if ($view == 'item')
-		{
-			if (isset($query['id']))
-			{
-				$segments[] = (INT) $query['id'];
-				unset($query['id']);
-			}
-		}
-
 		return $segments;
 	}
 
@@ -162,11 +154,6 @@ public function parse(&$segments)
 			if ($ucmTypeTable->id)
 			{
 				$vars['client'] = $ucmTypeTable->unique_identifier;
-
-				if (!empty($segments[2]))
-				{
-					$vars['id'] = $segments[2];
-				}
 			}
 		}
 
diff --git a/src/components/com_tjucm/site/tjucm.php b/src/components/com_tjucm/site/tjucm.php
index 24808158..da477d81 100644
--- a/src/components/com_tjucm/site/tjucm.php
+++ b/src/components/com_tjucm/site/tjucm.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    CVS: 1.0.0
- * @package    Com_Tjucm
- * @author     Parth Lawate <contact@techjoomla.com>
- * @copyright  2016 Techjoomla
- * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 defined('_JEXEC') or die;
diff --git a/src/components/com_tjucm/site/views/item/tmpl/default.php b/src/components/com_tjucm/site/views/item/tmpl/default.php
index f64e0edb..ea0782e9 100644
--- a/src/components/com_tjucm/site/views/item/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/item/tmpl/default.php
@@ -1,199 +1,67 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package	TJ-UCM
+ * 
+ * @author	 TechJoomla <extensions@techjoomla.com>
+ * @copyright  Copyright (c) 2009-2019 TechJoomla. All rights reserved.
+ * @license	GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 // No direct access
 defined('_JEXEC') or die;
-$app = JFactory::getApplication();
-$user = JFactory::getUser();
-JLoader::import('components.com_tjfields.helpers.tjfields', JPATH_SITE);
-$TjfieldsHelper = new TjfieldsHelper;
-
-// Layout for field types
-$fieldLayout = array();
-$fieldLayout['File'] = "file";
-$fieldLayout['Image'] = "file";
-$fieldLayout['Checkbox'] = "checkbox";
-$fieldLayout['Radio'] = "list";
-$fieldLayout['List'] = "list";
-$fieldLayout['Itemcategory'] = "itemcategory";
-
-// Get Field table
-$fieldTableData = new stdClass;
-JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjfields/tables');
-$fieldTableData->tjFieldFieldTable = JTable::getInstance('field', 'TjfieldsTable');
 
-$count = 0;
-$xmlFieldSets = array();
-
-foreach ($this->formXml as $k => $xmlFieldSet)
-{
-	$xmlFieldSets[$count] = $xmlFieldSet;
-	$count++;
-}
+$user = JFactory::getUser();
 
 if ($this->form_extra)
 {
-	$fieldSets = $this->form_extra->getFieldsets();
 	$count = 0;
+	$xmlFieldSets = array();
 
-	// Iterate through the normal form fieldsets and display each one
-	foreach ($fieldSets as $fieldName => $fieldset)
+	foreach ($this->formXml as $k => $xmlFieldSet)
 	{
-		$xmlFieldSet = $xmlFieldSets[$count];
+		$xmlFieldSets[$count] = $xmlFieldSet;
 		$count++;
-		?>
-		<div class="row">
-			<?php
-			$fieldCount = 0;
-
-			foreach ($this->form_extra->getFieldset($fieldset->name) as $field)
-			{
-				// Get the field data by field name to check the field type
-				$fieldTableData->tjFieldFieldTable->load(array('name' => $field->__get("fieldname")));
-
-				if ($user->authorise('core.field.viewfieldvalue', 'com_tjfields.group.' . $fieldTableData->tjFieldFieldTable->group_id))
-				{
-					$canView = $user->authorise('core.field.viewfieldvalue', 'com_tjfields.field.' . $fieldTableData->tjFieldFieldTable->id);
-
-					// Check if user is allowed to view field value
-					if ($canView || ($this->item->created_by == $user->id))
-					{
-						// Get xml for the field
-						$xmlField = $xmlFieldSet->field[$fieldCount];
-						$fieldCount++;
-
-						if ($field->hidden)
-						{
-							echo $field->input;
-						}
-						elseif ($field->type == 'Subform' || $field->type == 'Ucmsubform')
-						{
-							// Get Subform field data
-							$formData = $TjfieldsHelper->getFieldData($field->getAttribute('name'));
-
-							if ($field->value)
-							{
-								?>
-								<div class="col-xs-12 col-md-6">
-									<div class="row">
-										<div class="col-xs-4"><?php echo $field->label; ?>:</div>
-										<div class="col-xs-8">
-										<?php
-											foreach ($field->value as $val)
-											{
-												foreach ($val as $name => $value)
-												{
-													// Get the field data by field name to check the field type
-													$fieldTableData->tjFieldFieldTable->load(array('name' => $name));
-
-													if ($value)
-													{
-														?>
-														<div class="row">
-															<div class="col-xs-4" style="word-wrap:break-word;"><?php echo $fieldTableData->tjFieldFieldTable->label; ?>:</div>
-															<div class="col-xs-8">
-																<?php
-																// If field type is file
-																if ($fieldTableData->tjFieldFieldTable->type == 'file' || $fieldTableData->tjFieldFieldTable->type == 'image')
-																{
-																	$layout = new JLayoutFile($fieldTableData->tjFieldFieldTable->type, JPATH_ROOT .'/components/com_tjfields/layouts/fields');
-																	$mediaLink = $layout->render(array('fieldValue'=>$value, 'isSubformField'=>'1', 'content_id'=>$app->input->get('id', '', 'INT'), 'subformFieldId'=>$formData->id,'subformFileFieldName'=>$name));
-																	echo $mediaLink;
-																}
-																// If field type is checkbox
-																elseif ($fieldTableData->tjFieldFieldTable->type == 'Checkbox')
-																{
-																	$checked = ($value == 1) ? ' checked="checked"' : '';
-																	?>
-																	<input type="checkbox" disabled="disabled" value="1" <?php echo $checked;?> />
-																	<?php
-																}
-																else
-																{
-																	$html = '<div class="form-group">';
-																	$html .= '<div class="col-sm-10"> ' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</div>';
-																	$html .= '</div>';
-
-																	echo  $html;
-																}
-																?>
-															</div>
-														</div>
-														<?php
-													}
-												}
-
-												echo '<hr>';
-											}
-										?>
-										</div>
-									</div>
-								</div>
-								<?php
-							}
-						}
-						else
-						{
-							$layoutToUse = (array_key_exists($field->type, $fieldLayout)) ? $fieldLayout[$field->type] : 'field';
-							?>
-							<div class="col-xs-12 col-md-6">
-								<div class="row">
-									<div class="col-xs-4"><?php echo $field->label; ?>:</div>
-									<div class="col-xs-8">
-										<?php 
-										$layout = new JLayoutFile($layoutToUse, JPATH_ROOT .'/components/com_tjfields/layouts/fields');
-										$mediaLink = $layout->render(array('fieldValue' => $field->value));
-										$output = $layout->render(array('fieldXml' => $xmlField, 'field' => $field));
-										echo $output;
-										?>
-									</div>
-								</div>
-							</div>
-							<?php
-						}
-					}
-				}
-			}
-		?>
-		</div>
-		<?php
 	}
+
+	// Call the JLayout to render the fields in the details view
+	$layout = new JLayoutFile('fields', JPATH_ROOT . '/components/com_tjucm/layouts/detail');
+	echo $layout->render(array('xmlFormObject' => $xmlFieldSets, 'formObject' => $this->form_extra, 'itemData' => $this->item));
 }
 else
 {
 	?>
 	<div class="alert alert-info">
-		<?php echo JText::_('COM_TJUCM_NO_ACTIVITIES');?>
+		<?php echo JText::_('COM_TJUCM_NO_DATA_FOUND');?>
 	</div>
 	<?php
 }
 ?>
 <div>&nbsp;</div>
-<div>&nbsp;</div>
-<div class="row">
+<div>
 	<div class="form-group">
-	<?php
-	if (($user->authorise('core.type.edititem', 'com_tjucm.type.' . $this->ucmTypeId)) || ($user->authorise('core.type.editownitem', 'com_tjucm.type.' . $this->ucmTypeId) && JFactory::getUser()->id == $this->item->created_by))
-	{
-		$redirectURL = JRoute::_('index.php?option=com_tjucm&task=item.edit&id=' . $this->item->id . '&client=' . $this->client, false);
-		?>
-		<a class="btn btn-default" href="<?php echo $redirectURL; ?>"><?php echo JText::_("COM_TJUCM_EDIT_ITEM"); ?></a>
 		<?php
-	}
+		if (($user->authorise('core.type.edititem', 'com_tjucm.type.' . $this->ucmTypeId)) || ($user->authorise('core.type.editownitem', 'com_tjucm.type.' . $this->ucmTypeId) && JFactory::getUser()->id == $this->item->created_by))
+		{
+			$redirectURL = JRoute::_('index.php?option=com_tjucm&task=item.edit&id=' . $this->item->id . '&client=' . $this->client, false);
+			?>
+			<a class="btn btn-default" href="<?php echo $redirectURL; ?>"><?php echo JText::_("COM_TJUCM_EDIT_ITEM"); ?></a>
+			<?php
+		}
 
-	if ($user->authorise('core.type.deleteitem','com_tjucm.type.' . $this->ucmTypeId))
-	{
-		$redirectURL = JRoute::_('index.php?option=com_tjucm&task=item.remove&id=' . $this->item->id . '&client=' . $this->client, false);
+		$deleteOwn = false;
+
+		if ($user->authorise('core.type.deleteownitem', 'com_tjucm.type.' . $this->ucmTypeId))
+		{
+			$deleteOwn = (JFactory::getUser()->id == $this->item->created_by ? true : false);
+		}
+
+		if ($user->authorise('core.type.deleteitem', 'com_tjucm.type.' . $this->ucmTypeId) || $deleteOwn)
+		{
+			$redirectURL = JRoute::_('index.php?option=com_tjucm&task=itemform.remove&id=' . $this->item->id . '&client=' . $this->client . "&" . JSession::getFormToken() . '=1', false);
+			?>
+			<a class="btn btn-default" href="<?php echo $redirectURL; ?>"><?php echo JText::_("COM_TJUCM_DELETE_ITEM"); ?></a>
+			<?php
+		}
 		?>
-		<a class="btn btn-default" href="<?php echo $redirectURL; ?>"><?php echo JText::_("COM_TJUCM_DELETE_ITEM"); ?></a>
-		<?php
-	}
-	?>
 	</div>
 </div>
diff --git a/src/components/com_tjucm/site/views/item/view.html.php b/src/components/com_tjucm/site/views/item/view.html.php
index afdf830e..47763374 100644
--- a/src/components/com_tjucm/site/views/item/view.html.php
+++ b/src/components/com_tjucm/site/views/item/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -39,7 +40,6 @@ class TjucmViewItem extends JViewLegacy
 	public function display($tpl = null)
 	{
 		$app  = JFactory::getApplication();
-		$user = JFactory::getUser();
 
 		// Load tj-fields language file
 		$lang = JFactory::getLanguage();
@@ -75,6 +75,27 @@ public function display($tpl = null)
 		/* Get model instance here */
 		$model = $this->getModel();
 		$this->client  = JFactory::getApplication()->input->get('client');
+
+		// If did not get the client from url then get if from menu param
+		if (empty($this->client))
+		{
+			// Get the active item
+			$menuItem = $app->getMenu()->getActive();
+
+			// Get the params
+			$this->menuparams = $menuItem->params;
+
+			if (!empty($this->menuparams))
+			{
+				$this->ucm_type   = $this->menuparams->get('ucm_type');
+
+				if (!empty($this->ucm_type))
+				{
+					$this->client     = 'com_tjucm.' . $this->ucm_type;
+				}
+			}
+		}
+
 		$this->id = JFactory::getApplication()->input->get('id');
 		$view = explode('.', $this->client);
 
@@ -85,7 +106,7 @@ public function display($tpl = null)
 			"client" => $this->client,
 			"view" => $view[1],
 			"layout" => 'default',
-			"content_id" => $this->id)
+			"content_id" => $this->id, )
 			);
 
 		// Check for errors.
diff --git a/src/components/com_tjucm/site/views/itemform/tmpl/default.php b/src/components/com_tjucm/site/views/itemform/tmpl/default.php
index 9e7f2a2d..14524583 100644
--- a/src/components/com_tjucm/site/views/itemform/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/itemform/tmpl/default.php
@@ -180,12 +180,12 @@
 				?>
 				<input type="button" class="btn btn-width150 br-0 btn-default font-normal" id="draftSave"
 				value="<?php echo JText::_("COM_TJUCM_SAVE_AS_DRAFT_ITEM"); ?>"
-				onclick="javascript: this.disabled=true; steppedFormSave(this.form.id, 'draft');" />
+				onclick="javascript: this.disabled=true; steppedFormSave(this.form.id, 'draft', 1);" />
 				<?php
 			}
 			?>
 			<input type="button" class="btn btn-success" value="<?php echo JText::_("COM_TJUCM_SAVE_ITEM"); ?>"
-			id="finalSave" onclick="javascript: this.disabled=true; steppedFormSave(this.form.id, 'save');" />
+			id="finalSave" onclick="javascript: this.disabled=true; steppedFormSave(this.form.id, 'save', 1);" />
 			<?php
 		}
 		?>
diff --git a/src/components/com_tjucm/site/views/itemform/view.html.php b/src/components/com_tjucm/site/views/itemform/view.html.php
index bf59e1bd..81e73733 100644
--- a/src/components/com_tjucm/site/views/itemform/view.html.php
+++ b/src/components/com_tjucm/site/views/itemform/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -220,7 +221,7 @@ public function display($tpl = null)
 			"client" => $this->client,
 			"view" => $view[1],
 			"layout" => 'edit',
-			"content_id" => $this->id)
+			"content_id" => $this->id, )
 			);
 
 		// Check if draft save is enabled for the form
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default.php b/src/components/com_tjucm/site/views/items/tmpl/default.php
index 88cde404..69cbbdd4 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default.php
@@ -56,7 +56,7 @@
 				}
 				?>
 				<th class=''>
-					<?php echo JHtml::_('grid.sort',  'COM_TJUCM_ITEMS_ID', 'a.id', $listDirn, $listOrder); ?>
+					<?php echo JHtml::_('grid.sort', 'COM_TJUCM_ITEMS_ID', 'a.id', $listDirn, $listOrder); ?>
 				</th>
 				<?php
 
@@ -116,6 +116,12 @@
 						$editown = (JFactory::getUser()->id == $item->created_by ? true : false);
 					}
 
+					$deleteOwn = false;
+					if ($this->canDeleteOwn)
+					{
+						$deleteOwn = (JFactory::getUser()->id == $item->created_by ? true : false);
+					}
+					
 					?>
 					<tr class="row<?php echo $i % 2; ?>">
 						<?php
@@ -146,12 +152,12 @@
 								echo JHtml::_('jgrid.checkedout', $i, $item->uEditor, $item->checked_out_time, 'items.', $canCheckin);
 							}
 							?>
-							<a href="<?php echo JRoute::_('index.php?option=com_tjucm&view=item&id='.(int) $item->id . "&client=" . $this->client . '&Itemid=' . $itemId, false); ?>">
+							<a href="<?php echo JRoute::_('index.php?option=com_tjucm&view=item&id=' . (int) $item->id . "&client=" . $this->client . '&Itemid=' . $itemId, false); ?>">
 								<?php echo $this->escape($item->id); ?>
 							</a>
 						</td>
 						<?php
-							if (!empty ($item->field_values))
+							if (!empty($item->field_values))
 							{
 								foreach ($item->field_values as $field_values)
 								{
@@ -196,7 +202,7 @@
 								}
 							}
 
-							if ($this->canEdit || $this->canDelete || $editown)
+							if ($this->canEdit || $this->canDelete || $editown || $deleteOwn)
 							{
 								?>
 								<td class="center">
@@ -207,7 +213,7 @@
 									<a target="_blank" href="<?php echo 'index.php?option=com_tjucm&task=itemform.edit&id=' . $item->id . $appendUrl; ?>" class="btn btn-mini" type="button"><i class="icon-apply" aria-hidden="true"></i></a>
 									<?php
 								}
-								if ($this->canDelete)
+								if ($this->canDelete || $deleteOwn)
 								{
 									?>
 									<a href="<?php echo 'index.php?option=com_tjucm&task=itemform.remove' . '&id=' . $item->id . $appendUrl . $csrf; ?>" class="btn btn-mini delete-button" type="button"><i class="icon-delete" aria-hidden="true"></i></a>
diff --git a/src/components/com_tjucm/site/views/items/tmpl/default_filter.php b/src/components/com_tjucm/site/views/items/tmpl/default_filter.php
index d5c0356b..0f45fe2f 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default_filter.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default_filter.php
@@ -59,7 +59,7 @@
 	'filtersHidden'       => isset($options['filtersHidden']) ? $options['filtersHidden'] : empty($data['view']->activeFilters) && !$filtered,
 	'defaultLimit'        => isset($options['defaultLimit']) ? $options['defaultLimit'] : JFactory::getApplication()->get('list_limit', 20),
 	'searchFieldSelector' => '#filter_search',
-	'orderFieldSelector'  => '#list_fullordering'
+	'orderFieldSelector'  => '#list_fullordering',
 );
 
 $data['options'] = array_unique(array_merge($customOptions, $data['options']));
diff --git a/src/components/com_tjucm/site/views/items/view.html.php b/src/components/com_tjucm/site/views/items/view.html.php
index 87c3d752..cdd683ff 100644
--- a/src/components/com_tjucm/site/views/items/view.html.php
+++ b/src/components/com_tjucm/site/views/items/view.html.php
@@ -1,10 +1,11 @@
 <?php
 /**
- * @version    SVN: <svn_id>
- * @package    Com_Tjucm
- * @author     Techjoomla <extensions@techjoomla.com>
- * @copyright  Copyright (c) 2009-2017 TechJoomla. All rights reserved.
- * @license    GNU General Public License version 2 or later.
+ * @package     TJ-UCM
+ * @subpackage  com_tjucm
+ *
+ * @author      Techjoomla <extensions@techjoomla.com>
+ * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access
@@ -93,12 +94,14 @@ public function display($tpl = null)
 		$canChange          = $user->authorise('core.type.edititemstate', 'com_tjucm.type.' . $this->ucmTypeId);
 		$canEditOwn         = $user->authorise('core.type.editownitem', 'com_tjucm.type.' . $this->ucmTypeId);
 		$canDelete          = $user->authorise('core.type.deleteitem', 'com_tjucm.type.' . $this->ucmTypeId);
+		$canDeleteOwn       = $user->authorise('core.type.deleteownitem', 'com_tjucm.type.' . $this->ucmTypeId);
 		$this->canCreate    = $canCreate;
 		$this->canView      = $canView;
 		$this->canEdit      = $canEdit;
 		$this->canChange    = $canChange;
 		$this->canEditOwn   = $canEditOwn;
 		$this->canDelete    = $canDelete;
+		$this->canDeleteOwn = $canDeleteOwn;
 
 		// If did not get the client from url then get if from menu param
 		if (empty($this->client))
diff --git a/src/components/com_tjucm/tjucm.xml b/src/components/com_tjucm/tjucm.xml
index 7e27d4fd..03e3957d 100644
--- a/src/components/com_tjucm/tjucm.xml
+++ b/src/components/com_tjucm/tjucm.xml
@@ -6,8 +6,8 @@
 	<author>Techjoomla</author>
 	<authorEmail>extensions@techjoomla.com</authorEmail>
 	<authorUrl>https://techjoomla.com</authorUrl>
-	<creationDate>5th July 2019</creationDate>
-	<version>1.1.0</version>
+	<creationDate>25th July 2019</creationDate>
+	<version>1.2.0</version>
 	<description><![CDATA[<h3>TJ-UCM - Universal Content Manager</h3>]]></description>
 	<scriptfile>script.php</scriptfile>
 	<install>
@@ -33,6 +33,7 @@
 		<filename>router.php</filename>
 		<folder>views</folder>
 		<folder>models</folder>
+		<folder>layouts</folder>
 		<folder>controllers</folder>
 		<folder>helpers</folder>
 	</files>
diff --git a/src/pkg_tjucm.xml b/src/pkg_tjucm.xml
index 0517307c..9a2b409c 100644
--- a/src/pkg_tjucm.xml
+++ b/src/pkg_tjucm.xml
@@ -6,9 +6,9 @@
 	<description>TJUCM - Universal Content Manager Package</description>
 	<copyright>Copyright (c) 2009-2019 Techjoomla. All rights reserved.</copyright>
 	<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-	<creationDate>5th July 2019</creationDate>
+	<creationDate>25th July 2019</creationDate>
 	<packagename>ucm</packagename>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 	<packager>Techjoomla Team</packager>
 	<scriptfile>script.pkg_tjucm.php</scriptfile>
 	<files folder="components">
diff --git a/src/script.pkg_tjucm.php b/src/script.pkg_tjucm.php
index 83e10846..8c186ad4 100644
--- a/src/script.pkg_tjucm.php
+++ b/src/script.pkg_tjucm.php
@@ -5,7 +5,7 @@
  *
  * @author      Techjoomla <extensions@techjoomla.com>
  * @copyright   Copyright (C) 2009 - 2019 Techjoomla. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ * @license     http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL
  */
 
 // No direct access.
@@ -38,36 +38,36 @@ class Pkg_UcmInstallerScript extends TJInstaller
 	private $oldversion = "";
 
 	/** @var  array  The list of extra modules and plugins to install */
-	protected $installationQueue = array (
+	protected $installationQueue = array(
 		'postflight' => array(
 			'files' => array(
-				'tj_strapper' => 1
+				'tj_strapper' => 1,
 			),
 
-			'libraries' => array (
-				'techjoomla' => 1
-			)
-		)
+			'libraries' => array(
+				'techjoomla' => 1,
+			),
+		),
 	);
 
 	/** @var  array  The list of extra modules and plugins to uninstall */
-	protected $uninstallQueue = array (
+	protected $uninstallQueue = array(
 		/*plugins => { (folder) => { (element) => (published) }}*/
-		'plugins' => array ()
+		'plugins' => array(),
 	);
 
 	/** @var array The list of obsolete extra modules and plugins to uninstall when upgrading the component */
-	protected $obsoleteExtensionsUninstallationQueue = array (
+	protected $obsoleteExtensionsUninstallationQueue = array(
 		// @modules => { (folder) => { (module) }* }*
-		'modules' => array (
-			'admin' => array (
+		'modules' => array(
+			'admin' => array(
+			),
+			'site' => array(
 			),
-			'site' => array (
-			)
 		),
 		// @plugins => { (folder) => { (element) }* }*
-		'plugins' => array (
-		)
+		'plugins' => array(
+		),
 	);
 
 	/**
@@ -77,14 +77,14 @@ class Pkg_UcmInstallerScript extends TJInstaller
 	 *
 	 * @var array
 	 */
-	protected $extensionsToEnable = array ();
+	protected $extensionsToEnable = array();
 
 	/** @var array Obsolete files and folders to remove*/
 	private $removeFilesAndFolders = array(
 		'files'	=> array(
 		),
 		'folders' => array(
-		)
+		),
 	);
 
 	/**