diff --git a/src/components/com_tjucm/site/layouts/detail/fields.php b/src/components/com_tjucm/site/layouts/detail/fields.php
index 41c6f7a8..fb8d2892 100644
--- a/src/components/com_tjucm/site/layouts/detail/fields.php
+++ b/src/components/com_tjucm/site/layouts/detail/fields.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package	TJ-UCM
- * 
- * @author	 TechJoomla <extensions@techjoomla.com>
+ * @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
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 // No direct access
@@ -63,6 +63,7 @@
 	$count++;
 	$fieldCount = 0;
 	?>
+	<div class="tjucm-wrapper">
 	<div class="row">
 		<?php
 		foreach ($formObject->getFieldset($fieldset->name) as $field)
@@ -178,7 +179,21 @@
 
 							$layout = new JLayoutFile($layoutToUse, JPATH_ROOT . '/components/com_tjfields/layouts/fields');
 							$output = $layout->render(array('fieldXml' => $xmlField, 'field' => $field));
-							echo $output;
+
+							// To align text, textarea, textareacounter and editor fields properly
+
+							if ($field->type == 'Textarea'|| $field->type == 'Textareacounter'|| $field->type == 'Text' || $field->type == 'Editor')
+							{
+								?>
+								<div class="tj-wordwrap">
+									<?php echo $output; ?>
+								</div>
+								<?php
+							}
+							else
+							{
+								echo $output;
+							}
 							?>
 						</div>
 					</div>
@@ -188,5 +203,6 @@
 		}
 	?>
 	</div>
+</div>
 	<?php
 }
diff --git a/src/components/com_tjucm/site/layouts/list/list.php b/src/components/com_tjucm/site/layouts/list/list.php
index ba61b877..306172d4 100644
--- a/src/components/com_tjucm/site/layouts/list/list.php
+++ b/src/components/com_tjucm/site/layouts/list/list.php
@@ -1,10 +1,10 @@
 <?php
 /**
- * @package	TJ-UCM
+ * @package	    TJ-UCM
  *
- * @author	 TechJoomla <extensions@techjoomla.com>
+ * @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  	  GNU General Public License version 2 or later; see LICENSE.txt
  */
 
 // No direct access
@@ -51,7 +51,7 @@
 $xmlFormObject = $displayData['xmlFormObject'];
 $formObject    = $displayData['formObject'];
 $ucmTypeId     = $displayData['ucmTypeId'];
-$allowDraftSave= $displayData['ucmTypeParams']->allow_draft_save;
+$allowDraftSave = $displayData['ucmTypeParams']->allow_draft_save;
 
 $appendUrl = '';
 $csrf = "&" . Session::getFormToken() . '=1';
@@ -93,13 +93,16 @@
 }
 
 ?>
+<div class="tjucm-wrapper">
 <tr class="row<?php echo $item->id?>">
 	<?php
 	if (isset($item->state))
 	{
 		$class = ($canChange) ? 'active' : 'disabled'; ?>
 		<td class="center">
-			<a class="<?php echo $class; ?>" href="<?php echo ($canChange) ? 'index.php?option=com_tjucm&task=item.publish&id=' . $item->id . '&state=' . (($item->state + 1) % 2) . $appendUrl . $csrf : '#'; ?>">
+			<a class="<?php echo $class; ?>"
+				href="<?php echo ($canChange) ? 'index.php?option=com_tjucm&task=item.publish&id=' .
+				$item->id . '&state=' . (($item->state + 1) % 2) . $appendUrl . $csrf : '#'; ?>">
 			<?php
 			if ($item->state == 1)
 			{
@@ -116,16 +119,21 @@
 	}
 	?>
 	<td>
-		<a href="<?php echo Route::_('index.php?option=com_tjucm&view=item&id=' . (int) $item->id . "&client=" . $client . '&Itemid=' . $itemId, false); ?>">
+		<a href="<?php echo Route::_(
+		'index.php?option=com_tjucm&view=item&id=' .
+		(int) $item->id . "&client=" . $client . '&Itemid=' . $itemId, false
+		); ?>">
 			<?php echo $this->escape($item->id); ?>
 		</a>
 	</td>
 	<?php
 	if ($allowDraftSave)
