diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index 6af3dd8d4..62e4a133f 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -43,22 +43,29 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 #top_container{margin:0;padding:0}
 
 /*HEADER*/
-#header { background-color: #394049; height:114px; }
-#header #header_infos{ position:relative; margin: 0; padding:0; height:84px; }
-#header #header_shopname {float: left; margin:15px 20px 0 20px;}
-#header #employee_links {float: right; display:block; margin:15px 15px 0 15px; }
-#header #employee_links a{ float:left; color:#BABABA; text-transform:capitalize;}
-#header #employee_links a:hover {color:#fff;}
-#header #employee_links .employee_name { float:left; color:#fff;}
-#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top; display: block;float: left;height: 19px; width: 16px;}
+#header { background-color: #394049; height:90px; }
+#header #header_infos{ position:relative; margin: 0; padding:0; height:60px; }
+#header #header_shopname {float: left; margin:10px 15px 0 10px;}
+#header #employee_box {float: right; display:block;}
+#header #employee_infos {display:block; margin:10px 15px 0 10px;}
+#header #employee_infos a{color:#BABABA; text-transform:capitalize;margin-right: 5px}
+#header #employee_infos a:hover {color:#fff;}
+#header #employee_infos .employee_name { float:left; color:#fff;padding: 0 20px 0 0;}
+#header .separator { background: transparent url('../img/separator.png') no-repeat scroll center top;height: 19px; width: 16px; margin-right: 5px}
+#header ul#employee_links  {list-style: none;display: block;text-align: left;}
+#header ul#employee_links li {display: inline;line-height: 20px;}
+
 #header #header_infos #header_shopname span{display:block; font-size:24px; height:28px; overflow:hidden;margin:0; color:#fff; text-shadow: 0 1px 0 #000000;}
-#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; float:left; padding-left:20px; color:#bababa;}
+#header #header_infos a#header_logout { background: transparent url('../img/logout.png') no-repeat scroll left top; padding-left:15px; color:#bababa;}
 #header #header_infos a#header_logout:hover {color:#fff;}
 #header #header_infos #header_logout a span {color:#bababa}
 #header #header_infos #header_foaccess{ text-decoration:none; color:#bababa;}
 #header #header_infos #header_foaccess a {color:#bababa !important;}
 #header #header_infos a#header_foaccess:hover { color:#fff;}
-#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; margin-left:7%; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
+
+
+
+#header #header_search{ background-color:#fff; border:2px solid #000; float:left; margin-top:15px; position:relative; height:25px; box-shadow: 0 1px 0 #666666; }
 #header #header_search #bo_query{ font: 13px Arial,sans-serif; float:left;background: none repeat scroll 0 0 transparent;  border:none; box-shadow:none;  padding: 5px 0px 5px 4px; width: 160px; }
 #header #header_search #bo_search_type_chzn{ font-size:13px; float:left; margin:0 23px 0 0; padding:0 4px; vertical-align:middle;width:100px;height:27px; border:none;}
 #header #header_search #bo_search_type_chzn.chzn-container-single .chzn-single { box-shadow:none; border-radius:0px; border:none; border-left:1px dotted #ccc;} 
@@ -92,9 +99,8 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 
 /*MENU*/
 #header #menu{ background-color: #f8f8f8; border-bottom:1px solid #e5e5e5; float:left;line-height:normal;margin:0;padding:0;width:100%;}
-#header #menu li.maintab{float:left;height:29px;list-style:none;margin:0 1px 0 0;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
-#header #menu li:first-child { margin-left:15px;}
-#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 6px 4px 0;font-weight:normal;font-size:12px;}
+#header #menu li.maintab{float:left;height:29px;list-style:none;list-style:none;display:block; border-left:1px solid #fff; border-right:1px solid #ccc;}
+#header #menu li.submenu_size .title{cursor:default;color:#000;display:block; padding:8px 3px 4px 0;font-weight:normal;font-size:12px;}
 #header #menu li.submenu_size .title{_display:inline;_padding:6px 5px 4px 0}
 #header #menu li{_height:32px;_padding-top:3px}
 #header #menu img{display:inline;padding:0 3px 0 6px; margin-top:-4px; vertical-align:middle;width:16px;height:16px}
