diff --git a/README.md b/README.md
index 2056d59e5..1556f3749 100644
--- a/README.md
+++ b/README.md
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 28th November, 2020
++ *Last Build*: 29th November, 2020
 + *Version*: 2.11.7
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **284181**
++ *Line count*: **284144**
 + *Field count*: **1537**
 + *File count*: **1799**
 + *Folder count*: **304**
diff --git a/admin/README.txt b/admin/README.txt
index 2056d59e5..1556f3749 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -144,11 +144,11 @@ TODO
 + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
 + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
 + *First Build*: 30th April, 2015
-+ *Last Build*: 28th November, 2020
++ *Last Build*: 29th November, 2020
 + *Version*: 2.11.7
 + *Copyright*: Copyright (C) 2015 - 2020 Vast Development Method. All rights reserved.
 + *License*: GNU General Public License version 2 or later; see LICENSE.txt
-+ *Line count*: **284181**
++ *Line count*: **284144**
 + *Field count*: **1537**
 + *File count*: **1799**
 + *Folder count*: **304**
diff --git a/admin/compiler/joomla_3/default.php b/admin/compiler/joomla_3/default.php
index b4b20e500..1e16e1573 100644
--- a/admin/compiler/joomla_3/default.php
+++ b/admin/compiler/joomla_3/default.php
@@ -23,63 +23,5 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_###component###&task=###views###.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', '###view###List', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_###component###&view=###views###'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="###view###List">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_###COMPONENT###_###VIEWS###_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>###VIEWS_FOOTER_SCRIPT###
\ No newline at end of file
+###VIEWS_DEFAULT_BODY######VIEWS_FOOTER_SCRIPT###
diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php
index 1a70d4d6b..35eb9410b 100644
--- a/admin/helpers/compiler/e_Interpretation.php
+++ b/admin/helpers/compiler/e_Interpretation.php
@@ -11934,6 +11934,146 @@ class Interpretation extends Fields
 			? $this->listFieldClass[$nameListCode][$name] : $default;
 	}
 
