diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css
index 0f6b3ace9..e48fd7f32 100644
--- a/admin-dev/themes/default/css/admin.css
+++ b/admin-dev/themes/default/css/admin.css
@@ -92,14 +92,15 @@ 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#maintab1 { margin-left:20px;}
+#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.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}
 #header #menu li.active, #header #menu li:hover{background-position:0 -38px;white-space:nowrap;}
 #header #menu li.active a{}
-#header #menu li:hover, #header #menu li.active {background-color:#49B2FF; }
+#header #menu li:hover, #header #menu li.active {background-color:#49B2FF;}
+#header #menu li.maintab:hover, #header #menu li.active {border-left:1px solid #49B2FF;border-right:1px solid #49B2FF;}
 #header #menu li.active span.title, #header #menu li:hover span.title {color:#fff; text-shadow: -1px -1px 0 #3293D6;}
 #header #menu .withLeftBorder{background:transparent url('../img/separator_subnav.png') no-repeat 0 5px}
 #header #menu .submenu{background:#f8f8f8;clear:both;margin:0;padding:0;border:1px solid #d9d9d9;z-index:9999; box-shadow: 1px 5px 10px #CCCCCC; -moz-box-shadow:1px 5px 10px #CCCCCC; -webkit-box-shadow:1px 5px 10px #CCCCCC;}
