diff --git a/common/lang/lang.xml b/common/lang/lang.xml
index 6a593fa18..f1bb5d7d1 100644
--- a/common/lang/lang.xml
+++ b/common/lang/lang.xml
@@ -2105,6 +2105,10 @@
 		<value xml:lang="vi"><![CDATA[Không sử dụng]]></value>
 		<value xml:lang="mn"><![CDATA[Хэрэглэхгүй]]></value>
 	</item>
+	<item name="use_after_save">
+		<value xml:lang="ko"><![CDATA[저장 후 사용]]></value>
+		<value xml:lang="en"><![CDATA[Use After Save]]></value>
+	</item>
 	<item name="on">
 		<value xml:lang="ko"><![CDATA[켜짐]]></value>
 		<value xml:lang="en"><![CDATA[On]]></value>
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index f954f3c1c..f4aa52cff 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -977,4 +977,8 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 		<value xml:lang="ko"><![CDATA[관리자 메뉴 추가]]></value>
 		<value xml:lang="en"><![CDATA[Admin Menu Add]]></value>
 	</item>
+	<item name="multilingual">
+		<value xml:lang="ko"><![CDATA[다국어]]></value>
+		<value xml:lang="en"><![CDATA[Multilingual]]></value>
+	</item>
 </lang>
diff --git a/modules/menu/tpl/js/sitemap.js b/modules/menu/tpl/js/sitemap.js
index 3b3e9c94c..cea43949b 100644
--- a/modules/menu/tpl/js/sitemap.js
+++ b/modules/menu/tpl/js/sitemap.js
@@ -38,6 +38,7 @@ $('form.siteMap')
 	function completeGetActList(obj)
 	{
 		var menuItem = obj.menu_item;
+		console.log(menuItem);
 		menuUrl = menuItem.url;
 		editForm.find('.h2').html('Edit Menu');
 		editForm.find('input[name=menu_srl]').val(menuItem.menu_srl);
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 212cfd67b..6e79741e1 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -57,43 +57,30 @@
 						<div class="a multiLangEdit">
 							<input type="hidden" class="vLang" name="menu_name_key" />
 							<input type="text" class="vLang" id="name" name="menu_name" /> 
-							<!-- Suggestion -->
-							<div id="vLangSuggest" class="suggestion">
-								<ul>
-									<li><button type="button">다국어 하나</button></li>
-									<li><button type="button">다국어 둘</button></li>
-								</ul>
-							</div>
-							<!-- /Suggestion -->
 							<!-- Multilingual -->
 							<div id="langEdit" class="langEdit tgContent">
-								<ul>
-									<li class="ko"><label for="ko_var1">Korean</label> <input type="text" value="안녕 세상아!" id="ko_var1" /></li>
-									<li class="en"><label for="en_var1">English</label> <input type="text" value="Hello World!" id="en_var1" /></li>
-									<li class="jp"><label for="ja_var1">Japanese</label> <input type="text" value="" id="ja_var1" /></li>
-									<li class="zh-CN"><label for="zhcn_var1">Chinese(Simplified)</label> <input type="text" value="" id="zhcn_var1" /></li>
-									<li class="zh-TW"><label for="zhtw_var1">Chinese(Traditional)</label> <input type="text" value="" id="zhtw_var1" /></li>
-									<li class="fr"><label for="fr_var1">French</label> <input type="text" value="" id="fr_var1" /></li>
-									<li class="de"><label for="de_var1">Deutsch</label> <input type="text" value="" id="de_var1" /></li>
-									<li class="ru"><label for="ru_var1">Russian</label> <input type="text" value="" id="ru_var1" /></li>
-									<li class="es"><label for="es_var1">Spanish</label> <input type="text" value="" id="es_var1" /></li>
-									<li class="tr"><label for="tr_var1">Turkish</label> <input type="text" value="" id="tr_var1" /></li>
-									<li class="vi"><label for="vi_var1">Vietnamese</label> <input type="text" value="" id="vi_var1" /></li>
-									<li class="mn"><label for="mn_var1">Mongolian</label> <input type="text" value="" id="mn_var1" /></li>
-								</ul>
-								<div class="action">
-									<!-- 여기부터 기존 랭귀지 변수를 수정한 경우에만 보인다 -->
-									<p>다국어 텍스트가 변경되었습니다. <em>업데이트</em> 버튼을 클릭하면 같은 텍스트를 사용하는 다른 페이지에도 반영됩니다. <em>새로 저장</em> 버튼을 클릭하면 이 페이지에만 적용됩니다.</p>
-									<div class="btnArea">
-										<span class="btn small"><input type="submit" value="업데이트" /></span> 
-										<span class="btn small"><input type="submit" value="새로저장" /></span> 
+								<ul class="langList"></ul>
+								<div id="langInput">
+									<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+									<ul>
+										{@
+											/* move current language to the top */
+											$a = array($lang_type=>$lang_supported[$lang_type]);
+											unset($lang_supported[$lang_type]);
+											$lang_supported = array_merge($a, $lang_supported);
+										}
+										<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
+									</ul>
+									<div class="action">
+										<div class="btnArea">
+											<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+										</div>
+										<p><a href="{getUrl('act','dispModuleAdminLangcode')}">다국어 텍스트 관리</a></p>
 									</div>
-									<!-- 여기까지 기존 랭귀지 변수를 수정한 경우에만 보인다 -->
-									<p><a href="#">다국어 텍스트 관리</a></p>
 								</div>
 							</div>
 							<!-- /Multilingual -->
-							<span class="desc"><a href="#langEdit" class="editUserLang tgAnchor">Multilingual</a></span>
+							<span class="desc"><a href="#langEdit" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
 						</div>
 					</li>
 					<li>