diff --git a/layouts/user_layout/conf/info.xml b/layouts/user_layout/conf/info.xml
index e169ac982..9e7c640c6 100644
--- a/layouts/user_layout/conf/info.xml
+++ b/layouts/user_layout/conf/info.xml
@@ -14,7 +14,7 @@
         <name xml:lang="jp">製作者名</name>
     </author>
     <menus>
-        <menu name="global_menu" maxdepth="2" default="true">
+        <menu name="global_menu" maxdepth="3" default="true">
             <title xml:lang="ko">전역 메뉴</title>
             <title xml:lang="en">Global Menu</title>
             <title xml:lang="jp">グローバルメニュー</title>
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
index ad478950e..e0b3d9b84 100644
--- a/modules/admin/lang/lang.xml
+++ b/modules/admin/lang/lang.xml
@@ -1029,6 +1029,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 	<item name="bug_report">
 		<value xml:lang="ko"><![CDATA[버그 리포트]]></value>
 		<value xml:lang="en"><![CDATA[Bug Report]]></value>
+		<value xml:lang="jp"><![CDATA[バグレポート]]></value>
 	</item>
 	<item name="theme_setting">
 		<value xml:lang="ko"><![CDATA[테마 설정]]></value>
@@ -1069,6 +1070,7 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
 	<item name="cmd_admin_menu_reset">
 		<value xml:lang="ko"><![CDATA[관리자 메뉴 초기화]]></value>
 		<value xml:lang="en"><![CDATA[Reset admin menu]]></value> 
+		<value xml:lang="jp"><![CDATA[管理者メニューの初期化]]></value> 
 	</item>
 	<item name="confirm_reset_admin_menu">
 		<value xml:lang="ko"><![CDATA[관리자 메뉴를 초기화하시겠습니까?]]></value>
diff --git a/modules/layout/tpl/layout_instance_list.html b/modules/layout/tpl/layout_instance_list.html
index 5b49f6911..655253aa0 100644
--- a/modules/layout/tpl/layout_instance_list.html
+++ b/modules/layout/tpl/layout_instance_list.html
@@ -39,5 +39,5 @@
 	</table>
 </div>
 <div cond="$layout_info->layout != 'faceoff'" class="btnArea">
-	<span class="btn"><a href="{getUrl('act', 'dispLayoutAdminInsert', 'layout', $layout_info->layout)}">{$lang->cmd_insert}</a></span>
+	<span class="btn"><a href="{getUrl('act', 'dispLayoutAdminInsert', 'layout', $layout_info->layout)}">{$lang->cmd_insert}...</a></span>
 </div>
diff --git a/modules/menu/conf/module.xml b/modules/menu/conf/module.xml
index 217cb4cf9..c9aea1351 100644
--- a/modules/menu/conf/module.xml
+++ b/modules/menu/conf/module.xml
@@ -32,12 +32,12 @@
 		<menu name="siteMap">
 			<title xml:lang="en">Site Map</title>
 			<title xml:lang="ko">사이트맵</title>
+			<title xml:lang="jp">サイトマップ</title>
 			<title xml:lang="zh-CN">Site Map</title>
-			<title xml:lang="jp">Site Map</title>
+			<title xml:lang="zh-TW">Site Map</title>
 			<title xml:lang="es">Site Map</title>
 			<title xml:lang="ru">Site Map</title>
 			<title xml:lang="fr">Site Map</title>
-			<title xml:lang="zh-TW">Site Map</title>
 			<title xml:lang="vi">Site Map</title>
 			<title xml:lang="mn">Site Map</title>
 			<title xml:lang="tr">Site Map</title>
diff --git a/modules/module/tpl/skin_config.html b/modules/module/tpl/skin_config.html
index 052df5823..0949da605 100644
--- a/modules/module/tpl/skin_config.html
+++ b/modules/module/tpl/skin_config.html
@@ -51,10 +51,9 @@
     <h3 class="h3">{$lang->extra_vars}</h3>
 	<div class="table">
 		<table width="100%" border="1" cellspacing="0">
-			
-			<tr valign="top">
-				<th scope="row"><div>{$lang->colorset}</div></th>
-				<td >
+			<tr valign="top" cond="$skin_info->colorset">
+				<th scope="row">{$lang->colorset}</th>
+				<td>
 					<!--@foreach($skin_info->colorset as $key => $val)-->
 					<!--@if($val->screenshot)-->
 					{@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
@@ -84,7 +83,7 @@
 			<!--@end-->
 			
 			<tr>
-				<th scope="row"><div>{$val->title}</div></th>
+				<th scope="row">{$val->title}</th>
 				<td >
 					<!--@if($val->type=="text")-->
 					<input type="text" name="{$val->name}" value="{$val->value}" id="target{$val->name}" />
diff --git a/modules/page/m.skins/default/mobile.html b/modules/page/m.skins/default/mobile.html
index 92940b223..2ec6369d9 100644
--- a/modules/page/m.skins/default/mobile.html
+++ b/modules/page/m.skins/default/mobile.html
@@ -5,8 +5,8 @@
     <!--%import("./js/page_admin.js")-->
     <div class="tRight gap1 clear">
 		<!--@if($logged_info->is_admin=='Y')-->
-        <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}...</span></a>
         <!--@end-->
