diff --git a/admin-dev/themes/default/template/controllers/products/images.tpl b/admin-dev/themes/default/template/controllers/products/images.tpl
index dc9458b16..5e55b7e7b 100644
--- a/admin-dev/themes/default/template/controllers/products/images.tpl
+++ b/admin-dev/themes/default/template/controllers/products/images.tpl
@@ -52,6 +52,7 @@
 				{l s='Legend:'}
 			</span>			
 		</label>
+		<div class="col-lg-9">
 		{foreach from=$languages item=language}
 			{if $languages|count > 1}
 			<div class="translatable-field row lang-{$language.id_lang}">
@@ -81,6 +82,7 @@
 			</div>
 			{/if}
 		{/foreach}
+		</div>
 	</div>
 </div>
 
diff --git a/admin-dev/themes/default/template/controllers/products/informations.tpl b/admin-dev/themes/default/template/controllers/products/informations.tpl
index 6bbc59090..dc74df214 100644
--- a/admin-dev/themes/default/template/controllers/products/informations.tpl
+++ b/admin-dev/themes/default/template/controllers/products/informations.tpl
@@ -321,14 +321,12 @@
 			</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>
 
@@ -341,12 +339,10 @@
 			</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>
 
diff --git a/admin-dev/themes/default/template/controllers/products/quantities.tpl b/admin-dev/themes/default/template/controllers/products/quantities.tpl
index c7a0abbde..76ed49351 100644
--- a/admin-dev/themes/default/template/controllers/products/quantities.tpl
+++ b/admin-dev/themes/default/template/controllers/products/quantities.tpl
@@ -44,7 +44,7 @@
 				<div class="alert alert-warning" id="available_quantity_ajax_msg" style="display: none;"></div>
 				<div class="alert alert-danger" id="available_quantity_ajax_error_msg" style="display: none;"></div>
 				<div class="alert alert-success" id="available_quantity_ajax_success_msg" style="display: none;"></div>					
-				<div class="row" {if $product->is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct">
+				<div class="form-group" {if $product->is_virtual || $product->cache_is_pack}style="display:none;"{/if} class="row stockForVirtualProduct">
 					<div class="col-lg-9 col-lg-offset-3">
 						<p class="checkbox">
 							<label for="advanced_stock_management">
@@ -107,7 +107,7 @@
 						<p>{l s='Given the quantities of the products in this pack, the maximum quantity should be:'} {$pack_quantity}</p>
 					</div>	
 				{/if}
-				<div class="row">
+				<div class="form-group">
 					<div class="col-lg-9 col-lg-offset-3">
 						<table class="table">
 							<thead>
@@ -128,7 +128,7 @@
 						</table>
 					</div>
 				</div>
-				<div id="when_out_of_stock" class="row">
+				<div id="when_out_of_stock" class="form-group">
 					<label class="control-label col-lg-3">{l s='When out of stock:'}</label>
 					<div class="col-lg-9">
 						<p class="radio">
@@ -195,12 +195,10 @@
 					</span>
 				</label>
 				<div class="col-lg-9">
-					<div class="row">
-						{include file="controllers/products/input_text_lang.tpl"
-							languages=$languages
-							input_value=$product->available_now
-							input_name='available_now'}
-					</div>
+					{include file="controllers/products/input_text_lang.tpl"
+						languages=$languages
+						input_value=$product->available_now
+						input_name='available_now'}
 				</div>
 			</div>
 			<div class="form-group">
@@ -213,12 +211,10 @@
 					
 				</label>
 				<div class="col-lg-9">
-					<div class="row">
-						{include file="controllers/products/input_text_lang.tpl"
-							languages=$languages
-							input_value=$product->available_later
-							input_name='available_later'}
-					</div>
+					{include file="controllers/products/input_text_lang.tpl"
+						languages=$languages
+						input_value=$product->available_later
+						input_name='available_later'}
 				</div>
 			</div>
 			
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index b8deeb6ba..d274cbec7 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2414,6 +2414,7 @@ class AdminProductsControllerCore extends AdminController
 				if ($this->tabAccess['add'] && $this->display != 'add')
 					$this->page_header_toolbar_btn['duplicate'] = array(
 						'short' => 'Duplicate',
+						'href' => '#',
 						'desc' => $this->l('Duplicate'),
 						'confirm' => 1,
 						'js' => 'if (confirm(\''.$this->l('Also copy images').' ?\')) document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;duplicateproduct\'; else document.location = \''.$this->context->link->getAdminLink('AdminProducts').'&amp;id_product='.(int)$product->id.'&amp;duplicateproduct&amp;noimage=1\';'