diff --git a/admin-dev/themes/default/template/controllers/products/associations.tpl b/admin-dev/themes/default/template/controllers/products/associations.tpl
index 6df41da24..44c8eee9f 100644
--- a/admin-dev/themes/default/template/controllers/products/associations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/associations.tpl
@@ -30,8 +30,10 @@
 		{l s='Please select a default category.'}
 	</div>
 	<div class="form-group">
-		{include file="controllers/products/multishop/checkbox.tpl" field="category_box" type="category_box"}
-		<label class="control-label col-lg-3" for="category_block">{l s='Associated categories:'}</label>
+		<label class="control-label col-lg-3" for="category_block">
+			{include file="controllers/products/multishop/checkbox.tpl" field="associated-categories-tree" type="category_box"}
+			{l s='Associated categories:'}
+		</label>
 		<div class="col-lg-9">
 			<div id="category_block">
 				{$category_tree}
@@ -42,8 +44,8 @@
 		</div>
 	</div>
 	<div class="form-group">
-		{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
 		<label class="control-label col-lg-3" for="id_category_default">
+			{include file="controllers/products/multishop/checkbox.tpl" field="id_category_default" type="default"}
 			<span class="label-tooltip" data-toggle="tooltip"
 			title="{l s='The default category is the category displayed by default.'}">
 				{l s='Default category:'}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar.tpl
index befb4815d..7f4fb6877 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_toolbar.tpl
@@ -22,4 +22,4 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-{if isset($actions)}{foreach from=$actions item=action}{$action->render()}{/foreach}{/if}
\ No newline at end of file
+{if isset($actions)}{foreach from=$actions item=action} {$action->render()}{/foreach}{/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index 7d5347611..62f3d5b3e 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -30,7 +30,7 @@
 
 <fieldset>
 	<input type="hidden" name="submitted_tabs[]" value="Informations" />
-	<h3 class="tab">{l s='Info.'}</h3>
+	<h3 class="tab">{l s='Information'}</h3>
 	<div class="alert alert-info">{l s='Product global information'}</div>
 	<script type="text/javascript">
 		{if isset($PS_ALLOW_ACCENTED_CHARS_URL) && $PS_ALLOW_ACCENTED_CHARS_URL}
@@ -177,10 +177,12 @@
 
 	<hr/>
 
-	{* status informations *}
-	{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
-	<div class="row">
-		<label class="control-label col-lg-3">{l s='Status:'}</label>
+	{* status informations *}	
+	<div class="row">		
+		<label class="control-label col-lg-3">
+			{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
+			{l s='Status:'}
+		</label>
 		<div class="input-group col-lg-3">
 			<span class="switch prestashop-switch">
 				<input onclick="toggleDraftWarning(false);showOptions(true);showRedirectProductOptions(false);" type="radio" name="active" id="active_on" value="1" {if $product->active || !$product->isAssociatedToShop()}checked="checked" {/if} />
@@ -196,9 +198,11 @@
 		</div>
 	</div>
 
-	<div class="row redirect_product_options" style="display:none">
-		{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
-		<label class="control-label col-lg-3" for="redirect_type">{l s='Redirect:'}</label>
+	<div class="row redirect_product_options" style="display:none">		
+		<label class="control-label col-lg-3" for="redirect_type">
+			{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
+			{l s='Redirect:'}
+		</label>
 		<div class="col-lg-5">
 			<select name="redirect_type" id="redirect_type">
 				<option value="404" {if $product->redirect_type == '404'} selected="selected" {/if}>{l s='No redirect (404)'}</option>
@@ -217,9 +221,11 @@
 		</div>
 	</div>
 
-	<div class="row redirect_product_options redirect_product_options_product_choise" style="display:none">
-		{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
-		<label class="control-label col-lg-3" for="related_product_autocomplete_input">{l s='Related product:'}</label>
+	<div class="row redirect_product_options redirect_product_options_product_choise" style="display:none">		
+		<label class="control-label col-lg-3" for="related_product_autocomplete_input">
+			{include file="controllers/products/multishop/checkbox.tpl" field="active" type="radio" onclick=""}
+			{l s='Related product:'}
+		</label>
 		<div class="col-lg-7">
 			<input type="hidden" value="" name="id_product_redirected" />
 
@@ -242,9 +248,11 @@
 		</script>
 	</div>
 
-	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
-		<label class="control-label col-lg-3" for="visibility">{l s='Visibility:'}</label>
+	<div class="row">		
+		<label class="control-label col-lg-3" for="visibility">
+			{include file="controllers/products/multishop/checkbox.tpl" field="visibility" type="default"}
+			{l s='Visibility:'}
+		</label>
 		<div class="col-lg-3">
 			<select name="visibility" id="visibility">
 				<option value="both" {if $product->visibility == 'both'}selected="selected"{/if} >{l s='Everywhere'}</option>
@@ -257,15 +265,15 @@
 
 	<div id="product_options" class="row" {if !$product->active}style="display:none"{/if} >
 		<div class="col-lg-12">
-			{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
-			<div class="row multishop_product_checkbox">
-				{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="available_for_order" type="default"}
-				{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="show_price" type="show_price"}
-				{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="online_only" type="default"}
-			</div>
-			{/if}
 			<div class="form-group">
-				<label class="control-label col-lg-3" for="available_for_order">{l s='Options:'}</label>
+				<label class="control-label col-lg-3" for="available_for_order">
+					{if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
+						{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="available_for_order" type="default"}
+						{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="show_price" type="show_price"}
+						{include file="controllers/products/multishop/checkbox.tpl" only_checkbox="true" field="online_only" type="default"}
+					{/if}
+					{l s='Options:'}
+				</label>
 				<div class="col-lg-5">
 					<p class="checkbox">
 						<input type="checkbox" name="available_for_order" id="available_for_order" value="1" {if $product->available_for_order}checked="checked"{/if}  />
@@ -282,9 +290,11 @@
 				</div>
 			</div>
 
-			<div class="form-group">
-				{include file="controllers/products/multishop/checkbox.tpl" field="condition" type="default"}
-				<label class="control-label col-lg-3" for="condition">{l s='Condition:'}</label>
+			<div class="form-group">				
+				<label class="control-label col-lg-3" for="condition">
+					{include file="controllers/products/multishop/checkbox.tpl" field="condition" type="default"}
+					{l s='Condition:'}
+				</label>
 				<div class="col-lg-3">
 					<select name="condition" id="condition">
 						<option value="new" {if $product->condition == 'new'}selected="selected"{/if} >{l s='New'}</option>
@@ -298,44 +308,48 @@
 
 	<hr/>
 
-	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="description_short" type="tinymce" multilang="true"}
+	<div class="form-group">
 		<label class="control-label col-lg-3" for="description_short_{$id_lang}">
+			{include file="controllers/products/multishop/checkbox.tpl" field="description_short" type="tinymce" multilang="true"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Appears in the product list(s), and on the top of the product page.'}">
 				{l s='Short description:'}
 			</span>
 		</label>
 		<div class="col-lg-9">
+			<div class="row">
 			{include
 				file="controllers/products/textarea_lang.tpl"
 				languages=$languages
 				input_name='description_short'
 				input_value=$product->description_short
 				max=$PS_PRODUCT_SHORT_DESC_LIMIT}
+			</div>
 		</div>
 	</div>
 
-	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}
+	<div class="form-group">
 		<label class="control-label col-lg-3" for="description_{$id_lang}">
+			{include file="controllers/products/multishop/checkbox.tpl" field="description" type="tinymce" multilang="true"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Appears in the body of the product page'}">
 				{l s='Description:'}
 			</span>
 		</label>
 		<div class="col-lg-9">
+			<div class="row">
 			{include
 				file="controllers/products/textarea_lang.tpl"
 				languages=$languages input_name='description'
 				input_value=$product->description}
+			</div>
 		</div>
 	</div>
 
 	{if $images}
 	<div class="row">
 		<div class="col-lg-9 col-lg-offset-3">
-			<div class="alert">
+			<div class="alert alert-info">
 				{l s='Do you want an image associated with the product in your description?'}
 				<a class="addImageDescription" href="javascript:void(0);">{l s='Click here'}</a>.
 			</div>
@@ -399,19 +413,21 @@
 	</div>
 	{/if}
 
-	<div class="row">
+	<div class="form-group">
 		<label class="control-label col-lg-3" for="tags_{$id_lang}">
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Tags separated by commas (e.g. dvd, dvd player, hifi)'} - {l s='Forbidden characters:'} !&lt;;&gt;;?=+#&quot;&deg;{}_$%">
 				{l s='Tags:'}
 			</span>
 		</label>
-		<div class="col-lg-8">
+		<div class="col-lg-9">
 			<div class="row">
 				{foreach from=$languages item=language}
-				<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}" style="display: table;">
-					<input type="text" id="tags_{$language.id_lang}" class=" updateCurrentText" name="tags_{$language.id_lang}" value="{$product->getTags($language.id_lang, true)|htmlentitiesUTF8}">
-					<div class="input-group-btn">
+				<div class="translatable-field lang-{$language.id_lang}">
+					<div class="col-lg-9">
+						<input type="text" id="tags_{$language.id_lang}" class=" updateCurrentText" name="tags_{$language.id_lang}" value="{$product->getTags($language.id_lang, true)|htmlentitiesUTF8}" />
+					</div>
+					<div class="col-lg-2">
 						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 							<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">	{$language.iso_code}
 							<span class="caret"></span>
diff --git a/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl b/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl
index 95b5d1319..e2f39b84b 100644
--- a/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl
+++ b/admin-dev/themes/default/template/controllers/products/multishop/check_fields.tpl
@@ -24,8 +24,29 @@
 *}
 
 {if isset($display_multishop_checkboxes) && $display_multishop_checkboxes}
-	<label style="float: none">
-		<input type="checkbox" style="vertical-align: text-bottom" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', this.checked); ProductMultishop.checkAll{$product_tab}()" />
-		{l s='Check/uncheck all. (If you are editing this page for several shops, some fields like "name" or "price" are may be disabled. You will need check these fields in order to edit them)'}
-	</label>
+	<div class="row alert alert-info">
+		<label class="control-label col-lg-3">
+			<i class="icon-sitemap"></i> {l s='Multistore'}
+		</label>
+		<div class="col-lg-9">
+			<div class="row">
+				<div class="col-lg-2">
+					<span class="switch prestashop-switch">
+						<input type="radio" name="multishop_{$product_tab}" id="multishop_{$product_tab}_on" value="1" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', true); ProductMultishop.checkAll{$product_tab}()">
+						<label class="radio" for="multishop_{$product_tab}_on">
+							<i class="icon-check-sign color_success"></i> {l s='Yes'}
+						</label>
+						<input type="radio" name="multishop_{$product_tab}" id="multishop_{$product_tab}_off" value="0" checked="checked" onclick="$('#product-tab-content-{$product_tab} input[name^=\'multishop_check[\']').attr('checked', false); ProductMultishop.checkAll{$product_tab}()">
+						<label class="radio" for="multishop_{$product_tab}_off">
+							<i class="icon-ban-circle color_danger"></i> {l s='No'}
+						</label>
+						<span class="slide-button btn btn-default"></span>
+					</span>
+				</div>
+				<div class="col-lg-7">
+					<p class="form-control-static"><strong>{l s='Check / Uncheck all'}</strong> {l s='(If you are editing this page for several shops, some fields like "name" or "price" are may be disabled. You will need check these fields in order to edit them)'}</p>
+				</div>
+			</div>
+		</div>
+	</div>
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl b/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl
index 9f8d4a320..e32f09bda 100644
--- a/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl
+++ b/admin-dev/themes/default/template/controllers/products/multishop/checkbox.tpl
@@ -39,12 +39,6 @@
 			</div>
 		{/if}
 	{else}
-		{if isset($only_checkbox)}
-			<input type="checkbox" name="multishop_check[{$field}]" value="1" onclick="ProductMultishop.checkField(this.checked, '{$field}', '{$type}')" {if !empty($multishop_check[$field])}checked="checked"{/if} />
-		{else}
-			<div class="multishop_product_checkbox">
-				<input type="checkbox" name="multishop_check[{$field}]" value="1" onclick="ProductMultishop.checkField(this.checked, '{$field}', '{$type}')" {if !empty($multishop_check[$field])}checked="checked"{/if} />
-			</div>
-		{/if}
+		<input type="checkbox" name="multishop_check[{$field}]" value="1" onclick="ProductMultishop.checkField(this.checked, '{$field}', '{$type}')" {if !empty($multishop_check[$field])}checked="checked"{/if} />
 	{/if}
 {/if}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/prices.tpl b/admin-dev/themes/default/template/controllers/products/prices.tpl
index 2a946b9e5..a0355704f 100644
--- a/admin-dev/themes/default/template/controllers/products/prices.tpl
+++ b/admin-dev/themes/default/template/controllers/products/prices.tpl
@@ -112,10 +112,9 @@ $(document).ready(function () {
 	</div>
 
 	{include file="controllers/products/multishop/check_fields.tpl" product_tab="Prices"}
-
-	{include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}
 	<div class="row">
 		<label class="control-label col-lg-3" for="wholesale_price">
+			{include file="controllers/products/multishop/checkbox.tpl" field="wholesale_price" type="default"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Wholesale price'}">
 				{l s='Pre-tax wholesale price:'}
@@ -129,8 +128,8 @@ $(document).ready(function () {
 	</div>
 
 	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}
 		<label class="control-label col-lg-3" for="priceTE">
+			{include file="controllers/products/multishop/checkbox.tpl" field="price" type="price"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='The pre-tax retail price to sell this product'}">
 				{l s='Pre-tax retail price:'}
@@ -143,9 +142,11 @@ $(document).ready(function () {
 		</div>
 	</div>
 
-	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="id_tax_rules_group" type="default"}
-		<label class="control-label col-lg-3" for="id_tax_rules_group">{l s='Tax rule:'}</label>
+	<div class="row">		
+		<label class="control-label col-lg-3" for="id_tax_rules_group">
+			{include file="controllers/products/multishop/checkbox.tpl" field="id_tax_rules_group" type="default"}
+			{l s='Tax rule:'}
+		</label>
 		<div class="col-lg-8">
 			<script type="text/javascript">
 				noTax = {if $tax_exclude_taxe_option}true{else}false{/if};
@@ -193,8 +194,8 @@ $(document).ready(function () {
 	{/if}
 
 	<div class="row" {if !$ps_use_ecotax} style="display:none;"{/if}>
-		{include file="controllers/products/multishop/checkbox.tpl" field="ecot" type="default"}
 		<label class="control-label col-lg-3" for="ecotax">
+			{include file="controllers/products/multishop/checkbox.tpl" field="ecot" type="default"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='already included in price'}">
 				{l s='Eco-tax (tax incl.):'}
@@ -216,8 +217,8 @@ $(document).ready(function () {
 	</div>
 
 	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="unit_price" type="unit_price"}
 		<label class="control-label col-lg-3" for="unit_price">
+			{include file="controllers/products/multishop/checkbox.tpl" field="unit_price" type="unit_price"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='e.g. per lb.'}">
 				{l s='Unit price:'}
@@ -234,7 +235,7 @@ $(document).ready(function () {
 	{if $ps_tax && $country_display_tax_label}
 	<div class="row">
 		<div class="col-lg-9 col-lg-offset-3">
-			<div class="alert">
+			<div class="alert alert-warning">
 				<span>{l s='or'}
 					{$currency->prefix}<span id="unit_price_with_tax">0.00</span>{$currency->suffix}
 					{l s='per'} <span id="unity_second">{$product->unity}</span> {l s='with tax'}
@@ -245,8 +246,10 @@ $(document).ready(function () {
 	{/if}
 
 	<div class="row">
+		<label class="control-label col-lg-3" for="on_sale">
 		{include file="controllers/products/multishop/checkbox.tpl" field="on_sale" type="default"}
-		<div class="col-lg-9 col-lg-offset-3">
+		</label>
+		<div class="col-lg-9">
 			<div class="checkbox">
 				<label class="control-label" for="on_sale" >
 					<input type="checkbox" name="on_sale" id="on_sale" {if $product->on_sale}checked="checked"{/if} value="1" />
@@ -258,7 +261,7 @@ $(document).ready(function () {
 
 	<div class="row">
 		<div class="col-lg-9 col-lg-offset-3">
-			<div class="alert">
+			<div class="alert alert-success">
 				<strong>{l s='Final retail price:'}</strong>
 				<span {if !$country_display_tax_label}style="display:none"{/if} >
 					{$currency->prefix}
@@ -308,8 +311,7 @@ $(document).ready(function () {
 
 	<div id="add_specific_price" class="well" style="display: none;">
 		<div class="col-lg-12">
-
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="{if !$multi_shop}spm_currency_0{else}sp_id_shop{/if}">{l s='For:'}</label>
 				<div class="col-lg-9">
 					<div class="row">
@@ -353,7 +355,7 @@ $(document).ready(function () {
 				</div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="customer">{l s='Customer:'}</label>
 				<div class="col-lg-9">
 					<input type="hidden" name="sp_id_customer" id="id_customer" value="0" />
@@ -364,7 +366,7 @@ $(document).ready(function () {
 			</div>
 
 			{if $combinations|@count != 0}
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="sp_id_product_attribute">{l s='Combination:'}</label>
 				<div class="col-lg-4">
 					<select id="sp_id_product_attribute" name="sp_id_product_attribute">
@@ -377,7 +379,7 @@ $(document).ready(function () {
 			</div>
 			{/if}
 
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="sp_from">{l s='Available from:'}</label>
 				<div class="input-group col-lg-4">
 					<input class="datepicker" type="text" name="sp_from" value="" style="text-align: center" id="sp_from" />
@@ -386,7 +388,7 @@ $(document).ready(function () {
 				</div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="sp_from_quantity">{l s='Starting at'}</label>
 				<div class="input-group col-lg-4">
 					<span class="input-group-addon">{l s='unit'}</span>
@@ -394,7 +396,7 @@ $(document).ready(function () {
 				</div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="sp_price">{l s='Product price'}
 					{if $country_display_tax_label}
 						{l s='(tax excl.):'}
@@ -416,7 +418,7 @@ $(document).ready(function () {
 				</div>
 			</div>
 
-			<div class="row">
+			<div class="form-group">
 				<label class="control-label col-lg-3" for="sp_reduction">{l s='Apply a discount of:'}</label>
 				<div class="col-lg-4">
 					<div class="row">
diff --git a/admin-dev/themes/default/template/controllers/products/seo.tpl b/admin-dev/themes/default/template/controllers/products/seo.tpl
index 2cb91bd99..35a836b51 100644
--- a/admin-dev/themes/default/template/controllers/products/seo.tpl
+++ b/admin-dev/themes/default/template/controllers/products/seo.tpl
@@ -29,8 +29,8 @@
 	{include file="controllers/products/multishop/check_fields.tpl" product_tab="Seo"}
 
 	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="meta_title" type="default" multilang="true"}
 		<label class="control-label col-lg-3" for="meta_title_{$id_lang}">
+			{include file="controllers/products/multishop/checkbox.tpl" field="meta_title" type="default" multilang="true"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Product page title: Leave blank to use the product name'}">
 				{l s='Meta title:'}
@@ -48,9 +48,9 @@
 		</div>
 	</div>
 
-	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="meta_description" type="default" multilang="true"}
+	<div class="row">		
 		<label class="control-label col-lg-3" for="meta_description_{$id_lang}">
+			{include file="controllers/products/multishop/checkbox.tpl" field="meta_description" type="default" multilang="true"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='A single sentence for the HTML header is needed. '}">
 				{l s='Meta description:'}
@@ -69,8 +69,8 @@
 	</div>
 
 	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="meta_keywords" type="default" multilang="true"}
 		<label class="control-label col-lg-3" for="meta_keywords_{$id_lang}">
+			{include file="controllers/products/multishop/checkbox.tpl" field="meta_keywords" type="default" multilang="true"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='Keywords for HTML header, separated by commas.'}">
 				{l s='Meta keywords:'}
@@ -86,29 +86,25 @@
 	</div>
 
 	<div class="row">
-		{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="default" multilang="true"}
 		<label class="control-label col-lg-3" for="link_rewrite_{$id_lang}">
+			{include file="controllers/products/multishop/checkbox.tpl" field="link_rewrite" type="default" multilang="true"}
 			<span class="label-tooltip" data-toggle="tooltip"
 				title="{l s='friendly URL from the product name.'}">
 				{l s='Friendly URL:'}
 			</span>
 
 		</label>
-		<div class="col-lg-9">
+		<div class="col-lg-6">
 			<div class="row">
-				<div class="col-lg-9">
-					<div class="row">
-					{include file="controllers/products/input_text_lang.tpl"
-						languages=$languages
-						input_value=$product->link_rewrite
-						input_name='link_rewrite'}
-					</div>
-				</div>
-				<div class="col-lg-2">
-					<a class="btn btn-default" onmousedown="updateFriendlyURLByName();"><i class="icon-random"></i> {l s='Generate'}</a>
-				</div>
+				{include file="controllers/products/input_text_lang.tpl"
+					languages=$languages
+					input_value=$product->link_rewrite
+					input_name='link_rewrite'}
 			</div>
 		</div>
+		<div class="col-lg-2">
+			<a class="btn btn-default" onmousedown="updateFriendlyURLByName();"><i class="icon-random"></i> {l s='Generate'}</a>
+		</div>
 	</div>
 
 	<div class="row">
diff --git a/js/admin-products.js b/js/admin-products.js
index 60739d768..6c4d174d7 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -1565,7 +1565,14 @@ var ProductMultishop = new function()
 				break;
 
 			case 'category_box' :
-				$('#categories-treeview input[type=checkbox]').attr('disabled', checked);
+				$('#'+id+' input[type=checkbox]').attr('disabled', checked);
+				if (!checked) {
+					$('#check-all-'+id).removeAttr('disabled');
+					$('#uncheck-all-'+id).removeAttr('disabled');
+				} else {
+					$('#check-all-'+id).attr('disabled', 'disabled');
+					$('#uncheck-all-'+id).attr('disabled', 'disabled');
+				}
 				break;
 
 			case 'attribute_weight_impact' :
@@ -1633,7 +1640,7 @@ var ProductMultishop = new function()
 	this.checkAllAssociations = function()
 	{
 		ProductMultishop.checkField($('input[name=\'multishop_check[id_category_default]\']').prop('checked'), 'id_category_default');
-		ProductMultishop.checkField($('input[name=\'multishop_check[id_category_default]\']').prop('checked'), 'categories-treeview', 'category_box');
+		ProductMultishop.checkField($('input[name=\'multishop_check[id_category_default]\']').prop('checked'), 'associated-categories-tree', 'category_box');
 	};
 
 	this.checkAllCustomization = function()