diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl
index eb3fad687..672f05597 100644
--- a/admin-dev/themes/template/products/combinations.tpl
+++ b/admin-dev/themes/template/products/combinations.tpl
@@ -1,4 +1,6 @@
-<a href="#" onclick="$('#add_new_combination').slideToggle();return false;"><img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}</a>
+<a href="#" onclick="$('#add_new_combination').slideToggle();return false;">
+	<img src="../img/admin/add.gif" alt="" />{l s='Add a new combination'}
+</a>
 <script type="text/javascript">
 	$(document).ready(function(){
 		$(\'#id_mvt_reason\').change(function(){
@@ -118,8 +120,8 @@
 		<p><input id="virtual_product_file_attribute" name="virtual_product_file_attribute" onchange="uploadFile2();" maxlength="'.$this->maxFileSize.'" type="file"></p>
 		<div id="upload-confirmation2">
 
-<p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$productDownload->getHtmlLink(false, true)}
-		<a id="make_downloadable_product_attribute" onclick="return confirm('.addslashes("{l s='Delete this file' slashes=1}")).')" href="index.php?tab=AdminProducts&id_product={$id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a></p>
+<p id="gethtmlink" style="display: none;">{l s='This is the link'} :&nbsp;{$product->productDownload->getHtmlLink(false, true)}
+		<a id="make_downloadable_product_attribute" onclick="return confirm('.addslashes("{l s='Delete this file' slashes=1}")).')" href="index.php?tab=AdminProducts&id_product={$product->productDownload->id_product}&id_category={$id_category}&token={$token}&deleteVirtualProductAttribute=true" class="red">{l s='Delete this file'}</a></p>
 			
 <a 
 
@@ -286,9 +288,5 @@
 		  </tr>
 		</table>
 		</div>
-
-
-
-
-
+	</div>
 {$content}
diff --git a/admin-dev/themes/template/products/content.tpl b/admin-dev/themes/template/products/content.tpl
index 80e8a85aa..c2cd5d8c2 100644
--- a/admin-dev/themes/template/products/content.tpl
+++ b/admin-dev/themes/template/products/content.tpl
@@ -50,12 +50,22 @@ $(document).ready(function(){
 		currentId = $(".productTabs a.selected").attr('id').substr(5);
 		// id is the wanted producttab id
 		id = $(this).attr('id').substr(5);
-		$(".tab-page").removeClass('selected');
-		$("#product-tab-content-"+currentId).hide();
-		$("#product-tab-content-wait").show();;
-		
+		if ($(this).attr("id") != $(".productTabs a.selected").attr('id'))
+		{
+			$(".tab-page").removeClass('selected');
+			$("#product-tab-content-"+currentId).hide();
+		}
+		else
+		{
+			if (confirm(' {l s='Do you really want to reload the current tab (all modifications will be lost)'}'))
+				$("#product-tab-content-"+currentId).html();
+			else
+				return false;
+		}
 
-		if($("#product-tab-content-"+id).hasClass('not-loaded'))
+		$("#product-tab-content-wait").show();
+		
+		if ($("#product-tab-content-"+id).hasClass('not-loaded') || $(this).hasClass('selected'))
 		{
 			myurl = $(this).attr("href")+"&ajax=1";
 			$.ajax({
@@ -63,6 +73,7 @@ $(document).ready(function(){
 				async : true,
 				success :function(data)
 				{
+					$("#product-tab-content-wait").hide();
 					$("#product-tab-content-"+id).html(data);
 					$("#product-tab-content-"+id).removeClass('not-loaded');
 					$("#product-tab-content-"+id).show();
@@ -212,7 +223,7 @@ $(document).ready(function(){
 <input type="hidden" name="id_product" value="{$id_product}" />
 <input type="hidden" name="tabs" id="tabs" value="0" />
 <div class="tab-pane" id="tabPane1">
-	<div id="product-tab-content-wait" style="display:none" ></div>
+	<div id="product-tab-content-wait" style="display:none" >{l s='loading ...'}</div>
 	{if !$newproduct}
 	{foreach $product_tabs key=numStep item=tab}
 		<div id="product-tab-content-{$tab.id}" class="{if !$tab.selected}not-loaded{/if} product-tab-content" {if !$tab.selected}style="display:none"{/if}>
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index c8dbc4db4..fbf278307 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1527,7 +1527,7 @@ if (false)
 					$product = new Product((int)(Tools::getValue('id_product')));
 					$this->initForm();
 					$this->{'initForm'.$this->action}($product, $languages, $defaultLanguage);
-					$this->context->smarty->assign('product',$product);
+					$this->context->smarty->assign('product', $product);
 				}
 			}
 			else
@@ -1750,7 +1750,8 @@ if (false)
 					'href' => '#todo'.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.$product->id, 'desc' => $this->l('Save'), 
 				);
 			}
-		return parent::initToolbar();
+		parent::initToolbar();
+		$this->context->smarty->assign('toolbar_btn', $this->toolbar_btn);
 	}
 
 	/**
@@ -3476,8 +3477,8 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
 						$combArray[$combinaison['id_product_attribute']]['weight'] = $combinaison['weight'];
 						$combArray[$combinaison['id_product_attribute']]['unit_impact'] = $combinaison['unit_price_impact'];
 						$combArray[$combinaison['id_product_attribute']]['reference'] = $combinaison['reference'];
-                        $combArray[$combinaison['id_product_attribute']]['supplier_reference'] = $combinaison['supplier_reference'];
-                        $combArray[$combinaison['id_product_attribute']]['ean13'] = $combinaison['ean13'];
+						$combArray[$combinaison['id_product_attribute']]['supplier_reference'] = $combinaison['supplier_reference'];
+						$combArray[$combinaison['id_product_attribute']]['ean13'] = $combinaison['ean13'];
 						$combArray[$combinaison['id_product_attribute']]['upc'] = $combinaison['upc'];
 						$combArray[$combinaison['id_product_attribute']]['minimal_quantity'] = $combinaison['minimal_quantity'];
 						$combArray[$combinaison['id_product_attribute']]['available_date'] = strftime($combinaison['available_date']);
@@ -3512,16 +3513,16 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
 						$attrImage = $product_attribute['id_image'] ? new Image($product_attribute['id_image']) : false;
 						$available_date = ($product_attribute['available_date'] != 0) ? date('Y-m-d', strtotime($product_attribute['available_date'])) : '0000-00-00';
 
-						$id_product_download = $productDownload->getIdFromIdAttribute((int) $product->id, (int) $id_product_attribute);
+						$id_product_download = $product->productDownload->getIdFromIdAttribute((int) $product->id, (int) $id_product_attribute);
 						if ($id_product_download)
-							$productDownload = new ProductDownload($id_product_download);
+							$product->productDownload = new ProductDownload($id_product_download);
 
-						$available_date_attribute = substr($productDownload->date_expiration, 0, -9);
+						$available_date_attribute = substr($product->productDownload->date_expiration, 0, -9);
 
 						if ($available_date_attribute == '0000-00-00')
 							$available_date_attribute = '';
 
-						if ($productDownload->is_shareable == 1)
+						if ($product->productDownload->is_shareable == 1)
 							$is_shareable = $this->l('Yes');
 						else
 							$is_shareable = $this->l('No');
@@ -3536,18 +3537,18 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
 							<td class="right">'.$product_attribute['upc'].'</td>
 							<td class="center">'.$product_attribute['quantity'].'</td>';
 
-							if ($id_product_download && !empty($productDownload->display_filename))
+							if ($id_product_download && !empty($product->productDownload->display_filename))
 							{
-								$content .= '<td class="right">'.$productDownload->getHtmlLink(false, true).'</td>
-								<td class="center">'.$productDownload->nb_downloadable.'</td>
-								<td class="center">'.$productDownload->nb_downloadable.'</td>
+								$content .= '<td class="right">'.$product->productDownload->getHtmlLink(false, true).'</td>
+								<td class="center">'.$product->productDownload->nb_downloadable.'</td>
+								<td class="center">'.$product->productDownload->nb_downloadable.'</td>
 								<td class="right">'.$is_shareable.'</td>';
 							}
 
-							$exists_file = realpath(_PS_DOWNLOAD_DIR_).'/'.$productDownload->filename;
+							$exists_file = realpath(_PS_DOWNLOAD_DIR_).'/'.$product->productDownload->filename;
 
-							if ($productDownload->id && file_exists($exists_file))
-								$filename = $productDownload->filename;
+							if ($product->productDownload->id && file_exists($exists_file))
+								$filename = $product->productDownload->filename;
 							else
 								$filename = '';
 							// @todo : a better way to "fillCombinaison" maybe ?
@@ -3556,7 +3557,7 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
 							<img src="../img/admin/edit.gif" alt="'.$this->l('Modify this combination').'"
 							onclick="javascript:fillCombinaison(\''.$product_attribute['wholesale_price'].'\', \''.$product_attribute['price'].'\', \''.$product_attribute['weight'].'\', \''.$product_attribute['unit_impact'].'\', \''.$product_attribute['reference'].'\', \''.$product_attribute['supplier_reference'].'\', \''.$product_attribute['ean13'].'\',
 							\''.$product_attribute['quantity'].'\', \''.($attrImage ? $attrImage->id : 0).'\', Array('.$jsList.'), \''.$id_product_attribute.'\', \''.$product_attribute['default_on'].'\', \''.$product_attribute['ecotax'].'\', \''.$product_attribute['location'].'\', \''.$product_attribute['upc'].'\', \''.$product_attribute['minimal_quantity'].'\', \''.$available_date.'\',
-							\''.$productDownload->display_filename.'\', \''.$filename.'\', \''.$productDownload->nb_downloadable.'\', \''.$available_date_attribute.'\',  \''.$productDownload->nb_days_accessible.'\',  \''.$productDownload->is_shareable.'\'); calcImpactPriceTI();" /></a>&nbsp;
+							\''.$product->productDownload->display_filename.'\', \''.$filename.'\', \''.$product->productDownload->nb_downloadable.'\', \''.$available_date_attribute.'\',  \''.$product->productDownload->nb_days_accessible.'\',  \''.$product->productDownload->is_shareable.'\'); calcImpactPriceTI();" /></a>&nbsp;
 							'.(!$product_attribute['default_on'] ? '<a href="'.self::$currentIndex.'&defaultProductAttribute&id_product_attribute='.$id_product_attribute.'&id_product='.$product->id.'&'.(Tools::isSubmit('id_category') ? 'id_category='.(int)(Tools::getValue('id_category')).'&' : '&').'token='.Tools::getAdminToken('AdminProducts'.(int)(Tab::getIdFromClassName('AdminProducts')).$this->context->employee->id).'">
 							<img src="../img/admin/asterisk.gif" alt="'.$this->l('Make this the default combination').'" title="'.$this->l('Make this combination the default one').'"></a>' : '').'
 							<a href="'.self::$currentIndex.'&deleteProductAttribute&id_product_attribute='.$id_product_attribute.'&id_product='.$product->id.'&'.(Tools::isSubmit('id_category') ? 'id_category='.(int)(Tools::getValue('id_category')).'&' : '&').'token='.Tools::getAdminToken('AdminProducts'.(int)(Tab::getIdFromClassName('AdminProducts')).(int)$this->context->employee->id).'" onclick="return confirm(\''.$this->l('Are you sure?', __CLASS__, true, false).'\');">
@@ -3590,10 +3591,12 @@ $product->supplier_name = Supplier::getNameById($product->id_supplier);
 				}
 				else
 					$content .= '<b>'.$this->l('You must save this product before adding combinations').'.</b>';
-		$this->context->smarty->assign('content', $content);
+		$this->content .= $content;
 		// @todo
 		$smarty->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute')));
-
+		$this->context->smarty->assign('content', $content);
+		$this->context->smarty->assign('product', $product);
+		$this->context->smarty->assign('id_category', $product->id_category_default);
 		$this->content = $this->context->smarty->fetch('products/combinations.tpl');
 	}
 
diff --git a/js/attributesBack.js b/js/attributesBack.js
index 4801178d0..fad1d3ac4 100644
--- a/js/attributesBack.js
+++ b/js/attributesBack.js
@@ -123,9 +123,7 @@ virtual_product_nb_days, is_shareable)
 	$("#make_downloadable_product_attribute").attr('href', link+"&id_product_attribute="+id_product_attribute);
 
 	$("#virtual_product_filename_attribute").val(virtual_product_filename_attribute);
-	console.log(virtual_product_filename_attribute);
-	console.log("ok");
-	console.log($("#virtual_product_filename_attribute").val());
+	$("#add_new_combination").show();
 	
 	
 	/* Reset all combination images */