diff --git a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
index c8054a776..c94531454 100644
--- a/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
@@ -34,14 +34,13 @@
 					{if $shared_category}
 						<p class="alert alert-block">{l s='If you delete this picture, it will be deleted in all of your shared shops!'}</p>
 					{/if}
-					<a href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}">
-						<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
+					<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&{if $shared_category}forcedeleteImage=1{else}deleteImage=1{/if}">
+						<i class="icon-trash"></i> {l s='Delete'}
 					</a>
 				</div>
 			{/if}
 		{/if}
 		<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
-		{if !empty($input.hint)}<span class="alert alert-info" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
 	{else}
 		{$smarty.block.parent}
 	{/if}
@@ -63,11 +62,11 @@
 {block name="description"}
 	{$smarty.block.parent}
 	{if ($input.name == 'groupBox')}
-		<p class="alert alert-info" style="display:block; position:relative; display:inline-block;">
+		<p class="alert alert-info">
 			<span>{$input.info_introduction}</span><br />
 			<span>{$input.unidentified}</span><br />
 			<span>{$input.guest}</span><br />
 			<span>{$input.customer}</span><br />
 		</p>
 	{/if}
-{/block}
+{/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl
index c1ff7864b..97d337cd4 100644
--- a/admin-dev/themes/default/template/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form.tpl
@@ -91,7 +91,7 @@
 												{/literal}
 											{/if}
 											<input type="text"
-												name="{$input_name}_{$language.id_lang}"
+												name="{$input.name}_{$language.id_lang}"
 												class="{if $input.type == 'tags'}tagify {/if}{if isset($input.class)}{$input.class}{/if}"
 												id="{if isset($input.id)}{$input.id}_{$language.id_lang}{else}{$input.name}_{$language.id_lang}{/if}"
 												value="{if isset($input.string_format) && $input.string_format}{$value_text|string_format:$input.string_format|escape:'htmlall':'UTF-8'}{else}{$value_text|escape:'htmlall':'UTF-8'}{/if}"
@@ -247,7 +247,7 @@
 													{else}
 														id="{$input.name}_off"
 													{/if}
-													value="$value.value"
+													value="{$value.value}"
 													{if $fields_value[$input.name] == $value.value}checked="checked"{/if}
 													{if isset($input.disabled) && $input.disabled}disabled="disabled"{/if}
 												/>
@@ -270,15 +270,33 @@
 											</span>
 										</div>
 									</div>
+
 								{elseif $input.type == 'textarea'}
 									{if isset($input.lang) AND $input.lang}
-										<div class="translatable">
-											{foreach $languages as $language}
-												<div class="lang_{$language.id_lang}" id="{$input.name}_{$language.id_lang}" style="display:{if $language.id_lang == $defaultFormLanguage}block{else}none{/if};">
-													<textarea cols="{$input.cols}" rows="{$input.rows}" name="{$input.name}_{$language.id_lang}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte {if isset($input.class)}{$input.class}{/if}"{/if} >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
-												</div>
-											{/foreach}
+									{foreach $languages as $language}
+									<div class="row translatable-field lang-{$language.id_lang}"  {if $language.id_lang != $defaultFormLanguage}style="display:none;"{/if}>
+										<div class="col-lg-10">
+											<textarea name="{$input.name}_{$language.id_lang}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte {if isset($input.class)}{$input.class}{/if}"{/if} >{$fields_value[$input.name][$language.id_lang]|escape:'htmlall':'UTF-8'}</textarea>
 										</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>
+											</button>
+											<ul class="dropdown-menu">
+												{foreach from=$languages item=language}
+												<li>
+													<a href="javascript:hideOtherLanguage({$language.id_lang});">
+														<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt=""> {$language.iso_code}
+													</a>
+												</li>
+												{/foreach}
+											</ul>
+										</div>
+									</div>
+									{/foreach}
+
 									{else}
 										<textarea name="{$input.name}" id="{if isset($input.id)}{$input.id}{else}{$input.name}{/if}" cols="{$input.cols}" rows="{$input.rows}" {if isset($input.autoload_rte) && $input.autoload_rte}class="rte autoload_rte {if isset($input.class)}{$input.class}{/if}"{/if}>{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}</textarea>
 									{/if}
@@ -297,29 +315,18 @@
 									{if isset($input.display_image) && $input.display_image}
 										{if isset($fields_value[$input.name].image) && $fields_value[$input.name].image}
 											<div id="image">
-<<<<<<< HEAD
-												{$fields_value.image}
-												<p align="center">{l s='File size'} {$fields_value.size}kb</p>
-
+												{$fields_value[$input.name].image}
+												<p>{l s='File size'} {$fields_value[$input.name].size}kb</p>
 												<a class="btn btn-default" href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
 													<i class="icon-trash"></i> {l s='Delete'}
-=======
-												{$fields_value[$input.name].image}
-												<p align="center">{l s='File size'} {$fields_value[$input.name].size}kb</p>
-												<a href="{$current}&{$identifier}={$form_id}&token={$token}&deleteImage=1">
-													<img src="../img/admin/delete.gif" alt="{l s='Delete'}" /> {l s='Delete'}
->>>>>>> 6ac3f1133ae7547ff92964c47ec141c3ab5bf5c4
 												</a>
-
-											</div><br />
+											</div>
 										{/if}
 									{/if}
 									<input type="file" name="{$input.name}" {if isset($input.id)}id="{$input.id}"{/if} />
-									{if !empty($input.hint)}<span class="alert alert-info" name="help_box">{$input.hint}<span class="hint-pointer">&nbsp;</span></span>{/if}
 								{elseif $input.type == 'password'}
 									<input type="password"
 											name="{$input.name}"
-											size="{$input.size}"
 											class="{if isset($input.class)}{$input.class}{/if}"
 											value=""
 											{if isset($input.autocomplete) && !$input.autocomplete}autocomplete="off"{/if} />
@@ -367,7 +374,6 @@
 										{$asso_shop}
 								{elseif $input.type == 'color'}
 									<input type="color"
-										size="{$input.size}"
 										data-hex="true"
 										{if isset($input.class)}class="{$input.class}"
 										{else}class="color mColorPickerInput"{/if}
@@ -376,7 +382,6 @@
 										value="{$fields_value[$input.name]|escape:'htmlall':'UTF-8'}" />
 								{elseif $input.type == 'date'}
 									<input type="text"
-										size="{$input.size}"
 										data-hex="true"
 										{if isset($input.class)}class="{$input.class}"
 										{else}class="datepicker"{/if}
diff --git a/admin-dev/themes/default/template/helpers/form/form_group.tpl b/admin-dev/themes/default/template/helpers/form/form_group.tpl
index 7fdef6501..bf2e693e2 100644
--- a/admin-dev/themes/default/template/helpers/form/form_group.tpl
+++ b/admin-dev/themes/default/template/helpers/form/form_group.tpl
@@ -24,14 +24,15 @@
 *}
 
 {if count($groups) && isset($groups)}
