diff --git a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
index 2364df326..970a6d754 100644
--- a/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/configuration_bar.tpl
@@ -32,7 +32,7 @@
 			</button>
 			<ul class="dropdown-menu">
 				{foreach from=$module_languages item=language}
-				<li><a href="{$tradlink}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
+				<li><a href="{$trad_link}{$language['iso_code']}#{$module_name}">{$language.name}</a></li>
 				{/foreach}
 			</ul>
 		</div>
diff --git a/admin-dev/themes/default/template/controllers/modules/configure.tpl b/admin-dev/themes/default/template/controllers/modules/configure.tpl
index 976108105..fdd8b9c2f 100644
--- a/admin-dev/themes/default/template/controllers/modules/configure.tpl
+++ b/admin-dev/themes/default/template/controllers/modules/configure.tpl
@@ -24,19 +24,37 @@
 *}
 <div class="page-head">
 	<h2 class="page-title">
-		{l s='Configure'} : {$module_name}
+		{l s='Configure'} : {$module_display_name} ({$module_name}}
 	</h2>
 	<div class="page-bar toolbarBox">
 		<div class="btn-toolbar">
 			<ul class="cc_button nav nav-pills pull-right">
 				<li>
-					<a id="desc-module-hook" class="toolbar_btn" href="{$module_hooklink}" title="{l s='Manage hooks'}">
+					<a id="desc-module-hook" class="toolbar_btn" href="{$module_disable_link}" title="{l s='Disable'}">
+						<i class="process-icon-off"></i>
+						<div>{l s='Disable'}</div>
+					</a>
+				</li>
+				<li>
+					<a id="desc-module-hook" class="toolbar_btn" href="{$module_uninstall_link}" title="{l s='Uninstall'}">
+						<i class="process-icon-minus-sign-alt"></i>
+						<div>{l s='Uninstall'}</div>
+					</a>
+				</li>
+				<li>
+					<a id="desc-module-hook" class="toolbar_btn" href="{$module_reset_link}" title="{l s='Reset'}">
+						<i class="process-icon-share-alt"></i>
+						<div>{l s='Reset'}</div>
+					</a>
+				</li>
+				<li>
+					<a id="desc-module-hook" class="toolbar_btn" href="{$module_hook_link}" title="{l s='Manage hooks'}">
 						<i class="process-icon-anchor"></i>
 						<div>{l s='Manage hooks'}</div>
 					</a>
 				</li>
 				<li>
-					<a id="desc-module-back" class="toolbar_btn" href="{$backlink}" title="{l s='Back'}">
+					<a id="desc-module-back" class="toolbar_btn" href="{$back_link}" title="{l s='Back'}">
 						<i class="process-icon-back" ></i>
 						<div>{l s='Back'}</div>
 					</a>
diff --git a/classes/helper/HelperForm.php b/classes/helper/HelperForm.php
index ab97b0893..b3fd1b5d8 100644
--- a/classes/helper/HelperForm.php
+++ b/classes/helper/HelperForm.php
@@ -144,7 +144,7 @@ class HelperFormCore extends Helper
 								$uploader->setFiles(array(
 									0 => array(
 									'type'       => HelperUploader::TYPE_IMAGE,
-									'image'      => isset($params['thumb'])?'<img src="'.$params['thumb'].'" alt="'.$params['title'].'" title="'.$params['title'].'" />':null,
+									'image'      => isset($params['thumb'])?'<img src="'.$params['thumb'].'" alt="'.(isset($params['title']) ? $params['title'] : '').'" title="'.(isset($params['title']) ? $params['title'] : '').'" />':null,
 								)));
 
 							$uploader->setTitle(isset($params['title'])?$params['title']:null);
diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php
index 398ff4a7c..a3d79b831 100644
--- a/controllers/admin/AdminModulesController.php
+++ b/controllers/admin/AdminModulesController.php
@@ -699,15 +699,22 @@ class AdminModulesControllerCore extends AdminController
 							if (isset($module->multishop_context))
 								$this->multishop_context = $module->multishop_context;
 
-							$backlink = self::$currentIndex.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name;
-							$hooklink = 'index.php?tab=AdminModulesPositions&token='.Tools::getAdminTokenLite('AdminModulesPositions').'&show_modules='.(int)$module->id;
-							$tradlink = 'index.php?tab=AdminTranslations&token='.Tools::getAdminTokenLite('AdminTranslations').'&type=modules&lang=';
+							$back_link = self::$currentIndex.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name;
+							$hook_link = 'index.php?tab=AdminModulesPositions&token='.Tools::getAdminTokenLite('AdminModulesPositions').'&show_modules='.(int)$module->id;
+							$trad_link = 'index.php?tab=AdminTranslations&token='.Tools::getAdminTokenLite('AdminTranslations').'&type=modules&lang=';
+							$disable_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&enable=0&tab_module='.$module->tab;
+							$uninstall_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&uninstall='.$module->name.'&tab_module='.$module->tab;
+							$reset_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&reset&tab_module='.$module->tab;
 
 							$this->context->smarty->assign(array(
 								'module_name' => $module->name,
-								'backlink' => $backlink,
-								'module_hooklink' => $hooklink,
-								'tradlink' => $tradlink,
+								'module_display_name' => $module->displayName,
+								'back_link' => $back_link,
+								'module_hook_link' => $hook_link,
+								'module_disable_link' => $disable_link,
+								'module_uninstall_link' => $uninstall_link,
+								'module_reset_link' => $reset_link,
+								'trad_link' => $trad_link,
 								'module_languages' => Language::getLanguages(false),
 								'theme_language_dir' => _THEME_LANG_DIR_
 							));