@@ -169,7 +170,7 @@ a.module_toggle_all{color: #268CCD;}
 /*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 .pageTitle { margin-left:10px; line-height:48px}
-.toolbarBox .pageTitle h3 {font-size: 2em; font-weight: normal; line-height: 52px; margin: 0; padding: 0;}
+.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;}
 .toolbarBox ul.cc_button li {color: #666666; float: left; height: 48px; list-style: none outside none; padding: 1px 1px 3px 4px; text-align: center;}
 .toolbarBox a.toolbar_btn {   border:1px solid #f8f8f8; min-width:50px; border-width: 1px; font-size:11px;cursor: pointer; display: block; float: left; padding: 3px 5px; white-space: nowrap; text-shadow: 0 1px 0 #ffffff;}
@@ -420,6 +421,4 @@ select#show_modules { font-size:12px;}
 #footer {height:40px; font-size:12px;clear:both;font-size:0.9em;color:#666666}
 #footer .footerLeft { float:left; margin-left:10px;}
 #footer .footerRight {float:right; margin-right:10px;}
-
-
-#footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
+#footer .footer_link, #footer .footer_link:hover { color:#268CCD;}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/header.tpl b/admin-dev/themes/default/template/header.tpl
index 45a1056b0..22e2457bb 100644
--- a/admin-dev/themes/default/template/header.tpl
+++ b/admin-dev/themes/default/template/header.tpl
@@ -141,9 +141,10 @@
 				{/if}
 				</div>
 				<span id="employee_links">
+				<span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
+						<span class="separator"></span>
 						<a class="employee" href="index.php?controller=AdminEmployees&id_employee={$employee->id}&updateemployee&token={getAdminToken tab='AdminEmployees'}"  alt="" /> {l s='My preferences'}</a>
-					<span class="separator"></span><span class="employee_name">{$first_name}&nbsp;{$last_name}</span>
-						<span class="separator"></span><a href="index.php?logout" id="header_logout">
+					<span class="separator"></span><a href="index.php?logout" id="header_logout">
 						<span>{l s='logout'}</span>
 					</a>
 				{if {$base_url}}
diff --git a/admin-dev/themes/default/template/helper/required_fields.tpl b/admin-dev/themes/default/template/helper/required_fields.tpl
index 6c730bc7f..a12bc7178 100644
--- a/admin-dev/themes/default/template/helper/required_fields.tpl
+++ b/admin-dev/themes/default/template/helper/required_fields.tpl
@@ -26,7 +26,7 @@
 
 <br />
 <p>
-	<a href="#" onclick="if ($('.requiredFieldsParameters:visible').length == 0) $('.requiredFieldsParameters').slideDown('slow'); else $('.requiredFieldsParameters').slideUp('slow'); return false;"><img src="../img/admin/duplicate.gif" alt="" /> {l s='Set required fields for this section'}</a>
+	<a class="button" href="#" onclick="if ($('.requiredFieldsParameters:visible').length == 0) $('.requiredFieldsParameters').slideDown('slow'); else $('.requiredFieldsParameters').slideUp('slow'); return false;"><img src="../img/admin/duplicate.gif" alt="" /> {l s='Set required fields for this section'}</a>
 </p>
 <fieldset style="display:none" class="width1 requiredFieldsParameters">
 	<legend>{l s='Required Fields'}</legend>
diff --git a/admin-dev/themes/default/template/manufacturers/view.tpl b/admin-dev/themes/default/template/manufacturers/view.tpl
index e97ec785b..5de42b631 100644
--- a/admin-dev/themes/default/template/manufacturers/view.tpl
+++ b/admin-dev/themes/default/template/manufacturers/view.tpl
@@ -60,7 +60,6 @@
 			</table><br />
 		{/foreach}
 	{/if}
-	<br /><br />
 
 	<h3>{l s='Total products:'} {count($products)}</h3>
 	{foreach $products AS $product}
@@ -70,9 +69,10 @@
 				<a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}" class="button">{l s='Edit'}</a>
 				<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
 			</div>
-			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:80%;margin-left:10%;">
+			<br/><br/>
+			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
 				<tr>
-					<th>{$product->name}</th>
+					<th height="39">{$product->name}</th>
 					{if !empty($product->reference)}<th width="150">{l s='Ref:'} {$product->reference}</th>{/if}
 					{if !empty($product->ean13)}<th width="120">{l s='EAN13:'} {$product->ean13}</th>{/if}
 					{if !empty($product->upc)}<th width="120">{l s='UPC:'} {$product->upc}</th>{/if}
@@ -85,9 +85,9 @@
 				<a href="?tab=AdminProducts&id_product={$product->id}&deleteproduct&token={getAdminToken tab='AdminProducts'}" class="button" onclick="return confirm('{l s='Delete item #'}{$product->id} ?');">{l s='Delete'}</a>
 			</div>
 			<h3><a href="?tab=AdminProducts&id_product={$product->id}&updateproduct&token={getAdminToken tab='AdminProducts'}">{$product->name}</a></h3>
-			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:80%;margin-left:10%;">
+			<table border="0" cellpadding="0" cellspacing="0" class="table" style="width:100%;">
 				<tr>
-					<th>{l s='Attribute name'}</th>
+					<th height="39">{l s='Attribute name'}</th>
 					<th width="80">{l s='Reference'}</th>
 					<th width="80">{l s='EAN13'}</th>
 					<th width="80">{l s='UPC'}</th>
diff --git a/admin-dev/themes/default/template/orders/_new_product.tpl b/admin-dev/themes/default/template/orders/_new_product.tpl
index d43b7f0d0..b3cdadb95 100644
--- a/admin-dev/themes/default/template/orders/_new_product.tpl
+++ b/admin-dev/themes/default/template/orders/_new_product.tpl
@@ -1,6 +1,4 @@
-<<<<<<< .mine
 <tr id="new_product" height="52" style="display:none;background-color:#e9f1f6;">
-=======
 {*
 * 2007-2011 PrestaShop
 *
diff --git a/admin-dev/themes/default/template/orders/view.tpl b/admin-dev/themes/default/template/orders/view.tpl
index e992010cb..667c6db85 100755
--- a/admin-dev/themes/default/template/orders/view.tpl
+++ b/admin-dev/themes/default/template/orders/view.tpl
@@ -514,7 +514,7 @@
 				{/if}
 				<table style="width: 100%;" cellspacing="0" cellpadding="0" class="table" id="orderProducts">
 					<tr>
-						<th align="center" style="width: 7%">&nbsp;</th>
+						<th height="39" align="center" style="width: 7%">&nbsp;</th>
 						<th>{l s='Product'}</th>
 						<th style="width: 15%; text-align: center">{l s='UP'} <sup>*</sup></th>
 						<th style="width: 4%; text-align: center">{l s='Qty'}</th>
diff --git a/css/admin.css b/css/admin.css
index ff7c38512..892e0fbcd 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -511,6 +511,10 @@ select optgroup option {
 	min-height:32px;
 }
 
+#content .warn a {
+	color:#9e6014;
+}
+
 #content .error ol {
 	clear: both;
 	margin-top: 5px;