-        <a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}</span></a>
+        <a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}...</span></a>
     </div>
 <!--@end-->
diff --git a/modules/page/skins/default/content.html b/modules/page/skins/default/content.html
index 01c640cf8..87699a3db 100644
--- a/modules/page/skins/default/content.html
+++ b/modules/page/skins/default/content.html
@@ -3,7 +3,7 @@
 <block cond="$grant->manager">
 	<load target="../../tpl/js/page_admin.js" />
 	<div class="btnArea">
-		<span class="btn"><a cond="$logged_info->is_admin=='Y'" href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}</a></span>
-		<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}</a></span>
+		<span class="btn"><a cond="$logged_info->is_admin=='Y'" href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}...</a></span>
+		<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
 	</div>
 </block>
diff --git a/modules/page/tpl/content.html b/modules/page/tpl/content.html
index fb75c500f..0c8801592 100644
--- a/modules/page/tpl/content.html
+++ b/modules/page/tpl/content.html
@@ -6,10 +6,10 @@
         <span class="btn"><button type="button" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;">{$lang->cmd_remake_cache}</button></span>
         <!--@end-->
 		<!--@if($logged_info->is_admin=='Y')-->
-        <span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}</a></span>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}...</a></span>
         <!--@end-->
 		<!--@if($module_info->page_type != 'OUTSIDE')-->
-        <span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}</a></span>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
         <!--@end-->
 		<!--@if($module_info->use_mobile =="Y")-->
         <span class="btn"><a href="{getUrl('act','dispPageAdminMobileContent','module_srl',$module_info->module_srl)}">Mobile</a></span>
diff --git a/modules/page/tpl/header.html b/modules/page/tpl/header.html
index 8424024a1..5265f7d07 100644
--- a/modules/page/tpl/header.html
+++ b/modules/page/tpl/header.html
@@ -6,9 +6,9 @@
 <!--@if($module_info)-->
 <!--@if($module_info->mid)-->
 <h2 class="h2">
-	{$module_info->mid} <!--@if($module_info->is_default=='Y')-->({$lang->is_default})<!--@end--> 
+	{$module_info->mid}<block cond="$module_info->is_default=='Y'">({$lang->is_default})</block>
 	| 
-	<a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}">View</a>
+	<a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}">{$lang->view}</a>
 </h2>
 <!--@end-->
 <div class="cnb">
diff --git a/modules/page/tpl/mcontent.html b/modules/page/tpl/mcontent.html
index e560ccbd2..07f0428ca 100644
--- a/modules/page/tpl/mcontent.html
+++ b/modules/page/tpl/mcontent.html
@@ -4,9 +4,9 @@
     <div class="btnArea">
         <span class="btn"><button type="button" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;">{$lang->cmd_remake_cache}</button></span>
         <!--@if($logged_info->is_admin=='Y')-->
-        <span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}</a></span>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}...</a></span>
         <!--@end-->
-        <span class="btn"><a href="{getUrl('act','dispPageAdminMobileContentModify','document_srl','')}">{$lang->cmd_page_modify}</a></span>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminMobileContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
         <span class="btn"><a href="{getUrl('act','','module_srl',$module_info->module_srl)}">PC</a></span>
 		<p>{$lang->about_mcontent}</p>
     </div>
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html
index 6d5f0eacd..da03b6fe3 100644
--- a/modules/page/tpl/page_info.html
+++ b/modules/page/tpl/page_info.html
@@ -129,7 +129,7 @@
 	<div class="btnArea">
 		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
 		<!--@if($module_info->page_type != 'OUTSIDE')-->
-		<span class="btn"><a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" onclick="window.open(this.href,'PageEdit','width=850,height=650,scrollbars=yes,resizable=yes,toolbars=no');return false;">{$lang->cmd_page_modify}</a></span>
+		<span class="btn"><a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" onclick="window.open(this.href,'PageEdit','width=850,height=650,scrollbars=yes,resizable=yes,toolbars=no');return false;">{$lang->cmd_page_modify}...</a></span>
 		<!--@end-->
 		<!--@if($module=="admin")-->
 		<span class="btn"><a href="{getUrl('act','dispPageAdminContent','module_srl','')}">{$lang->cmd_list}</a></span>