diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css
index 1320884be..04de1a479 100644
--- a/admin-dev/themes/default/admin.css
+++ b/admin-dev/themes/default/admin.css
@@ -127,7 +127,7 @@ input.button[disabled=disabled]:hover{background-color:#FFF6D3}
 .table tr.small td{height:15px}
 .table tr.last td{border-bottom:none}
 td.col-left {vertical-align:top; padding-right:10px;}
-#step1 td.col-left { width:250px;}
+#tabPane1 td.col-left { width:200px;}
 td.col-left label { display:block; width:100%; text-align:right;}
 .alt_row{background-color:#f8f8f8}
 .path_bar{background-color:#E2EBEE;border:1px solid #999999;font-family:Trebuchet,Arial,Helvetica,sans-serif;font-size:13px;margin-bottom:20px;padding:5px}
@@ -162,7 +162,7 @@ a.module_toggle_all{color: #268CCD;}
 .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;}
 .toolbarBox a.toolbar_btn:hover { background-color:#fff; border:1px inset #ccc; border-radius:3px;}
-.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px;}
+.toolbarBox .toolbar_btn span{ display: block;float: none;height: 32px;margin: 0 auto;width: 32px; /*hacking ie7*/ margin:0 !ie; position:relative !ie;}
 .toolbarBox .process-icon-delete { background-image: url(process-icon-delete.png);}
 .toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);}
 .toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);}
