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 94b7824d..99932c5a 100644
--- a/src/components/com_tjucm/administrator/views/types/tmpl/default.php
+++ b/src/components/com_tjucm/administrator/views/types/tmpl/default.php
@@ -10,6 +10,8 @@
 // No direct access
 defined('_JEXEC') or die;
 use \Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Language\Text;
+use Joomla\CMS\Router\Route;
 
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/');
 JHtml::_('bootstrap.tooltip');
@@ -207,6 +209,7 @@
 							$category_url    = JRoute::_('index.php?option=com_categories&extension=' . $item->unique_identifier);
 							$field_group_url = JRoute::_('index.php?option=com_tjfields&view=groups&client=' . $item->unique_identifier);
 							$fields_url      = JRoute::_('index.php?option=com_tjfields&view=fields&client=' . $item->unique_identifier . '&extension=' . $item->unique_identifier);
+							$conditionsUrl   = Route::_('index.php?option=com_tjfields&view=conditions&client=' . $item->unique_identifier);
 							$type_addnew_data_url   = JRoute::_('index.php?option=com_tjucm&view=item&layout=edit&client=' . $item->unique_identifier);
 							$type_data_url   = JRoute::_('index.php?option=com_tjucm&view=items&client=' . $item->unique_identifier);
 
@@ -276,6 +279,7 @@
 								<a href="<?php echo $category_url; ?>"><?php echo JText::_('COM_TJUCM_TYPES_CATEGORY_URL');?></a>
 								&nbsp;|&nbsp;<a href="<?php echo $field_group_url; ?>"><?php echo JText::_('COM_TJUCM_TYPES_FIELD_GROUP_URL');?></a>
 								&nbsp;|&nbsp;<a href="<?php echo $fields_url; ?>"><?php echo JText::_('COM_TJUCM_TYPES_FIELDS_URL');?></a>
+								&nbsp;|&nbsp;<a href="<?php echo $conditionsUrl; ?>"><?php echo Text::_('COM_TJUCM_TYPES_CONDITIONS_URL');?></a>
 								<!-- &nbsp;|&nbsp;<a href="<?php echo $type_addnew_data_url; ?>"><?php echo JText::_('COM_TJUCM_TYPES_ADD_NEW_DATA_URL');?></a>
 								&nbsp;|&nbsp;<a href="<?php echo $type_data_url; ?>"><?php echo JText::_('COM_TJUCM_TYPES_DATA_URL');?></a> -->
 							</td>
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 b95375a3..e7d34514 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
@@ -203,3 +203,4 @@ COM_TJUCM_USE_TJQUEUE_WHILE_COPY_ITEM="Use TjQueue While Copy Item"
 COM_TJUCM_USE_TJQUEUE_WHILE_COPY_ITEM_DESC="Set to 'Yes' if you want to use TjQueue while copying items"
 COM_TJUCM_YES="Yes"
 COM_TJUCM_NO="No"
+COM_TJUCM_TYPES_CONDITIONS_URL="Conditions"
diff --git a/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php b/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php
index 75a5e681..67890952 100644
--- a/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php
+++ b/src/components/com_tjucm/site/views/itemform/tmpl/default_extrafields.php
@@ -53,12 +53,7 @@
 					?>
 					<div class="col-xs-12 col-md-6">
 						<div class="form-group">
-							<div class="col-sm-4 control-label">
-								<?php echo $field->label; ?>
-							</div>
-							<div class="col-sm-8">
-								<?php echo $field->input; ?>
-							</div>
+							<?php echo $field->renderField(); ?>
 							<?php
 							// TODO :- Check and remove
 							if ($field->type == 'File')