-	{ ?>
+	{
+		?>
 		<td><?php echo ($item->draft) ? Text::_('COM_TJUCM_DATA_STATUS_DRAFT') : Text::_('COM_TJUCM_DATA_STATUS_SAVE'); ?></td>
 	<?php
 	}
+
 	if (!empty($item->field_values))
 	{
 		foreach ($item->field_values as $key => $fieldValue)
@@ -147,7 +155,11 @@
 					{
 						$field = $formObject->getField($tjFieldsFieldTable->name);
 						$field->setValue($fieldValue);
-						$layoutToUse = (array_key_exists(ucfirst($tjFieldsFieldTable->type), $fieldLayout)) ? $fieldLayout[ucfirst($tjFieldsFieldTable->type)] : 'field';
+						$layoutToUse = (
+							array_key_exists(
+								ucfirst($tjFieldsFieldTable->type), $fieldLayout
+							)
+						) ? $fieldLayout[ucfirst($tjFieldsFieldTable->type)] : 'field';
 						$layout = new JLayoutFile($layoutToUse, JPATH_ROOT . '/components/com_tjfields/layouts/fields');
 						$output = $layout->render(array('fieldXml' => $fieldXml, 'field' => $field));
 						echo $output;
@@ -156,22 +168,36 @@
 			</td><?php
 		}
 	}
+
 	if ($canEdit || $canDelete || $editown || $deleteOwn)
 	{
 		?>
 		<td class="center">
-			<a target="_blank" href="<?php echo $link; ?>" type="button" title="<?php echo Text::_('COM_TJUCM_VIEW_RECORD');?>"><i class="icon-eye-open"></i></a>
+			<a target="_blank" href="<?php echo $link; ?>"
+				type="button" title="<?php echo Text::_('COM_TJUCM_VIEW_RECORD');?>">
+				<i class="icon-eye-open"></i>
+			</a>
 		<?php
 		if ($canEdit || $editown)
 		{
 			?>
-			<a target="_blank" href="<?php echo 'index.php?option=com_tjucm&task=itemform.edit&id=' . $item->id . $appendUrl; ?>" type="button" title="<?php echo Text::_('COM_TJUCM_EDIT_ITEM');?>"> | <i class="icon-apply" aria-hidden="true"></i></a>
+			<a target="_blank"
+				href="<?php echo 'index.php?option=com_tjucm&task=itemform.edit&id=' . $item->id . $appendUrl; ?>"
+				type="button"
+				title="<?php echo Text::_('COM_TJUCM_EDIT_ITEM');?>"> |
+					<i class="icon-apply" aria-hidden="true"></i>
+			</a>
 			<?php
 		}
+
 		if ($canDelete || $deleteOwn)
 		{
 			?>
-			<a href="<?php echo 'index.php?option=com_tjucm&task=itemform.remove' . '&id=' . $item->id . $appendUrl . $csrf; ?>" class="delete-button" type="button" title="<?php echo Text::_('COM_TJUCM_DELETE_ITEM');?>"> | <i class="icon-delete" aria-hidden="true"></i></a>
+			<a href="<?php echo 'index.php?option=com_tjucm&task=itemform.remove' . '&id=' . $item->id . $appendUrl . $csrf; ?>"
+				class="delete-button" type="button"
+				title="<?php echo Text::_('COM_TJUCM_DELETE_ITEM');?>"> |
+					<i class="icon-delete" aria-hidden="true"></i>
+			</a>
 			<?php
 		}
 		?>
@@ -180,3 +206,4 @@
 	}
 	?>
 </tr>
+</div>
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 ed17e796..9e946804 100644
--- a/src/components/com_tjucm/site/views/items/tmpl/default.php
+++ b/src/components/com_tjucm/site/views/items/tmpl/default.php
@@ -48,19 +48,22 @@
 $fieldsData = array();
 $statusColumnWidth = 0;
 ?>
+<div class="tjucm-wrapper">
 <form action="<?php echo JRoute::_($link . '&Itemid=' . $itemId); ?>" method="post" name="adminForm" id="adminForm">
 <?php
-		if (isset($this->items))
-		{
-			?>
-			<div class="page-header">
-				<h1 class="page-title">
-				<?php echo strtoupper($this->title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?>
-				<h1>
-			</div> <?php
-		}?>
-		<?php echo $this->loadTemplate('filters'); ?>
-	<div class="pull-right">
+	if (isset($this->items))
+	{
+	?>
+		<div class="page-header">
+			<h1 class="page-title">
+			<?php echo  strtoupper($this->title) . " " . JText::_("COM_TJUCM_FORM_LIST"); ?>
+			</h1>
+		</div> <?php
+	}
+
+	echo $this->loadTemplate('filters');
+	?>
+		<div class="pull-right">
 		<?php
 		if ($this->allowedToAdd)
 		{
@@ -90,38 +93,34 @@
 			if (!empty($this->showList))
 			{
 				if (!empty($this->items))
-				{?>
-			<thead>
-				<tr>
-					<?php
-					if (isset($this->items[0]->state))
-					{
+				{
+					?>
+					<thead>
+					<tr>
+						<?php
+						if (isset($this->items[0]->state))
+						{
 						?>
-						<th class="center" width="3%">
+							<th class="center" width="3%">
 							<?php echo JHtml::_('grid.sort', 'JPUBLISHED', 'a.state', $listDirn, $listOrder); ?>
-						</th>
+							</th>
 						<?php
-					}
-					?>
-					<th width="2%">
-						<?php echo JHtml::_('grid.sort', 'COM_TJUCM_ITEMS_ID', 'a.id', $listDirn, $listOrder); ?>
-					</th>
-
-					<?php
-					if (!empty($this->ucmTypeParams->allow_draft_save) && $this->ucmTypeParams->allow_draft_save == 1)
-					{
-						$statusColumnWidth = 2;
-					?>
+						}
+						?>
 						<th width="2%">
 							<?php echo JHtml::_('grid.sort', 'COM_TJUCM_DATA_STATUS', 'a.draft', $listDirn, $listOrder); ?>
 						</th>
 					<?php
-					}
 
-					if (!empty($this->listcolumn))
-					{
-						JTable::addIncludePath(JPATH_ROOT . '/administrator/components/com_tjfields/tables');
-						$tjFieldsFieldTable = JTable::getInstance('field', 'TjfieldsTable');
+						if (!empty($this->ucmTypeParams->allow_draft_save) && $this->ucmTypeParams->allow_draft_save == 1)
+						{
+							$statusColumnWidth = 2;
+						?>
+							<th width="2%">
+								<?php echo JHtml::_('grid.sort', 'COM_TJUCM_DATA_STATUS', 'a.draft', $listDirn, $listOrder); ?>
+							</th>
+						<?php
+						}
 
 						foreach ($this->listcolumn as $fieldId => $col_name)
 						{
@@ -137,12 +136,11 @@
 							}
 							?>
 
-							<th  style="word-break: break-word;" width="<?php echo (85 - $statusColumnWidth)/count($this->listcolumn).'%';?>">
+							<th  style="word-break: break-word;" width="<?php echo (85 - $statusColumnWidth) / count($this->listcolumn) . '%';?>">
 								<?php echo htmlspecialchars($col_name, ENT_COMPAT, 'UTF-8'); ?>
 							</th>
 							<?php
 						}
-					}
 
 					if ($this->canEdit || $this->canDelete)
 					{
@@ -153,18 +151,18 @@
 					<?php
 					}
 					?>
-			</tr>
-		</thead>
-		<?php
-			}
-		}?>
+				</tr>
+			</thead>
+			<?php
+				}
+			}?>
 		<?php
 		if (!empty($this->items))
 		{
 		?>
 		<tfoot>
 			<tr>
-				<td colspan="<?php echo isset($this->items[0]) ? count($this->items[0]->field_values)+3 : 10; ?>">
+				<td colspan="<?php echo isset($this->items[0]) ? count($this->items[0]->field_values) + 3 : 10; ?>">
 					<?php echo $this->pagination->getListFooter(); ?>
 				</td>
 			</tr>
@@ -197,7 +195,18 @@
 				{
 					// Call the JLayout to render the fields in the details view
 					$layout = new JLayoutFile('list.list', JPATH_ROOT . '/components/com_tjucm/');
-					echo $layout->render(array('itemsData' => $item, 'created_by' => $this->created_by, 'client' => $this->client, 'xmlFormObject' => $formXml, 'ucmTypeId' => $this->ucmTypeId, 'ucmTypeParams' => $this->ucmTypeParams, 'fieldsData' => $fieldsData, 'formObject' => $formObject));
+					echo $layout->render(
+						array(
+							'itemsData' => $item,
+							'created_by' => $this->created_by,
+							'client' => $this->client,
+							'xmlFormObject' => $formXml,
+							'ucmTypeId' => $this->ucmTypeId,
+							'ucmTypeParams' => $this->ucmTypeParams,
+							'fieldsData' => $fieldsData,
+							'formObject' => $formObject
+						)
+					);
 				}
 			}
 			else
@@ -223,8 +232,11 @@
 	if ($this->allowedToAdd)
 	{
 		?>
-		<a target="_blank" href="<?php echo JRoute::_('index.php?option=com_tjucm&task=itemform.edit' . $appendUrl, false); ?>" class="btn btn-success btn-small">
-			<i class="icon-plus"></i><?php echo JText::_('COM_TJUCM_ADD_ITEM'); ?>
+		<a target="_blank"
+		href="<?php echo JRoute::_('index.php?option=com_tjucm&task=itemform.edit' . $appendUrl, false); ?>"
+		class="btn btn-success btn-small">
+			<i class="icon-plus"></i>
+			<?php echo JText::_('COM_TJUCM_ADD_ITEM'); ?>
 		</a>
 		<?php
 	}
@@ -235,6 +247,7 @@
 	<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>"/>
 	<?php echo JHtml::_('form.token'); ?>
 </form>
+</div>
 <?php
 if ($this->canDelete)
 {