diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl
index 953da2906..50ccc869b 100644
--- a/admin-dev/themes/default/template/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl
@@ -24,38 +24,34 @@
 *}
 
 {if !$simple_header}
-<script type="text/javascript">
-	$(document).ready(function() {
-		$('table.{$list_id} .filter').keypress(function(event){
-			formSubmit(event, 'submitFilterButton{$list_id}')
-		})
-	});
-</script>
-
-{* Display column names and arrows for ordering (ASC, DESC) *}
-{if $is_order_position}
-	<script type="text/javascript" src="../js/jquery/plugins/jquery.tablednd.js"></script>
 	<script type="text/javascript">
-		var token = '{$token}';
-		var come_from = '{$list_id}';
-		var alternate = {if $order_way == 'DESC'}'1'{else}'0'{/if};
+		$(document).ready(function() {
+			$('table.{$list_id} .filter').keypress(function(event){
+				formSubmit(event, 'submitFilterButton{$list_id}')
+			})
+		});
 	</script>
-	<script type="text/javascript" src="../js/admin-dnd.js"></script>
-{/if}
-<script type="text/javascript">
-	$(function() {
-		if ($("table.{$list_id} .datepicker").length > 0)
-			$("table.{$list_id} .datepicker").datepicker({
-				prevText: '',
-				nextText: '',
-				dateFormat: 'yy-mm-dd'
-			});
-	});
-</script>
-{/if}
 
-{if $show_toolbar}
-	{include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title}
+	{* Display column names and arrows for ordering (ASC, DESC) *}
+	{if $is_order_position}
+		<script type="text/javascript" src="../js/jquery/plugins/jquery.tablednd.js"></script>
+		<script type="text/javascript">
+			var token = '{$token}';
+			var come_from = '{$list_id}';
+			var alternate = {if $order_way == 'DESC'}'1'{else}'0'{/if};
+		</script>
+		<script type="text/javascript" src="../js/admin-dnd.js"></script>
+	{/if}
+	<script type="text/javascript">
+		$(function() {
+			if ($("table.{$list_id} .datepicker").length > 0)
+				$("table.{$list_id} .datepicker").datepicker({
+					prevText: '',
+					nextText: '',
+					dateFormat: 'yy-mm-dd'
+				});
+		});
+	</script>
 {/if}
 
 {if !$simple_header}
@@ -78,6 +74,150 @@
 <form method="post" action="{$action}" class="form-horizontal">
 	{block name="override_form_extra"}{/block}
 	<fieldset class="col-lg-12">
+		<div class="panel-heading">
+			{if is_array($title)}{$title|end}{else}{$title}{/if}
+			<span class="pull-right">
+			{foreach from=$toolbar_btn item=btn key=k}
+				<a id="desc-{$table}-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if}" class="list-tooolbar-btn" {if isset($btn.href)}href="{$btn.href}"{/if} title="{$btn.desc}" {if isset($btn.target) && $btn.target}target="_blank"{/if}{if isset($btn.js) && $btn.js}onclick="{$btn.js}"{/if}>
+					<i class="process-icon-{if isset($btn.imgclass)}{$btn.imgclass}{else}{$k}{/if} {if isset($btn.class)}{$btn.class}{/if}" ></i>
+				</a>
+				{if $k == 'modules-list'}
+				<div class="modal fade" id="modules_list_container">
+					<div class="modal-dialog">
+						<div class="modal-content">
+							<div class="modal-header">
+								<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+								<h3 class="modal-title">{l s='Modules'}</h3>
+							</div>
+							<div class="modal-body">
+								<div id="modules_list_container_tab" style="display:none;"></div>
+								<div id="modules_list_loader"><img src="../img/loader.gif" alt=""/></div>
+							</div>
+						</div>
+					</div>
+				</div>
+				{/if}
+			{/foreach}
+			</span>
+			{if $show_toolbar}
+			<script language="javascript" type="text/javascript">
+			//<![CDATA[
+				var submited = false
+				var modules_list_loaded = false;
+				$(function() {
+					//get reference on save link
+					btn_save = $('i[class~="process-icon-save"]').parent();
+
+					//get reference on form submit button
+					btn_submit = $('#{$table}_form_submit_btn');
+
+					if (btn_save.length > 0 && btn_submit.length > 0)
+					{
+						//get reference on save and stay link
+						btn_save_and_stay = $('i[class~="process-icon-save-and-stay"]').parent();
+
+						//get reference on current save link label
+						lbl_save = $('#desc-{$table}-save div');
+
+						//override save link label with submit button value
+						if (btn_submit.val().length > 0)
+							lbl_save.html(btn_submit.attr("value"));
+
+						if (btn_save_and_stay.length > 0)
+						{
+
+							//get reference on current save link label
+							lbl_save_and_stay = $('#desc-{$table}-save-and-stay div');
+
+							//override save and stay link label with submit button value
+							if (btn_submit.val().length > 0 && lbl_save_and_stay && !lbl_save_and_stay.hasClass('locked'))
+							{
+								lbl_save_and_stay.html(btn_submit.val() + " {l s='and stay'} ");
+							}
+
+						}
+
+						//hide standard submit button
+						btn_submit.hide();
+						//bind enter key press to validate form
+						$('#{$table}_form').keypress(function (e) {
+							if (e.which == 13 && e.target.localName != 'textarea')
+								$('#desc-{$table}-save').click();
+						});
+						//submit the form
+						{block name=formSubmit}
+							btn_save.click(function() {
+								// Avoid double click
+								if (submited)
+									return false;
+								submited = true;
+								
+								//add hidden input to emulate submit button click when posting the form -> field name posted
+								btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'" value="1" />');
+
+								$('#{$table}_form').submit();
+								return false;
+							});
+
+							if (btn_save_and_stay)
+							{
+								btn_save_and_stay.click(function() {
+									//add hidden input to emulate submit button click when posting the form -> field name posted
+									btn_submit.before('<input type="hidden" name="'+btn_submit.attr("name")+'AndStay" value="1" />');
+
+									$('#{$table}_form').submit();
+									return false;
+								});
+							}
+						{/block}
+					}
+					{if isset($tab_modules_open)}
+						if ({$tab_modules_open})
+							openModulesList();
+					{/if}
+				});
+				{if isset($tab_modules_list)}
+				$('.process-icon-modules-list').parent('a').unbind().bind('click', function (){
+					console.log('ok');
+					openModulesList();
+				});
+				
+				function openModulesList()
+				{
+					$('#modules_list_container').modal('show');
+					if (!modules_list_loaded)
+					{
+						$.ajax({
+							type: "POST",
+							url : '{$admin_module_ajax_url}',
+							async: true,
+							data : {
+								ajax : "1",
+								controller : "AdminModules",
+								action : "getTabModulesList",
+								tab_modules_list : '{$tab_modules_list}',
+								back_tab_modules_list : '{$back_tab_modules_list}'
+							},
+							success : function(data)
+							{
+								$('#modules_list_container_tab').html(data).slideDown();
+								$('#modules_list_loader').hide();
+								modules_list_loaded = true;
+							}
+						});
+					}
+					else
+					{
+						$('#modules_list_container_tab').slideDown();
+						$('#modules_list_loader').hide();
+					}
+					return false;
+				}
+				{/if}
+			//]]>
+		</script>
+		{/if}
+		</div>
 		{if $show_filters}
 		<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 		<span class="pull-right">