+	/**
+	 * set the default views body
+	 *
+	 * @param   string  $nameSingleCode
+	 * @param   string  $nameListCode
+	 *
+	 * @return string
+	 */
+	public function setDefaultViewsBody($nameSingleCode, $nameListCode)
+	{
+		// set component name
+		$component = $this->componentCodeName;
+		$Component = ucfirst($component);
+		$COMPONENT = strtoupper($component);
+		// set uppercase view
+		$VIEWS = strtoupper($nameListCode);
+
+		// build the body
+		$body = array();
+		// check if the filter type is sidebar
+		if (isset($this->adminFilterType[$nameListCode])
+			&& $this->adminFilterType[$nameListCode] == 1)
+		{
+			$body[] = "<script type=\"text/javascript\">";
+			$body[] = $this->_t(1) . "Joomla.orderTable = function()";
+			$body[] = $this->_t(1) . "{";
+			$body[] = $this->_t(2)
+				. "table = document.getElementById(\"sortTable\");";
+			$body[] = $this->_t(2)
+				. "direction = document.getElementById(\"directionTable\");";
+			$body[] = $this->_t(2)
+				. "order = table.options[table.selectedIndex].value;";
+			$body[] = $this->_t(2)
+				. "if (order != '<?php echo \$this->listOrder; ?>')";
+			$body[] = $this->_t(2) . "{";
+			$body[] = $this->_t(3) . "dirn = 'asc';";
+			$body[] = $this->_t(2) . "}";
+			$body[] = $this->_t(2) . "else";
+			$body[] = $this->_t(2) . "{";
+			$body[] = $this->_t(3)
+				. "dirn = direction.options[direction.selectedIndex].value;";
+			$body[] = $this->_t(2) . "}";
+			$body[] = $this->_t(2) . "Joomla.tableOrdering(order, dirn, '');";
+			$body[] = $this->_t(1) . "}";
+			$body[] = "</script>";
+		}
+		$body[] = "<form action=\"<?php echo JRoute::_('index.php?option=com_"
+			. $component . "&view=" . $nameListCode
+			. "'); ?>\" method=\"post\" name=\"adminForm\" id=\"adminForm\">";
+		$body[] = "<?php if(!empty( \$this->sidebar)): ?>";
+		$body[] = $this->_t(1)
+			. "<div id=\"j-sidebar-container\" class=\"span2\">";
+		$body[] = $this->_t(2) . "<?php echo \$this->sidebar; ?>";
+		$body[] = $this->_t(1) . "</div>";
+		$body[] = $this->_t(1)
+			. "<div id=\"j-main-container\" class=\"span10\">";
+		$body[] = "<?php else : ?>";
+		$body[] = $this->_t(1) . "<div id=\"j-main-container\">";
+		$body[] = "<?php endif; ?>";
+		// check if the filter type is sidebar
+		if (isset($this->adminFilterType[$nameListCode])
+			&& $this->adminFilterType[$nameListCode] == 2)
+		{
+			$body[] = "<?php";
+			$body[] = $this->_t(1) . "//" . $this->setLine(
+					__LINE__
+				) . " Add the searchtools";
+			$body[] = $this->_t(1)
+				. "echo JLayoutHelper::render('joomla.searchtools.default', array('view' => \$this));";
+			$body[] = "?>";
+		}
+		$body[] = "<?php if (empty(\$this->items)): ?>";
+		// check if the filter type is sidebar
+		if (isset($this->adminFilterType[$nameListCode])
+			&& $this->adminFilterType[$nameListCode] == 1)
+		{
+			$body[] = $this->_t(1)
+				. "<?php echo \$this->loadTemplate('toolbar');?>";
+		}
+		$body[] = $this->_t(1)
+			. "<div class=\"alert alert-no-items\">";
+		$body[] = $this->_t(2)
+			. "<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>";
+		$body[] = $this->_t(1) . "</div>";
+		$body[] = "<?php else : ?>";
+		// check if the filter type is sidebar
+		if (isset($this->adminFilterType[$nameListCode])
+			&& $this->adminFilterType[$nameListCode] == 1)
+		{
+			$body[] = $this->_t(1)
+				. "<?php echo \$this->loadTemplate('toolbar');?>";
+		}
+		$body[] = $this->_t(1) . "<table class=\"table table-striped\" id=\""
+			. $nameSingleCode . "List\">";
+		$body[] = $this->_t(2)
+			. "<thead><?php echo \$this->loadTemplate('head');?></thead>";
+		$body[] = $this->_t(2)
+			. "<tfoot><?php echo \$this->loadTemplate('foot');?></tfoot>";
+		$body[] = $this->_t(2)
+			. "<tbody><?php echo \$this->loadTemplate('body');?></tbody>";
+		$body[] = $this->_t(1) . "</table>";
+		$body[] = $this->_t(1) . "<?php //" . $this->setLine(
+				__LINE__
+			) . " Load the batch processing form. ?>";
+		$body[] = $this->_t(1)
+			. "<?php if (\$this->canCreate && \$this->canEdit) : ?>";
+		$body[] = $this->_t(2) . "<?php echo JHtml::_(";
+		$body[] = $this->_t(3) . "'bootstrap.renderModal',";
+		$body[] = $this->_t(3) . "'collapseModal',";
+		$body[] = $this->_t(3) . "array(";
+		$body[] = $this->_t(4) . "'title' => JText::_('COM_" . $COMPONENT . "_"
+			. $VIEWS
+			. "_BATCH_OPTIONS'),";
+		$body[] = $this->_t(4)
+			. "'footer' => \$this->loadTemplate('batch_footer')";
+		$body[] = $this->_t(3) . "),";
+		$body[] = $this->_t(3) . "\$this->loadTemplate('batch_body')";
+		$body[] = $this->_t(2) . "); ?>";
+		$body[] = $this->_t(1) . "<?php endif; ?>";
+		// check if the filter type is sidebar
+		if (isset($this->adminFilterType[$nameListCode])
+			&& $this->adminFilterType[$nameListCode] == 1)
+		{
+			$body[] = $this->_t(1)
+				. "<input type=\"hidden\" name=\"filter_order\" value=\"<?php echo \$this->listOrder; ?>\" />";
+			$body[] = $this->_t(1)
+				. "<input type=\"hidden\" name=\"filter_order_Dir\" value=\"<?php echo \$this->listDirn; ?>\" />";
+		}
+		$body[] = $this->_t(1)
+			. "<input type=\"hidden\" name=\"boxchecked\" value=\"0\" />";
+		$body[] = $this->_t(1) . "</div>";
+		$body[] = "<?php endif; ?>";
+		$body[] = $this->_t(1)
+			. "<input type=\"hidden\" name=\"task\" value=\"\" />";
+		$body[] = $this->_t(1) . "<?php echo JHtml::_('form.token'); ?>";
+		$body[] = "</form>";
+
+		return implode(PHP_EOL, $body);
+	}
+
 	/**
 	 * set the list body table head
 	 *
diff --git a/admin/helpers/compiler/f_Infusion.php b/admin/helpers/compiler/f_Infusion.php
index 71c2114d4..d3a69a991 100644
--- a/admin/helpers/compiler/f_Infusion.php
+++ b/admin/helpers/compiler/f_Infusion.php
@@ -510,7 +510,7 @@ class Infusion extends Interpretation
 					. 'EDITBODY' . $this->hhh]
 						= $this->setEditBody($view);
 
-					// EDITBODY <<<DYNAMIC>>>
+					// EDITBODYFADEIN <<<DYNAMIC>>>
 					$this->fileContentDynamic[$nameSingleCode][$this->hhh
 					. 'EDITBODYFADEIN' . $this->hhh]
 						= $this->setFadeInEfect($view);
@@ -940,6 +940,14 @@ class Infusion extends Interpretation
 						$nameListCode
 					);
 
+					// VIEWS_DEFAULT_BODY <<<DYNAMIC>>>
+					$this->fileContentDynamic[$nameListCode][$this->hhh
+					. 'VIEWS_DEFAULT_BODY' . $this->hhh]
+						= $this->setDefaultViewsBody(
+						$nameSingleCode,
+						$nameListCode
+					);
+
 					// LISTHEAD <<<DYNAMIC>>>
 					$this->fileContentDynamic[$nameListCode][$this->hhh
 					. 'LISTHEAD' . $this->hhh]
@@ -994,7 +1002,8 @@ class Infusion extends Interpretation
 							'views_footer', $nameSingleCode, '',
 							$scriptNote, true,
 							false, PHP_EOL
-						)) !== false)
+						)) !== false
+						&& ComponentbuilderHelper::checkString($footerScript))
 					{
 						// only minfy if no php is added to the footer script
 						if ($this->minify
diff --git a/admin/sql/install.mysql.utf8.sql b/admin/sql/install.mysql.utf8.sql
index 70fc90ca9..6b2822c2a 100644
--- a/admin/sql/install.mysql.utf8.sql
+++ b/admin/sql/install.mysql.utf8.sql
@@ -1913,7 +1913,7 @@ INSERT INTO `#__componentbuilder_joomla_component` (`id`, `add_license`, `licens
 --
 
 INSERT INTO `#__componentbuilder_admin_view` (`id`, `add_css_view`, `add_css_views`, `add_custom_button`, `add_custom_import`, `add_fadein`, `add_javascript_view_file`, `add_javascript_view_footer`, `add_javascript_views_file`, `add_javascript_views_footer`, `add_php_ajax`, `add_php_allowedit`, `add_php_batchcopy`, `add_php_batchmove`, `add_php_getitem`, `add_php_getitems`, `add_php_getitems_after_all`, `add_php_getlistquery`, `add_php_postsavehook`, `add_php_save`, `add_sql`, `addlinked_views`, `addpermissions`, `addtables`, `addtabs`, `add_php_before_delete`, `add_php_before_publish`, `add_php_document`, `add_php_after_delete`, `add_php_after_publish`, `php_before_delete`, `php_before_publish`, `php_controller`, `php_document`, `php_after_delete`, `php_after_publish`, `ajax_input`, `css_view`, `css_views`, `custom_button`, `description`, `html_import_view`, `icon`, `icon_add`, `icon_category`, `javascript_view_file`, `javascript_view_footer`, `javascript_views_file`, `javascript_views_footer`, `name_list`, `system_name`, `name_single`, `php_ajaxmethod`, `php_allowedit`, `php_batchcopy`, `php_batchmove`, `php_getitem`, `php_getitems`, `php_getitems_after_all`, `php_getlistquery`, `php_import`, `php_import_display`, `php_import_save`, `php_import_setdata`, `php_model`, `php_postsavehook`, `php_save`, `short_description`, `source`, `sql`, `type`, `params`, `published`, `created`, `modified`, `version`, `hits`, `ordering`, `guid`) VALUES
-(109, '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"More\"}}', '', '', '', '', '', '', '', '', '', '', '', '{}', '', '', '{}', '', '', 'images/WoodMannequin-icon.png', 'images/WoodMannequin-icon-plus.png', '', '', '', '', '', 'Looks', 'Look', 'Look', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'The demo view', '', '', 1, '{\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"ASC\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"ASC\"}}},\"privacy\":{\"activate\":\"1\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"682\"}}', 1, '2016-10-18 11:44:46', '2020-05-21 14:39:27', 18, '', 16, 'c1053952-8a84-4398-aef1-41726f7c0043');
+(109, '', '', '', '', 1, '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '{}', '{\"addpermissions0\":{\"action\":\"view.edit\",\"implementation\":3},\"addpermissions1\":{\"action\":\"view.edit.own\",\"implementation\":3},\"addpermissions2\":{\"action\":\"view.edit.state\",\"implementation\":3},\"addpermissions3\":{\"action\":\"view.edit.created_by\",\"implementation\":3},\"addpermissions4\":{\"action\":\"view.edit.created\",\"implementation\":3},\"addpermissions5\":{\"action\":\"view.create\",\"implementation\":3},\"addpermissions6\":{\"action\":\"view.delete\",\"implementation\":3},\"addpermissions7\":{\"action\":\"view.access\",\"implementation\":3}}', '{}', '{\"addtabs0\":{\"name\":\"Details\"},\"addtabs1\":{\"name\":\"More\"}}', '', '', '', '', '', '', '', '', '', '', '', '{}', '', '', '{}', '', '', 'images/WoodMannequin-icon.png', 'images/WoodMannequin-icon-plus.png', '', '', '', '', '', 'Looks', 'Look', 'Look', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'The demo view', '', '', 1, '{\"fieldordering\":{\"add_admin_ordering\":\"0\",\"admin_ordering_fields\":{\"admin_ordering_fields0\":{\"field\":\"\",\"direction\":\"ASC\"}},\"add_linked_ordering\":\"0\",\"linked_ordering_fields\":{\"linked_ordering_fields0\":{\"field\":\"\",\"direction\":\"ASC\"}}},\"privacy\":{\"activate\":\"1\",\"permissions\":\"1\",\"anonymize\":\"0\",\"anonymize_fields\":[],\"user_link\":\"1\",\"custom_link\":\"$query->where($db->quoteName(\'created_by\') . \' = \' . $db->quote($user->id));\",\"other_user_field\":\"682\"}}', 1, '2016-10-18 11:44:46', '2020-05-21 14:39:27', 18, '', 110, 'c1053952-8a84-4398-aef1-41726f7c0043');
 
 
 
diff --git a/admin/views/admin_views/tmpl/default.php b/admin/views/admin_views/tmpl/default.php
index aca5d86a1..ad91b6171 100644
--- a/admin/views/admin_views/tmpl/default.php
+++ b/admin/views/admin_views/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admin_views.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'admin_viewList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admin_views'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="admin_viewList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admin_views'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="admin_viewList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_ADMIN_VIEWS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // admin_views footer script
@@ -102,4 +101,4 @@ jQuery('<div id="loading"></div>')
 jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
 	jQuery('#loading').show();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/admins_custom_tabs/tmpl/default.php b/admin/views/admins_custom_tabs/tmpl/default.php
index fc3753653..8ee23facd 100644
--- a/admin/views/admins_custom_tabs/tmpl/default.php
+++ b/admin/views/admins_custom_tabs/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_custom_tabs.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'admin_custom_tabsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_custom_tabs'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="admin_custom_tabsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_custom_tabs'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="admin_custom_tabsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_CUSTOM_TABS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/admins_fields/tmpl/default.php b/admin/views/admins_fields/tmpl/default.php
index 4a070c198..a90540ce7 100644
--- a/admin/views/admins_fields/tmpl/default.php
+++ b/admin/views/admins_fields/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_fields.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'admin_fieldsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_fields'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="admin_fieldsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_fields'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="admin_fieldsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/admins_fields_conditions/tmpl/default.php b/admin/views/admins_fields_conditions/tmpl/default.php
index d0c534c2f..06fa8b440 100644
--- a/admin/views/admins_fields_conditions/tmpl/default.php
+++ b/admin/views/admins_fields_conditions/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_fields_conditions.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'admin_fields_conditionsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_fields_conditions'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="admin_fields_conditionsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_fields_conditions'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="admin_fields_conditionsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_CONDITIONS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/admins_fields_relations/tmpl/default.php b/admin/views/admins_fields_relations/tmpl/default.php
index 6fbd76ba2..a111494b7 100644
--- a/admin/views/admins_fields_relations/tmpl/default.php
+++ b/admin/views/admins_fields_relations/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=admins_fields_relations.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'admin_fields_relationsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_fields_relations'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="admin_fields_relationsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=admins_fields_relations'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="admin_fields_relationsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_ADMINS_FIELDS_RELATIONS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/class_extendings/tmpl/default.php b/admin/views/class_extendings/tmpl/default.php
index 785b3799d..c63cc84da 100644
--- a/admin/views/class_extendings/tmpl/default.php
+++ b/admin/views/class_extendings/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=class_extendings.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'class_extendsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=class_extendings'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="class_extendsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_CLASS_EXTENDINGS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=class_extendings'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="class_extendsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_CLASS_EXTENDINGS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/class_methods/tmpl/default.php b/admin/views/class_methods/tmpl/default.php
index 3519498ee..d9daa5268 100644
--- a/admin/views/class_methods/tmpl/default.php
+++ b/admin/views/class_methods/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=class_methods.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'class_methodList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=class_methods'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="class_methodList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_CLASS_METHODS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=class_methods'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="class_methodList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_CLASS_METHODS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/class_properties/tmpl/default.php b/admin/views/class_properties/tmpl/default.php
index 987e7d216..8c970d170 100644
--- a/admin/views/class_properties/tmpl/default.php
+++ b/admin/views/class_properties/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=class_properties.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'class_propertyList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=class_properties'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="class_propertyList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=class_properties'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="class_propertyList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_CLASS_PROPERTIES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_admin_views/tmpl/default.php b/admin/views/components_admin_views/tmpl/default.php
index 76f10ee5f..890abcb92 100644
--- a/admin/views/components_admin_views/tmpl/default.php
+++ b/admin/views/components_admin_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_admin_views.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_admin_viewsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_admin_views'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_admin_viewsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_admin_views'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_admin_viewsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_ADMIN_VIEWS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_config/tmpl/default.php b/admin/views/components_config/tmpl/default.php
index e58d0f782..f91110868 100644
--- a/admin/views/components_config/tmpl/default.php
+++ b/admin/views/components_config/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_config.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_configList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_config'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_configList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_CONFIG_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_config'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_configList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_CONFIG_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_custom_admin_menus/tmpl/default.php b/admin/views/components_custom_admin_menus/tmpl/default.php
index 39fb4e4ad..7130c4ae8 100644
--- a/admin/views/components_custom_admin_menus/tmpl/default.php
+++ b/admin/views/components_custom_admin_menus/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_custom_admin_menus.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_custom_admin_menusList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_custom_admin_menus'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_custom_admin_menusList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_custom_admin_menus'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_custom_admin_menusList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_MENUS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_custom_admin_views/tmpl/default.php b/admin/views/components_custom_admin_views/tmpl/default.php
index 16d158c9a..b64c13041 100644
--- a/admin/views/components_custom_admin_views/tmpl/default.php
+++ b/admin/views/components_custom_admin_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_custom_admin_views.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_custom_admin_viewsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_custom_admin_views'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_custom_admin_viewsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_custom_admin_views'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_custom_admin_viewsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_CUSTOM_ADMIN_VIEWS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_dashboard/tmpl/default.php b/admin/views/components_dashboard/tmpl/default.php
index 8ac5c9c3e..988dcd94c 100644
--- a/admin/views/components_dashboard/tmpl/default.php
+++ b/admin/views/components_dashboard/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_dashboard.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_dashboardList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_dashboard'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_dashboardList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_dashboard'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_dashboardList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_DASHBOARD_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_files_folders/tmpl/default.php b/admin/views/components_files_folders/tmpl/default.php
index 88d4d3d13..4b3395800 100644
--- a/admin/views/components_files_folders/tmpl/default.php
+++ b/admin/views/components_files_folders/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_files_folders.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_files_foldersList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_files_folders'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_files_foldersList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_files_folders'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_files_foldersList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_FILES_FOLDERS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_modules/tmpl/default.php b/admin/views/components_modules/tmpl/default.php
index 328bcce4d..24c6e5ead 100644
--- a/admin/views/components_modules/tmpl/default.php
+++ b/admin/views/components_modules/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_modules.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_modulesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_modules'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_modulesList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_MODULES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_modules'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_modulesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_MODULES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_mysql_tweaks/tmpl/default.php b/admin/views/components_mysql_tweaks/tmpl/default.php
index 78593ab7b..d074e9286 100644
--- a/admin/views/components_mysql_tweaks/tmpl/default.php
+++ b/admin/views/components_mysql_tweaks/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_mysql_tweaks.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_mysql_tweaksList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_mysql_tweaks'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_mysql_tweaksList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_mysql_tweaks'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_mysql_tweaksList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_MYSQL_TWEAKS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_placeholders/tmpl/default.php b/admin/views/components_placeholders/tmpl/default.php
index 0d3f05eab..d1f3b1124 100644
--- a/admin/views/components_placeholders/tmpl/default.php
+++ b/admin/views/components_placeholders/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_placeholders.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_placeholdersList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_placeholders'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_placeholdersList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_PLACEHOLDERS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_placeholders'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_placeholdersList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_PLACEHOLDERS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_plugins/tmpl/default.php b/admin/views/components_plugins/tmpl/default.php
index 9e207e653..661842ba8 100644
--- a/admin/views/components_plugins/tmpl/default.php
+++ b/admin/views/components_plugins/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_plugins.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_pluginsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_plugins'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_pluginsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_PLUGINS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_plugins'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_pluginsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_PLUGINS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_site_views/tmpl/default.php b/admin/views/components_site_views/tmpl/default.php
index cd0ce8f54..8a014e839 100644
--- a/admin/views/components_site_views/tmpl/default.php
+++ b/admin/views/components_site_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_site_views.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_site_viewsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_site_views'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_site_viewsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_site_views'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_site_viewsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_SITE_VIEWS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/components_updates/tmpl/default.php b/admin/views/components_updates/tmpl/default.php
index 7a28fa75a..f8095541c 100644
--- a/admin/views/components_updates/tmpl/default.php
+++ b/admin/views/components_updates/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=components_updates.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'component_updatesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_updates'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="component_updatesList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_UPDATES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=components_updates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="component_updatesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_COMPONENTS_UPDATES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/custom_admin_views/tmpl/default.php b/admin/views/custom_admin_views/tmpl/default.php
index 43c6478d4..0f9e68ac6 100644
--- a/admin/views/custom_admin_views/tmpl/default.php
+++ b/admin/views/custom_admin_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=custom_admin_views.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'custom_admin_viewList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=custom_admin_views'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="custom_admin_viewList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=custom_admin_views'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="custom_admin_viewList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_CUSTOM_ADMIN_VIEWS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/custom_codes/tmpl/default.php b/admin/views/custom_codes/tmpl/default.php
index bb4297f27..d592910ba 100644
--- a/admin/views/custom_codes/tmpl/default.php
+++ b/admin/views/custom_codes/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=custom_codes.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'custom_codeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=custom_codes'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="custom_codeList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=custom_codes'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="custom_codeList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_CUSTOM_CODES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // custom_codes footer script
@@ -102,4 +101,4 @@ jQuery('<div id="loading"></div>')
 jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
 	jQuery('#loading').show();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/dynamic_gets/tmpl/default.php b/admin/views/dynamic_gets/tmpl/default.php
index 4db0b247a..a14c7a004 100644
--- a/admin/views/dynamic_gets/tmpl/default.php
+++ b/admin/views/dynamic_gets/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=dynamic_gets.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'dynamic_getList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="dynamic_getList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=dynamic_gets'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="dynamic_getList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_DYNAMIC_GETS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // dynamic_gets footer script
@@ -102,4 +101,4 @@ jQuery('<div id="loading"></div>')
 jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
 	jQuery('#loading').show();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/fields/tmpl/default.php b/admin/views/fields/tmpl/default.php
index 5ab370a84..48137594f 100644
--- a/admin/views/fields/tmpl/default.php
+++ b/admin/views/fields/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=fields.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'fieldList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=fields'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="fieldList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_FIELDS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=fields'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="fieldList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_FIELDS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // fields footer script
@@ -102,4 +101,4 @@ jQuery('<div id="loading"></div>')
 jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
 	jQuery('#loading').show();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/fieldtypes/tmpl/default.php b/admin/views/fieldtypes/tmpl/default.php
index 7d24f1f44..4efe559a8 100644
--- a/admin/views/fieldtypes/tmpl/default.php
+++ b/admin/views/fieldtypes/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=fieldtypes.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'fieldtypeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=fieldtypes'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="fieldtypeList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_FIELDTYPES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=fieldtypes'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="fieldtypeList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_FIELDTYPES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index 8a7e35653..6542eb74d 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=help_documents.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'help_documentList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=help_documents'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="help_documentList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=help_documents'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="help_documentList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_HELP_DOCUMENTS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/joomla_components/tmpl/default.php b/admin/views/joomla_components/tmpl/default.php
index 0a4faf646..35bce31e1 100644
--- a/admin/views/joomla_components/tmpl/default.php
+++ b/admin/views/joomla_components/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_components.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_componentList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_components'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_componentList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_components'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_componentList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_COMPONENTS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // joomla_components footer script
@@ -120,4 +119,4 @@ jQuery('#toolbar').on('click',"button.button-download", function(e){
 jQuery('#toolbar').on('click',"button.button-expand-2", function(e){
 	jQuery('#loading').show();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/joomla_modules/tmpl/default.php b/admin/views/joomla_modules/tmpl/default.php
index 3dff2626a..defbb8705 100644
--- a/admin/views/joomla_modules/tmpl/default.php
+++ b/admin/views/joomla_modules/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_modules.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_moduleList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_moduleList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_moduleList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // joomla_modules footer script
@@ -103,4 +102,4 @@ jQuery('#toolbar').on('click',"button.button-joomla", function(e){
 	jQuery('#loading').show();
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/joomla_modules_files_folders_urls/tmpl/default.php b/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
index 1768b54cd..a2ce66fd3 100644
--- a/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
+++ b/admin/views/joomla_modules_files_folders_urls/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_modules_files_folders_urls.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_module_files_folders_urlsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules_files_folders_urls'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_module_files_folders_urlsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules_files_folders_urls'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_module_files_folders_urlsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_FILES_FOLDERS_URLS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/joomla_modules_updates/tmpl/default.php b/admin/views/joomla_modules_updates/tmpl/default.php
index 03c4ce269..794d943fc 100644
--- a/admin/views/joomla_modules_updates/tmpl/default.php
+++ b/admin/views/joomla_modules_updates/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_modules_updates.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_module_updatesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules_updates'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_module_updatesList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_modules_updates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_module_updatesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_MODULES_UPDATES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/joomla_plugin_groups/tmpl/default.php b/admin/views/joomla_plugin_groups/tmpl/default.php
index 44907dcd6..4e17a1b51 100644
--- a/admin/views/joomla_plugin_groups/tmpl/default.php
+++ b/admin/views/joomla_plugin_groups/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_plugin_groups.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_plugin_groupList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugin_groups'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_plugin_groupList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugin_groups'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_plugin_groupList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGIN_GROUPS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/joomla_plugins/tmpl/default.php b/admin/views/joomla_plugins/tmpl/default.php
index 416c93049..e84f947c2 100644
--- a/admin/views/joomla_plugins/tmpl/default.php
+++ b/admin/views/joomla_plugins/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_plugins.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_pluginList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_pluginList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_pluginList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // joomla_plugins footer script
@@ -103,4 +102,4 @@ jQuery('#toolbar').on('click',"button.button-joomla", function(e){
 	jQuery('#loading').show();
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php b/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
index 451f56a33..821fd6af6 100644
--- a/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
+++ b/admin/views/joomla_plugins_files_folders_urls/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_plugins_files_folders_urls.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_plugin_files_folders_urlsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins_files_folders_urls'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_plugin_files_folders_urlsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins_files_folders_urls'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_plugin_files_folders_urlsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_FILES_FOLDERS_URLS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/joomla_plugins_updates/tmpl/default.php b/admin/views/joomla_plugins_updates/tmpl/default.php
index a409ba854..0ffb6d45b 100644
--- a/admin/views/joomla_plugins_updates/tmpl/default.php
+++ b/admin/views/joomla_plugins_updates/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=joomla_plugins_updates.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'joomla_plugin_updatesList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins_updates'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="joomla_plugin_updatesList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=joomla_plugins_updates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="joomla_plugin_updatesList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_JOOMLA_PLUGINS_UPDATES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/language_translations/tmpl/default.php b/admin/views/language_translations/tmpl/default.php
index 24d1e373c..aea43b3e2 100644
--- a/admin/views/language_translations/tmpl/default.php
+++ b/admin/views/language_translations/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=language_translations.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'language_translationList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=language_translations'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="language_translationList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=language_translations'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="language_translationList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_LANGUAGE_TRANSLATIONS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/languages/tmpl/default.php b/admin/views/languages/tmpl/default.php
index 9ce54ae02..53db95299 100644
--- a/admin/views/languages/tmpl/default.php
+++ b/admin/views/languages/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=languages.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'languageList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="languageList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_LANGUAGES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="languageList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_LANGUAGES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // languages footer script
@@ -103,4 +102,4 @@ jQuery('#toolbar').on('click',"button.button-joomla", function(e){
 	jQuery('#loading').show();
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/layouts/tmpl/default.php b/admin/views/layouts/tmpl/default.php
index 5c0731be9..c445ce46a 100644
--- a/admin/views/layouts/tmpl/default.php
+++ b/admin/views/layouts/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=layouts.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'layoutList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=layouts'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="layoutList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_LAYOUTS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=layouts'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="layoutList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_LAYOUTS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // layouts footer script
@@ -106,4 +105,4 @@ jQuery.fn.selText = function() {
 jQuery("code").click(function() {
 	jQuery(this).selText().addClass("selected");
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/libraries/tmpl/default.php b/admin/views/libraries/tmpl/default.php
index 59fd0692e..cc03fab42 100644
--- a/admin/views/libraries/tmpl/default.php
+++ b/admin/views/libraries/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=libraries.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'libraryList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=libraries'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="libraryList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_LIBRARIES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=libraries'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="libraryList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_LIBRARIES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/libraries_config/tmpl/default.php b/admin/views/libraries_config/tmpl/default.php
index 1e7ccf0c1..2d258228c 100644
--- a/admin/views/libraries_config/tmpl/default.php
+++ b/admin/views/libraries_config/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=libraries_config.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'library_configList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=libraries_config'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="library_configList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_LIBRARIES_CONFIG_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=libraries_config'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="library_configList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_LIBRARIES_CONFIG_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/libraries_files_folders_urls/tmpl/default.php b/admin/views/libraries_files_folders_urls/tmpl/default.php
index 62246cafa..51423a8e0 100644
--- a/admin/views/libraries_files_folders_urls/tmpl/default.php
+++ b/admin/views/libraries_files_folders_urls/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=libraries_files_folders_urls.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'library_files_folders_urlsList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=libraries_files_folders_urls'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="library_files_folders_urlsList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=libraries_files_folders_urls'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="library_files_folders_urlsList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_LIBRARIES_FILES_FOLDERS_URLS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/placeholders/tmpl/default.php b/admin/views/placeholders/tmpl/default.php
index c1bc84448..abb59264e 100644
--- a/admin/views/placeholders/tmpl/default.php
+++ b/admin/views/placeholders/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=placeholders.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'placeholderList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=placeholders'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="placeholderList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_PLACEHOLDERS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=placeholders'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="placeholderList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_PLACEHOLDERS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/servers/tmpl/default.php b/admin/views/servers/tmpl/default.php
index 55dcad013..a2c5b200d 100644
--- a/admin/views/servers/tmpl/default.php
+++ b/admin/views/servers/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=servers.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'serverList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=servers'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="serverList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_SERVERS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=servers'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="serverList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_SERVERS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/site_views/tmpl/default.php b/admin/views/site_views/tmpl/default.php
index a27121596..ec038d586 100644
--- a/admin/views/site_views/tmpl/default.php
+++ b/admin/views/site_views/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=site_views.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'site_viewList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=site_views'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="site_viewList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=site_views'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="site_viewList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_SITE_VIEWS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/snippet_types/tmpl/default.php b/admin/views/snippet_types/tmpl/default.php
index bf1b48e79..c9513a983 100644
--- a/admin/views/snippet_types/tmpl/default.php
+++ b/admin/views/snippet_types/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=snippet_types.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'snippet_typeList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=snippet_types'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="snippet_typeList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=snippet_types'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="snippet_typeList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_SNIPPET_TYPES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/snippets/tmpl/default.php b/admin/views/snippets/tmpl/default.php
index b30c6f15e..b9f0eab8e 100644
--- a/admin/views/snippets/tmpl/default.php
+++ b/admin/views/snippets/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=snippets.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'snippetList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=snippets'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="snippetList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_SNIPPETS_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=snippets'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="snippetList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_SNIPPETS_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/admin/views/templates/tmpl/default.php b/admin/views/templates/tmpl/default.php
index cc1468aae..14db4999a 100644
--- a/admin/views/templates/tmpl/default.php
+++ b/admin/views/templates/tmpl/default.php
@@ -21,65 +21,64 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=templates.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'templateList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="templateList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_TEMPLATES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=templates'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="templateList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_TEMPLATES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
 // templates footer script
@@ -106,4 +105,4 @@ jQuery.fn.selText = function() {
 jQuery("code").click(function() {
 	jQuery(this).selText().addClass("selected");
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/admin/views/validation_rules/tmpl/default.php b/admin/views/validation_rules/tmpl/default.php
index fa704dadc..88825deab 100644
--- a/admin/views/validation_rules/tmpl/default.php
+++ b/admin/views/validation_rules/tmpl/default.php
@@ -21,64 +21,62 @@ if ($this->saveOrder)
 	$saveOrderingUrl = 'index.php?option=com_componentbuilder&task=validation_rules.saveOrderAjax&tmpl=component';
 	JHtml::_('sortablelist.sortable', 'validation_ruleList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
-
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
-<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=validation_rules'); ?>" method="post" name="adminForm" id="adminForm">
-<?php if(!empty( $this->sidebar)): ?>
-	<div id="j-sidebar-container" class="span2">
-		<?php echo $this->sidebar; ?>
-	</div>
-	<div id="j-main-container" class="span10">
-<?php else : ?>
-	<div id="j-main-container">
-<?php endif; ?>
-<?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
-    <div class="alert alert-no-items">
-        <?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
-    </div>
-<?php else : ?>
-		<?php echo $this->loadTemplate('toolbar');?>
-		<table class="table table-striped" id="validation_ruleList">
-			<thead><?php echo $this->loadTemplate('head');?></thead>
-			<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
-			<tbody><?php echo $this->loadTemplate('body');?></tbody>
-		</table>
-		<?php //Load the batch processing form. ?>
-        <?php if ($this->canCreate && $this->canEdit) : ?>
-            <?php echo JHtml::_(
-                'bootstrap.renderModal',
-                'collapseModal',
-                array(
-                    'title' => JText::_('COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_OPTIONS'),
-                    'footer' => $this->loadTemplate('batch_footer')
-                ),
-                $this->loadTemplate('batch_body')
-            ); ?>
-        <?php endif; ?>
-		<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-		<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
-		<input type="hidden" name="boxchecked" value="0" />
-	</div>
-<?php endif; ?>
-<input type="hidden" name="task" value="" />
-<?php echo JHtml::_('form.token'); ?>
-</form>
-<script type="text/javascript"></script>
\ No newline at end of file
+<script type="text/javascript">
+	Joomla.orderTable = function()
+	{
+		table = document.getElementById("sortTable");
+		direction = document.getElementById("directionTable");
+		order = table.options[table.selectedIndex].value;
+		if (order != '<?php echo $this->listOrder; ?>')
+		{
+			dirn = 'asc';
+		}
+		else
+		{
+			dirn = direction.options[direction.selectedIndex].value;
+		}
+		Joomla.tableOrdering(order, dirn, '');
+	}
+</script>
+<form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=validation_rules'); ?>" method="post" name="adminForm" id="adminForm">
+<?php if(!empty( $this->sidebar)): ?>
+	<div id="j-sidebar-container" class="span2">
+		<?php echo $this->sidebar; ?>
+	</div>
+	<div id="j-main-container" class="span10">
+<?php else : ?>
+	<div id="j-main-container">
+<?php endif; ?>
+<?php if (empty($this->items)): ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<div class="alert alert-no-items">
+		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
+	</div>
+<?php else : ?>
+	<?php echo $this->loadTemplate('toolbar');?>
+	<table class="table table-striped" id="validation_ruleList">
+		<thead><?php echo $this->loadTemplate('head');?></thead>
+		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
+		<tbody><?php echo $this->loadTemplate('body');?></tbody>
+	</table>
+	<?php // Load the batch processing form. ?>
+	<?php if ($this->canCreate && $this->canEdit) : ?>
+		<?php echo JHtml::_(
+			'bootstrap.renderModal',
+			'collapseModal',
+			array(
+				'title' => JText::_('COM_COMPONENTBUILDER_VALIDATION_RULES_BATCH_OPTIONS'),
+				'footer' => $this->loadTemplate('batch_footer')
+			),
+			$this->loadTemplate('batch_body')
+		); ?>
+	<?php endif; ?>
+	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
+	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
+	<input type="hidden" name="boxchecked" value="0" />
+	</div>
+<?php endif; ?>
+	<input type="hidden" name="task" value="" />
+	<?php echo JHtml::_('form.token'); ?>
+</form>
diff --git a/componentbuilder.xml b/componentbuilder.xml
index d414be435..b05fb7c96 100644
--- a/componentbuilder.xml
+++ b/componentbuilder.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_COMPONENTBUILDER</name>
-	<creationDate>28th November, 2020</creationDate>
+	<creationDate>29th November, 2020</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
 	<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>