diff --git a/modules/admin/tpl/js/menu_setup.js b/modules/admin/tpl/js/menu_setup.js
index ee6098396..f85ef04ec 100644
--- a/modules/admin/tpl/js/menu_setup.js
+++ b/modules/admin/tpl/js/menu_setup.js
@@ -4,7 +4,7 @@ jQuery(function($){
 	var editForm = $('#editForm');
 	var listForm = $('#listForm');
 
-	$('button._add').click(function(){
+	$('a._add').click(function(){
 		parentSrl = $(this).parent().prevAll('._parent_key').val();
 		editForm.find('input[name=parent_srl]').val(parentSrl);
 		if(!menuList)
@@ -17,25 +17,29 @@ jQuery(function($){
 
 	function completeGetActList(obj)
 	{
-		menuList = obj.menuList;
-		if(menuList)
+		moduleList = obj.menuList;
+		if(moduleList)
 		{
  			var menuNameList = $('#menuNameList');
-			for(var x in menuList)
+			for(var x in moduleList)
 			{
-				var menu = menuList[x];
-				menuNameList.append('<option value="'+x+'">'+menu.title+'</option>');
+				var menuList = moduleList[x];
+				for(var y in menuList)
+				{
+					var menu = menuList[y];
+					menuNameList.append('<option value="'+x+':'+y+'">'+menu.title+'</option>');
+				}
 			}
 		}
 	}
 
-	$('button._parent_delete').click(function() {
+	$('a._parent_delete').click(function() {
 		var menu_item_srl = $(this).parent().prevAll('._parent_key').val();
 		listForm.find('input[name=menu_item_srl]').val(menu_item_srl);
 		listForm.submit();
 	});
 
-	$('button._child_delete').click(function() {
+	$('a._child_delete').click(function() {
 		var menu_item_srl = $(this).parents('li').prevAll('._child_key').val();
 		listForm.find('input[name=menu_item_srl]').val(menu_item_srl);
 		listForm.submit();
diff --git a/modules/admin/tpl/menu_setup.html b/modules/admin/tpl/menu_setup.html
index e2e761f95..64c0bc3b5 100644
--- a/modules/admin/tpl/menu_setup.html
+++ b/modules/admin/tpl/menu_setup.html
@@ -1,23 +1,27 @@
 <load target="./js/menu_setup.js" />
+<load target="./js/sitemap.js" />
 <div class="content" id="content">
-	<form id="listForm" action="./">
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+	<form id="listForm" action="./" class="siteMap">
 	<input type="hidden" name="act" value="procMenuAdminDeleteItem" />
 	<input type="hidden" name="menu_srl" value="{$menu_srl}" />
 	<input type="hidden" name="menu_item_srl" value="" />
 	<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispAdminMenuSetup')}" />
 		<h1 class="h1">Admin Menu Setup</h1>
-		<div class="portlet siteMap">
+		<div class="portlet">
 			<h2 class="h2"><input value="Admin Menu" disabled /></h2>
 			<ul class="lined">
 				<!--@foreach($gnbUrlList AS $key=>$value)-->
 				<li>
 					<input type="hidden" value="{$key}" class="_parent_key" />
-					<input value="{$value['text']}" /> <span class="side"> <button type="button" class="modalAnchor _add">Add</button> | <button type="button" class="_parent_delete">Delete</button></span>
+					<input value="{$value['text']}" /> <span class="side"> <a href="#editMenu" class="modalAnchor _add">Add</a> | <a href="#delete" class="_parent_delete">Delete</a></span>
 					<!--@if(is_array($value['list']) && count($value['list'])>0)-->
 					<ul>
 						<!--@foreach($value['list'] AS $key2=>$value2)-->
 						<input type="hidden" value="{$key2}" class="_child_key" />
-						<li><input value="{$value2['text']}" /> <span class="side"><button type="button" class="_child_delete">Delete</button></span></li>
+						<li><input value="{$value2['text']}" /> <span class="side"><a href="#delete" class="_child_delete">Delete</a></span></li>
 						<!--@end-->
 					</ul>
 					<!--@end-->
@@ -25,10 +29,6 @@
 				<!--@end-->
 			</ul>
 		</div>
-		<div class="btnArea">
-			<span class="btn medium"><input type="submit" value="Save it" /></span>
-			<span class="btn medium"><button type="button">Add New Site Map...</button></span>
-		</div>
 	</form>
 
 	<div class="modal" id="editMenu">
diff --git a/modules/menu/lang/en.lang.php b/modules/menu/lang/en.lang.php
index 035647036..dcdae4da4 100644
--- a/modules/menu/lang/en.lang.php
+++ b/modules/menu/lang/en.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "Search mid";
 
     $lang->msg_cannot_delete_for_child = 'A menu with child menus cannot be deleted.';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'Please input the title that is easy to verify when connecting to the module.';
     $lang->about_menu_management = "The menu management enables you to organize your menus in the selected layout.\nYou can create menus up to setted depth and can enter information in details by clicking them.\nThe menu will be expanded by clicking the folder image.\nIf the menu is not shown normally, refresh the information by clicking the button \"Re-create cache file\".\n* The menu created over the depth limit may not be shown properly.";
diff --git a/modules/menu/lang/es.lang.php b/modules/menu/lang/es.lang.php
index 033da95e1..b330f39e2 100644
--- a/modules/menu/lang/es.lang.php
+++ b/modules/menu/lang/es.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "Buscar mid";
 
     $lang->msg_cannot_delete_for_child = 'No se puede eliminar un menú si posee un submenú.';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'Ingresar el título que sea fácil de identificar al momento de conectar al módulo.';
     $lang->about_menu_management = "Configuración del menú permite construir el menú del diseño seleccionado.\nUsted puede crear el menú hasta el nivel seleccionado y para la información más detallada debe seleccionar el menú ingresado.\nEl menú será expandido al presionar la imagen del directorio.\nSi el menú no se ve correctamente, renueva la informacion presionado el botón\"Rehacer archivo caché\".\n El menú creado sobre el nivel límite podría no verse apropiadamente.";
diff --git a/modules/menu/lang/fr.lang.php b/modules/menu/lang/fr.lang.php
index a2ec4022f..19234973c 100644
--- a/modules/menu/lang/fr.lang.php
+++ b/modules/menu/lang/fr.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "Rechercher mid";
 
     $lang->msg_cannot_delete_for_child = 'Un menu qui a des menus inférieurs ne peut pas être supprimé.';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'Entrez un titre facile à vérifier quand on le connecte à un module.';
     $lang->about_menu_management = "Administration de Menu vous permet de composer le menu dans la Mise en Page que vous choisissez.\nVous pouvez créer le menu jusqu'au niveau permis et entrer des informations détaillées si vou cliquez le menu.\nMenu sera étendu si vous cliquez l'image de dossier.\nSi le menu n'est pas représenté normalement, rafraîchir les informations en cliquant le bouton \"Recréer \'antémémoire de fichier\".\n* Menu cré qui passe plus que le niveau permis pourra être représenté incorrectement.";
diff --git a/modules/menu/lang/jp.lang.php b/modules/menu/lang/jp.lang.php
index f7bb2326f..c44859248 100644
--- a/modules/menu/lang/jp.lang.php
+++ b/modules/menu/lang/jp.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = 'mid 検索';
 
     $lang->msg_cannot_delete_for_child = '下位メニューが存在するメニューは削除出来ません。';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'モジュールをリンクする際に分かりやすいタイトルを入力して下さい。';
     $lang->about_menu_management = "メニュー管理は、選択されたレイアウトで使用するメニューを構成出来るようにします。<br />一定レベルまでメニューの構成が出来、入力したメニューをクリックすると詳細情報が入力出来ます。<br />フォルダーのイメージをクリックするとメニューを拡張することが出来ます。<br />もしメニューが正常に表示されない場合は、 「キャッシュファイル再生成」ボタンをクリックして情報を更新して下さい。<br />* 一定レベル以上のメニューは正しく表示されない場合があります。";
diff --git a/modules/menu/lang/ko.lang.php b/modules/menu/lang/ko.lang.php
index 3db0d8287..a11ca481a 100644
--- a/modules/menu/lang/ko.lang.php
+++ b/modules/menu/lang/ko.lang.php
@@ -33,6 +33,7 @@
     $lang->cmd_enable_move_menu = '메뉴 옮기기 (선택 후, 위 메뉴를 드래그하세요.)';
     $lang->cmd_search_mid = 'mid 찾기';
     $lang->msg_cannot_delete_for_child = '하부 메뉴가 있는 메뉴는 삭제하실 수 없습니다.';
+    $lang->msg_cannot_delete_for_admin_topmenu = '최상위 메뉴는 삭제할 수 없습니다.';
     $lang->about_title = '모듈에 연결할 때, 쉽게 구분할 수 있는 제목을 입력해주세요.';
     $lang->about_menu_management = "메뉴관리는 선택하신 레이아웃에서 사용하는 메뉴를 구성할 수 있도록 합니다.\n정해진 단계까지 메뉴를 구성 가능하며 입력하신 메뉴를 클릭하시면 상세 정보를 입력할 수 있습니다.\n폴더 그림을 클릭하시면 메뉴를 확장하실 수 있습니다.\n간혹 메뉴가 정상적으로 나타나지 않으면 \"캐시파일 재생성\" 버튼을 눌러서 정보를 갱신하세요.\n* 정해진 단계 이상의 메뉴는 제대로 표시되지 않을 수 있습니다.";
     $lang->about_menu_name = '관리 및 이미지 버튼이 아닐 경우 메뉴 명으로 나타날 제목입니다.';
diff --git a/modules/menu/lang/ru.lang.php b/modules/menu/lang/ru.lang.php
index b86dc879e..07e998537 100644
--- a/modules/menu/lang/ru.lang.php
+++ b/modules/menu/lang/ru.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "Поиск mid";
 
     $lang->msg_cannot_delete_for_child = 'Невозможно удалить меню с дочерними меню';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'Пожалуйста, введите название меню, которое легко проверить при подключению к модулю';
     $lang->about_menu_management = "Управление меню позволяет Вам заключить меню в вабранный лейаут.\nВы можете создать меню до установленной грубины и ввести информацию детально посредством целчка по нему\nМеню будет разкрыто щелчком по изображению папки.\nЕсли меню не отображается нормально, обновите информацию щелчком по кнопке \"Пересоздать файл кеша\".\n* Меню, созданное за пределами лимита глубины может отображаться неверно.";
diff --git a/modules/menu/lang/tr.lang.php b/modules/menu/lang/tr.lang.php
index 10345866e..26ed2384b 100644
--- a/modules/menu/lang/tr.lang.php
+++ b/modules/menu/lang/tr.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "mid Ara";
 
     $lang->msg_cannot_delete_for_child = 'Altmenüleri olan bir menü silinemez.';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'Modüle bağlanacakken, kolayca onaylanacak başlık giriniz.';
     $lang->about_menu_management = "Menü yönetimi size, seçili yerleşim düzeninde menü oluşturma imkani sunar.\nAyarlanmış derinlikte menü oluşturabilir ve menüye tıklayarak detaylı menü bilgisi girebilirsiniz.\nDosya resmine tıklayınca menü genişletilecektir.\nEğer menü normal görüntülenmiyorsa, \"önbellek dosyasını tekrar oluştur\" tuşuna basarak bilgiyi tazeleyiniz.\n* Menü, derinlik limitini geçecek şekilde oluşturulduysa, düzgün gösterilmeyebilir.";
diff --git a/modules/menu/lang/vi.lang.php b/modules/menu/lang/vi.lang.php
index b9443c25c..c0d7f514f 100644
--- a/modules/menu/lang/vi.lang.php
+++ b/modules/menu/lang/vi.lang.php
@@ -39,6 +39,7 @@
     $lang->cmd_search_mid = "Tìm kiếm Module";
 
     $lang->msg_cannot_delete_for_child = 'Không thể xóa Menu khi có những Menu con.';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = 'Xin hãy nhập tiêu đề để dễ dàng xác minh khi kết nối tới Module.';
     $lang->about_menu_management = "Quản lý Menu cho phép bạn bố trí, chọn cách trình bày của Menu.\nBạn có thể tạo những menu và nhập những thông tin khi menu được lựa chọn.\nMenu sẽ đuwọc trải rộng khi bấm và hình thư mục trên Menu.\nNếu Menu không hiển thị một cách bình thường, hãy làm mới thông tin bằng cách bấm \"Tạo File Cache mới\".\n<font color='red'>*</font> Menu được tạo quá giới hạn có thể sẽ không hiển thị được như mong muốn.";
diff --git a/modules/menu/lang/zh-CN.lang.php b/modules/menu/lang/zh-CN.lang.php
index 66c614744..1774a11fb 100644
--- a/modules/menu/lang/zh-CN.lang.php
+++ b/modules/menu/lang/zh-CN.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "查找 mid";
 
     $lang->msg_cannot_delete_for_child = '有下级菜单的菜单不能删除。';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = '请输入连接模块时容易区分的标题。';
     $lang->about_menu_management = "在此创建要在布局中使用的菜单。\n点击菜单前的文件夹图标可以展开收缩菜单。\n偶尔不能正常显示菜单时，请按\"更新缓冲\"按钮更新信息。\n* 不能正常显示指定级(层级)以上的菜单，创建菜单项的时候，请确认你要使用的布局究竟支持多少级别的菜单。";
diff --git a/modules/menu/lang/zh-TW.lang.php b/modules/menu/lang/zh-TW.lang.php
index 23ba5bb6b..271d5063b 100644
--- a/modules/menu/lang/zh-TW.lang.php
+++ b/modules/menu/lang/zh-TW.lang.php
@@ -37,6 +37,7 @@
     $lang->cmd_search_mid = "尋找 mid";
 
     $lang->msg_cannot_delete_for_child = '有子選單的選單不能刪除。';
+    $lang->msg_cannot_delete_for_admin_topmenu = 'A top menu cannot be deleted';
 
     $lang->about_title = '請輸入連接模組時，容易區分的標題。';
     $lang->about_menu_management = "選單管理可以建構所選擇版面中使用的選單。\n不僅可以建構指定級(層級)選單，點擊輸入的選單名稱即可對其進行詳細設置。\n點擊選單前圖標可以展開選單。\n偶爾無法正常顯示選單時，請按\"重新建立暫存檔\"按鈕更新資料。\n* 可能無法正常顯示指定級(層級)以上的選單。";
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 92d8d5479..a16b3d0a8 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -32,7 +32,7 @@
 
 			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
 				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent');
-				header('location:'.$returnUrl);
+				$this->setRedirectUrl($returnUrl);
 				return;
 			}
         }
@@ -173,8 +173,16 @@
             $args = Context::gets('menu_srl','menu_item_srl');
 
             $oMenuAdminModel = &getAdminModel('menu');
+
+            // Get information of the menu
+            $menu_info = $oMenuAdminModel->getMenu($args->menu_srl);
+            $menu_title = $menu_info->title;
+
             // Get original information
             $item_info = $oMenuAdminModel->getMenuItemInfo($args->menu_item_srl);
+
+			if($menu_title == '__XE_ADMIN__' && $item_info->parent_srl == 0)return $this->stop('msg_cannot_delete_for_admin_topmenu');
+
             if($item_info->parent_srl) $parent_srl = $item_info->parent_srl;
             // Display an error that the category cannot be deleted if it has a child node
             $output = executeQuery('menu.getChildMenuCount', $args);
@@ -183,9 +191,6 @@
             // Remove from the DB
             $output = executeQuery("menu.deleteMenuItem", $args);
             if(!$output->toBool()) return $output;
-            // Get information of the menu
-            $menu_info = $oMenuAdminModel->getMenu($args->menu_srl);
-            $menu_title = $menu_info->title;
             // Update the xml file and get its location
             $xml_file = $this->makeXmlFile($args->menu_srl);
             // Delete all of image buttons
@@ -200,7 +205,7 @@
 
 			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
 				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
-				header('location:'.$returnUrl);
+				$this->setRedirectUrl($returnUrl);
 				return;
 			}
         }
@@ -333,14 +338,19 @@
 			if(is_array($installed_module_list))
 			{
 				$currentLang = Context::getLangType();
+				$menuList = array();
 				foreach($installed_module_list AS $key=>$value)
 				{
 					$cache_file = sprintf("./files/cache/module_info/%s.%s.php", $value->module, $currentLang);
 					if(is_readable($cache_file))
+					{
 						include $cache_file;
+						if($info->menu) $menuList[$value->module] = $info->menu;
+						unset($info->menu);
+					}
 				}
 			}
-            $this->add('menuList', $info->menu);
+            $this->add('menuList', $menuList);
         }
 
         /**
@@ -349,24 +359,27 @@
 		function procMenuAdminInsertItemForAdminMenu()
 		{
             $requestArgs = Context::getRequestVars();
+			$tmpMenuName = explode(':', $requestArgs->menu_name);
+			$moduleName = $tmpMenuName[0];
+			$menuName = $tmpMenuName[1];
 
 			// variable setting
 			$logged_info = Context::get('logged_info');
-			$oMenuAdminModel = &getAdminModel('menu');
+			//$oMenuAdminModel = &getAdminModel('menu');
 			$oMemberModel = &getModel('member');
 
-			$parentMenuInfo = $oMenuAdminModel->getMenuItemInfo($requestArgs->parent_srl);
+			//$parentMenuInfo = $oMenuAdminModel->getMenuItemInfo($requestArgs->parent_srl);
 			$groupSrlList = $oMemberModel->getMemberGroups($logged_info->member_srl);
 
-			preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $parentMenuInfo->name, $m);
-			$cache_file = sprintf("./files/cache/module_info/%s.%s.php", $requestArgs->menu_name, Context::getLangType());
+			//preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $parentMenuInfo->name, $m);
+			$cache_file = sprintf("./files/cache/module_info/%s.%s.php", $moduleName, Context::getLangType());
 			include $cache_file;
 
 			$args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl;
 			$args->parent_srl = $requestArgs->parent_srl;
 			$args->menu_srl = $requestArgs->menu_srl;
-			$args->name = sprintf('{$lang->menu_gnb_sub[%s][\'%s\']}', $m[1], $requestArgs->menu_name);
-			$args->url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->menu->{$requestArgs->menu_name}->index);
+			$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
+			$args->url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
 			$args->open_window = 'N';
 			$args->expand = 'N';
 			$args->normal_btn = '';
@@ -382,8 +395,9 @@
             if($item_info->menu_item_srl == $args->menu_item_srl) {
                 $output = executeQuery('menu.updateMenuItem', $args);
                 if(!$output->toBool()) return $output;
+            }
             // Insert if not exist
-            } else {
+			else {
                 $args->listorder = -1*$args->menu_item_srl;
                 $output = executeQuery('menu.insertMenuItem', $args);
                 if(!$output->toBool()) return $output;
@@ -393,6 +407,12 @@
             $menu_title = $menu_info->title;
             // Update the xml file and get its location
             $xml_file = $this->makeXmlFile($args->menu_srl);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminMenuSetup');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
 		}
 
         /**