@@ -188,7 +194,7 @@ a.module_toggle_all{color: #268CCD;}
 .multishop_toolbar .chzn-container .chzn-results .shop{padding-left: 30px;background-color: #EAF2FC;}
 
 /*toolbarBox*/
-.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 10px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
+.toolbarBox { background-color: #F8F8F8; border: 1px solid #CCCCCC; margin-bottom:10px; padding: 5px 0; border-radius:3px; -moz-border-radius:3px; -webkit-border-radius:3px;}
 .toolbarBox .pageTitle { margin-left:10px; line-height:48px}
 .toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0; text-shadow:0 1px 0 #fff;}
 .toolbarBox ul.cc_button {float:right;margin:0 5px 0 0;padding:0;}
diff --git a/admin-dev/themes/default/img/logout.png b/admin-dev/themes/default/img/logout.png
index 3c0a16934..977413655 100644
Binary files a/admin-dev/themes/default/img/logout.png and b/admin-dev/themes/default/img/logout.png differ
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 88a10229f..4ec946ed5 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -144,17 +144,19 @@
 					</div>
 				{/if}
 			</div>
-			<div id="employee_links">
-				<span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
-				<span class="separator">&nbsp;</span>
-				<a class="employee" href="index.php?controller=AdminEmployees&amp;id_employee={$employee->id}&amp;updateemployee&amp;token={getAdminToken tab='AdminEmployees'}" alt="">{l s='My preferences'}</a>
-				<span class="separator">&nbsp;</span>
-				<a href="index.php?logout" id="header_logout">{l s='logout'}</a>
-				{if {$base_url}}
-					<span class="separator">&nbsp;</span>
-					<a href="{$base_url}" id="header_foaccess" target="_blank" title="{l s='View my shop'}">{l s='View my shop'}</a>
-				{/if}
+		
+			<div id="employee_box">
+				<div id="employee_infos">
+					<div class="employee_name">{l s='Welcome,'} <strong>{$first_name}&nbsp;{$last_name}</strong></div>
+					<div class="clear"></div>
+					<ul id="employee_links">
+						<li><a href="{$link->getAdminLink('AdminEmployees')|escape:'htmlall':'UTF-8'}&id_employee={$employee->id}&amp;updateemployee">{l s='My preferences'}</a></li>
+						<li class="separator">&nbsp;</li>
+						<li><a id="header_logout" href="index.php?logout">{l s='logout'}</a></li>
+					</ul>
+				</div>
 			</div>
+			
 			<div id="header_search">
 				<form method="post" action="index.php?controller=AdminSearch&amp;token={getAdminToken tab='AdminSearch'}">
 					<input type="text" name="bo_query" id="bo_query" value="{$bo_query}" />
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 9785a3143..437cd1601 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -40,7 +40,7 @@ class AdminImagesControllerCore extends AdminController
 
 		$this->fields_list = array(
 			'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
-			'name' => array('title' => $this->l('Name'), 'width' => 300),
+			'name' => array('title' => $this->l('Name'), 'width' => 'auto'),
 			'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
 			'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
 			'products' => array('title' => $this->l('Products:'), 'width' => 50, 'align' => 'center', 'type' => 'bool', 'callback' => 'printEntityActiveIcon', 'orderby' => false),
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index f0e40a9c9..42c027e72 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -206,7 +206,7 @@ class AdminProductsControllerCore extends AdminController
 		else
 			$this->fields_list['name_category'] = array(
 				'title' => $this->l('Category'),
-				'width' => 230,
+				'width' => 'auto',
 				'filter_key' => 'cl!name',
 			);
 		$this->fields_list['price'] = array(
diff --git a/controllers/admin/AdminSpecificPriceRuleController.php b/controllers/admin/AdminSpecificPriceRuleController.php
index 117a11635..9d1f5864d 100755
--- a/controllers/admin/AdminSpecificPriceRuleController.php
+++ b/controllers/admin/AdminSpecificPriceRuleController.php
@@ -61,7 +61,7 @@ class AdminSpecificPriceRuleControllerCore extends AdminController
 			'name' => array(
 				'title' => $this->l('Name'),
 				'filter_key' => 'a!name',
-				'width' => 200
+				'width' => 'auto'
 			),
 			'shop_name' => array(
 				'title' => $this->l('Shop'),