-<table cellspacing="0" cellpadding="0" class="table" style="width:28em;">
-	<tr>
+<table class="table">
+	<thead>
 		<th>
 			<input type="checkbox" name="checkme" id="checkme" class="noborder" onclick="checkDelBoxes(this.form, 'groupBox[]', this.checked)" />
 		</th>
 		<th>{l s='ID'}</th>
 		<th>{l s='Group name'}</th>
-	</tr>
+	</thead>
+	<tbody>
 	{foreach $groups as $key => $group}
 		<tr {if $key %2}class="alt_row"{/if}>
 			<td>
@@ -42,6 +43,7 @@
 			<td><label for="{$id_checkbox}" class="t">{$group['name']}</label></td>
 		</tr>
 	{/foreach}
+	</tbody>
 </table>
 {else}
 <p>{l s='No group created'}</p>
diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php
index 3ed2faca5..cf2e96e3a 100644
--- a/controllers/admin/AdminCategoriesController.php
+++ b/controllers/admin/AdminCategoriesController.php
@@ -407,8 +407,6 @@ class AdminCategoriesControllerCore extends AdminController
 					'name' => 'description',
 					'autoload_rte' => true,
 					'lang' => true,
-					'rows' => 10,
-					'cols' => 100,
 					'hint' => $this->l('Invalid characters:').' <>;=#{}'
 				),
 				array(
@@ -416,7 +414,7 @@ class AdminCategoriesControllerCore extends AdminController
 					'label' => $this->l('Image:'),
 					'name' => 'image',
 					'display_image' => true,
-					'desc' => $this->l('Upload a category logo from your computer.')
+					'hint' => $this->l('Upload a category logo from your computer.')
 				),
 				array(
 					'type' => 'text',
@@ -437,8 +435,7 @@ class AdminCategoriesControllerCore extends AdminController
 					'label' => $this->l('Meta keywords:'),
 					'name' => 'meta_keywords',
 					'lang' => true,
-					'hint' => $this->l('Forbidden characters:').' <>;=#{}',
-					'desc' => $this->l('To add "tags," click in the field, write something, and then press "Enter."')
+					'hint' => $this->l('To add "tags," click in the field, write something, and then press "Enter."').'&nbsp;'.$this->l('Forbidden characters:').' <>;=#{}'
 				),
 				array(
 					'type' => 'text',
@@ -457,12 +454,12 @@ class AdminCategoriesControllerCore extends AdminController
 					'unidentified' => $unidentified_group_information,
 					'guest' => $guest_group_information,
 					'customer' => $default_group_information,
-					'desc' => $this->l('Mark all of the customer groups you;d like to have access to this category.')
+					'hint' => $this->l('Mark all of the customer groups you;d like to have access to this category.')
 				)
 			),
 			'submit' => array(
 				'title' => $this->l('Save'),
-				'class' => 'button'
+				'class' => 'btn-primary'
 			)
 		);