diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css
index 8d9b6a99d..7ddec4723 100644
--- a/admin-dev/themes/default/css/admin-theme.css
+++ b/admin-dev/themes/default/css/admin-theme.css
@@ -7902,14 +7902,17 @@ hr {
   word-wrap: nowrap;
   font-size: 12px;
   border-bottom: solid 1px #eeeeee; }
-/* line 368, admin-theme.sass */
+/* line 367, admin-theme.sass */
 .table td.center, .table th.center {
   text-align: center; }
-/* line 370, admin-theme.sass */
+/* line 369, admin-theme.sass */
+.table td.pointer {
+  cursor: pointer; }
+/* line 371, admin-theme.sass */
 .table tr td:first-child, .table tr th:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
-/* line 373, admin-theme.sass */
+/* line 374, admin-theme.sass */
 .table tr td:last-child, .table tr th:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px; }
diff --git a/admin-dev/themes/default/css/admin-theme.sass b/admin-dev/themes/default/css/admin-theme.sass
index 65bbc1097..f8a2a5bbe 100755
--- a/admin-dev/themes/default/css/admin-theme.sass
+++ b/admin-dev/themes/default/css/admin-theme.sass
@@ -364,9 +364,10 @@ hr
 		word-wrap: nowrap
 		font-size: 12px
 		border-bottom: solid 1px #eee
-
 	td.center, th.center
 		text-align: center
+	td.pointer
+		cursor: pointer
 	tr td:first-child, tr th:first-child 
 		border-top-left-radius: 3px
 		border-bottom-left-radius: 3px
@@ -374,7 +375,6 @@ hr
 		border-top-right-radius: 3px
 		border-bottom-right-radius: 3px
 
-//filter table
 tr.filter
 	background-color: lighten(#CAE5F4,5%)
 	input[type="text"].filter, input[type="password"].filter, select.filter
diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
index 7b93b8e5a..f9899fce1 100644
--- a/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/list/list_header.tpl
@@ -50,55 +50,52 @@
 {block name=leadin}
 	{if isset($delete_category) && $delete_category}
 		<div class="panel panel-danger">
-			<div class="panel-heading">
+			<p>
 				{if $need_delete_mode}
-					{l s='Do you want to delete the products too?'}
+					{l s='What do you want to do with the products associated with this category?'}
 				{else}
 					{l s='Deleting this category will remove products linked only within this category and no others. Are you sure you want to continue?'}
 				{/if}
-			</div>
+			</p>
 
 			{if $need_delete_mode}
 			<form action="{$REQUEST_URI}" method="post">
 				<div class="radio">
 					<label for="deleteMode_linkanddisable">
-						<input type="radio" name="deleteMode" value="linkanddisable" id="deleteMode_linkanddisable" />
-						{l s='No. I want to link products without other categories -- within the parent category -- and then disable them.'}
+						<input type="radio" name="deleteMode" value="linkanddisable" id="deleteMode_linkanddisable" checked="checked" />
+						{l s='I want to associate the products without other categories with the parent category and then disable them.'} <strong>{l s='(Recommended)'}</strong>
 					</label>
 				</div>
-
 				<div class="radio">
 					<label for="deleteMode_link">
 						<input type="radio" name="deleteMode" value="link" id="deleteMode_link" />
-						{l s='No. I want to link products without other categories and within the parent category.'}
+						{l s='I want to associate the products without other categories with the parent category.'}
 					</label>
 				</div>
-
 				<div class="radio">
 					<label for="deleteMode_delete">
 						<input type="radio" name="deleteMode" value="delete" id="deleteMode_delete" />
-						{l s='Yes. I want to remove products linked only within this category and no others.'}
+						{l s='I want to remove products linked only within this category and no others.'}
 					</label>
 				</div>
-
-				{else}
-					<input type="hidden" name="deleteMode" value="delete" id="deleteMode_delete" />
-				{/if}
-				{foreach $POST as $key => $value}
-					{if $key != 'deleteMode'}
-						{if is_array($value)}
-							{foreach $value as $val}
-								<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
-							{/foreach}
-						{else}
-							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
-						{/if}
+			{else}
+				<input type="hidden" name="deleteMode" value="delete" id="deleteMode_delete" />
+			{/if}
+			{foreach $POST as $key => $value}
+				{if $key != 'deleteMode'}
+					{if is_array($value)}
+						{foreach $value as $val}
+							<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}[]" value="{$val|escape:'htmlall':'UTF-8'}" />
+						{/foreach}
+					{else}
+						<input type="hidden" name="{$key|escape:'htmlall':'UTF-8'}" value="{$value|escape:'htmlall':'UTF-8'}" />
 					{/if}
-				{/foreach}
+				{/if}
+			{/foreach}
 				<hr>
 				<input type="submit" name="cancel" class="btn btn-default" value="{l s='Cancel'}" />
 				<input type="submit" class="btn btn-primary" value="{l s='Validate'}" />
-				</form>
-			</div>
+			</form>
+		</div>
 	{/if}
 {/block}
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index 8a28b506e..c02fd34b4 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -623,7 +623,7 @@ class AdminCategoriesControllerCore extends AdminController
 			if ($this->delete_mode == 'linkanddisable')
 				$this->disable_products = true;
 		}
-		else if ($this->delete_mode != 'delete')
+		elseif ($this->delete_mode != 'delete')
 			$this->errors[] = Tools::displayError('Unknown delete mode:'.' '.$this->deleted);
 		
 	}
@@ -656,22 +656,21 @@ class AdminCategoriesControllerCore extends AdminController
 	
 	public function processDelete()
 	{
-		$category = $this->loadObject();
 		if ($this->tabAccess['delete'] === '1')
 		{
+			$category = $this->loadObject();
 			if ($category->isRootCategoryForAShop())
 				$this->errors[] = Tools::displayError('You cannot remove this category because one of your shops uses it as a root category.');
-			else if (parent::processDelete())
+			elseif (parent::processDelete())
 			{
 				$this->setDeleteMode();
 				$this->processFatherlessProducts((int)$category->id_parent);
 				return true;
 			}
-			else
-				return false;
 		}
 		else
 			$this->errors[] = Tools::displayError('You do not have permission to delete this.');
+		return false;
 	}
 	
 	public function processFatherlessProducts($id_parent)
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 2e7f0a744..1f8a91d36 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -3431,7 +3431,7 @@ class AdminProductsControllerCore extends AdminController
 			))->fetch()
 			.'</div>'
 			.'<div class="form-group">'
-			.'<input type="checkbox" name="require_'.$type.'_'.(int)($id_customization_field).'" id="require_'.$type.'_'.(int)($id_customization_field).'" value="1" '.($required ? 'checked="checked"' : '').' style="float: left; margin: 0 4px"/><label for="require_'.$type.'_'.(int)($id_customization_field).'" style="float: none; font-weight: normal;"> '.$this->l('required').'</label>'
+			.'<input type="checkbox" name="require_'.$type.'_'.(int)($id_customization_field).'" id="require_'.$type.'_'.(int)($id_customization_field).'" value="1" '.($required ? 'checked="checked"' : '').' style="float:left;margin:1px 4px 0 0"/><label for="require_'.$type.'_'.(int)($id_customization_field).'" style="float:none;font-weight:normal"> '.$this->l('Required').'</label>'
 			.'</div>';
 	}