@@ -199,7 +199,7 @@ div.fix-toolbar {border-bottom: 1px solid #E0E0E0;position:fixed;top:0;opacity:0
 #productBox { position:relative; width:100%; float:left;}
 
 /*tab-pane*/
-form#product_form, form#access_form, form#cart_rule_form {   background-color:#ebedf4; border:1px solid #ccced7; min-height:350px; padding: 5px 10px 10px; margin-left:140px;}
+form#product_form, form#access_form, form#cart_rule_form {   background-color:#ebedf4; border:1px solid #ccced7; min-height:400px; padding: 5px 10px 10px; margin-left:140px;}
 form#product_form h4 { font-size:18px; font-weight:normal;}
 .tab-row {}
 .tab-row .tab {background:#EFEFEF;width:100px;}
@@ -214,6 +214,9 @@ form#product_form h4 { font-size:18px; font-weight:normal;}
 .product-tab-content h4.tab { display:none;}
 
 
+#categories-treeview { }
+#product-tab-content-3-Associations .Association td.col-left  { width:200px;}
+
 /*FILTER MODULE*/
 .filter-module { background-color:#ebedf4; border:1px solid #c2c4d9; margin-top:10px; padding:10px; display:block; min-height:25px;}
 .filter-module #filternameForm {float:left; margin-right:30px;}
diff --git a/admin-dev/themes/template/products/associations.tpl b/admin-dev/themes/template/products/associations.tpl
index 8c240b40d..1bdd818b1 100644
--- a/admin-dev/themes/template/products/associations.tpl
+++ b/admin-dev/themes/template/products/associations.tpl
@@ -27,17 +27,24 @@
 <div class="Associations">
 	<h4>{l s='Product price'}</h4>
 	<div class="separation"></div>
-	<label for="id_category_default" class="t">
-	{l s='Default category:'}
-	</label>
-	<div id="no_default_category" style="color: red;font-weight: bold;display: none;">
+		<div id="no_default_category" style="font-weight: bold;display: none;">
 		{l s='Please check a category in order to select the default category.'}
 	</div>
+	<table cellspacing="0" cellpadding="0" border="0">
+	 <tr>
+			<td class="col-left">
+			<label for="id_category_default">{l s='Default category:'}</label>
+			</td>
+			<td class="col-right">
 	<select id="id_category_default" name="id_category_default">
 	{foreach from=$selected_cat item=cat}
 		<option value="{$cat.id_category}" {if $product->id_category_default == $cat.id_category}selected="selected"{/if} >{$cat.name}</option>
 	{/foreach}
 	</select>
+	</td>
+	</tr>
+	</table>
+	<br/>
 	<div id="category_block">{$category_tree}</div>
 	{if $feature_shop_active}
 		{* @todo use asso_shop from Helper *}
@@ -47,6 +54,7 @@
 		</tr>
 	{/if}
 
+<div class="separation"></div>
 	<table>
 		<tr>
 			<td class="col-left"><label>{l s='Accessories:'}<br /><br /><i>{l s='(Do not forget to Save the product afterward)'}</i></label></td>
diff --git a/admin-dev/themes/template/products/informations.tpl b/admin-dev/themes/template/products/informations.tpl
index db3664ef3..b583dd650 100644
--- a/admin-dev/themes/template/products/informations.tpl
+++ b/admin-dev/themes/template/products/informations.tpl
@@ -373,7 +373,7 @@ var textFieldLabel = 0;
 <tr><td colspan="2" style="padding-bottom:5px;"><div class="separation"></div></td></tr>
 <table cellspacing="0" cellpadding="5" border="0">	
 					<tr>
-						<td class="col-left"><label>{l s='Short description:'}<br /><br /><i>({l s='appears in the product lists and on the top of the product page'})</i></label></td>
+						<td class="col-left"><label>{l s='Short description:'}<br /></label><p class="product_description">({l s='appears in the product lists and on the top of the product page'})</p></td>
 						<td style="padding-bottom:5px;">
 								{include file="products/textarea_lang.tpl"
 								languages=$languages
@@ -384,7 +384,7 @@ var textFieldLabel = 0;
 			</td>
 					</tr>
 					<tr>
-						<td class="col-left"><label>{l s='Description:'}<br /><br /><i>({l s='appears in the body of the product page'})</i></label></td>
+						<td class="col-left"><label>{l s='Description:'}<br /></label><p class="product_description">({l s='appears in the body of the product page'})</p></td>
 						<td style="padding-bottom:5px;">
 								{include file="products/textarea_lang.tpl" languages=$languages
 								input_name='description'
diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index a6b42954f..5c2a9d3fe 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -163,13 +163,16 @@ class HelperCore
 		</script>';
 
 		$html .= '
-		<div style="background-color:#F4E6C9; width:99%;padding:5px 0 5px 5px;">
-			<a href="#" id="collapse_all" >'.$trads['Collapse All'].'</a>
-			 - <a href="#" id="expand_all" >'.$trads['Expand All'].'</a>
+		<div class="category-filter">
+			<span><a href="#" id="collapse_all" >'.$trads['Collapse All'].'</a>
+			| </span>
+			<span><a href="#" id="expand_all" >'.$trads['Expand All'].'</a>
 			'.(!$use_radio ? '
-			 - <a href="#" id="check_all" >'.$trads['Check All'].'</a>
-			 - <a href="#" id="uncheck_all" >'.$trads['Uncheck All'].'</a>
-			 ' : '').($use_search ? '<span style="margin-left:20px">'.$trads['search'].' : <form method="post" id="filternameForm"><input type="text" name="search_cat" id="search_cat"></form></span>' : '').'
+			 |</span>
+			 <span> <a href="#" id="check_all" >'.$trads['Check All'].'</a>
+			 |</span>
+			 <span><a href="#" id="uncheck_all" >'.$trads['Uncheck All'].'</a>|</span>
+			 ' : '').($use_search ? '<form method="post" id="filternameForm"><span>'.$trads['search'].' : <input type="text" name="search_cat" id="search_cat"></form></span>' : '').'
 		</div>
 		';
 
diff --git a/css/admin.css b/css/admin.css
index a07d01a2b..6d1fa26da 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1737,6 +1737,15 @@ fieldset .optionsDescription ul li {
     padding:0;
 }
 
+p.product_description {
+font-family:Georgia, Arial, 'sans-serif';
+	font-style:italic;
+    clear: both;
+    text-align: left;
+	color:#7F7F7F;
+	text-align:right;
+}
+
 p.preference_description{
 	font-family:Georgia, Arial, 'sans-serif';
 	font-style:italic;
@@ -1993,6 +2002,18 @@ div#scrollTop a:hover{
 	background-image:url(../img/loader.gif);
 }
 
-#category_block{
-	width:
-}
\ No newline at end of file
+.category-filter {
+	background-color:#dde0e9;
+	padding: 5px 10px;
+	min-height:20px;
+}
+.category-filter span { float:left; line-height: 18px; color:#585A69;}
+.category-filter a {
+	color:#585A69;
+	float:left;
+	line-height:20px;
+	padding:0 5px;
+}
+
+.category-filter #filternameForm { float:left; margin-left:10px; color:#585A69;}
+