diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 1d4a4766b..7f5eb7cf2 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -256,7 +256,7 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .header .account li:first-child{border:0}
 .header .account a{color:#fff;display:inline-block;height:14px}
 .header .account a.language{padding-right:2px}
-.header #language{position:absolute;top:19px;right:0;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
+.header #language{position:absolute;top:19px;right:-2em;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
 .header #language li{border:0;display:block;padding:1px 8px;text-align:left;line-height:1}
 .header #language li.selected a{text-decoration:underline}
 .header h1 a:hover,
@@ -493,7 +493,8 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 /* Messages */
 .desc.error{color:#f00}
 .desc.success{color:#080}
-
+/* Preview Icon */
+.wPreview{ display:inline-block; width:15px; height:13px; vertical-align:middle; background:url(../img/iconWindow.gif) no-repeat}
 /* Responsive Layout */
 @media only all and (max-width:860px){
 	.header h1{margin-left:.7em}
diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css
index 1d4a4766b..79f81923b 100644
--- a/modules/admin/tpl/css/admin.min.css
+++ b/modules/admin/tpl/css/admin.min.css
@@ -256,7 +256,7 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .header .account li:first-child{border:0}
 .header .account a{color:#fff;display:inline-block;height:14px}
 .header .account a.language{padding-right:2px}
-.header #language{position:absolute;top:19px;right:0;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
+.header #language{position:absolute;top:19px;right:-2em;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
 .header #language li{border:0;display:block;padding:1px 8px;text-align:left;line-height:1}
 .header #language li.selected a{text-decoration:underline}
 .header h1 a:hover,
@@ -357,6 +357,7 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .siteMap .draggable,
 .siteMap .draggable .moveTo{background-color:#ddd}
 .siteMap .draggable .summary{border-left:1px solid #ccc;padding-left:10px;margin-left:10px;font-size:11px;color:#999}
+.siteMap a.ms{text-decoration:underline}
 /* Button Area */
 .btnArea{margin:1em 0;text-align:right;zoom:1}
 .btnArea:after{content:"";display:block;clear:both}
@@ -493,7 +494,8 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 /* Messages */
 .desc.error{color:#f00}
 .desc.success{color:#080}
-
+/* Preview Icon */
+.wPreview{display:inline-block;width:15px;height:0;padding:13px 0 0 0;overflow:hidden;vertical-align:middle;background:url(../img/iconWindow.gif) no-repeat}
 /* Responsive Layout */
 @media only all and (max-width:860px){
 	.header h1{margin-left:.7em}
diff --git a/modules/admin/tpl/img/iconWindow.gif b/modules/admin/tpl/img/iconWindow.gif
new file mode 100644
index 000000000..7c318f880
Binary files /dev/null and b/modules/admin/tpl/img/iconWindow.gif differ
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
index 6a06b98aa..248cd14f8 100644
--- a/modules/menu/tpl/sitemap.html
+++ b/modules/menu/tpl/sitemap.html
@@ -17,14 +17,14 @@
 		<a href="#nav1" class="tgMap">접기</a>
 		<ul class="lined" id="nav1">
 			<li loop="$value->menuItems=>$key2,$value2">
-			<input type="hidden" name="parent_key[]" value="{$key2}" class="_parent_key" />
-			<input type="hidden" name="child_key[]" value="BEGIN_{$key2}" class="_child_key" />
-			<input value="{$value2['name']}" />
-			<span class="side"><a href="#editMenu" class="modalAnchor _edit">Edit...</a> | <a href="#">Setup</a> | <a href="#delete" class="_delete">Delete</a></span>
+				<input type="hidden" name="parent_key[]" value="{$key2}" class="_parent_key" />
+				<input type="hidden" name="child_key[]" value="BEGIN_{$key2}" class="_child_key" />
+				<a href="#" class="ms">{$value2['name']}</a> <a href="#" class="wPreview" target="_blank">Preview</a>
+				<span class="side"><a href="#editMenu" class="modalAnchor _edit">Edit...</a> | <a href="#delete" class="_delete">Delete</a></span>
 				<ul cond="$value2['subMenu']>0">
 					<li loop="$value2['subMenu']=>$key3,$value3">
 					<input type="hidden" name="child_key[]" value="{$key3}" class="_child_key" />
-					<input value="{$value3->name}" /> <span class="side"><a href="#editMenu" class="modalAnchor _edit">Edit...</a> | <a href="#">Setup</a> | <a href="#delete" class="_delete">Delete</a></span>
+					{$value3->name} <a href="#" class="wPreview" target="_blank">Preview</a> <span class="side"><a href="#editMenu" class="modalAnchor _edit">Edit...</a> | <a href="#delete" class="_delete">Delete</a></span>
 					</li>
 				</ul cond="$value2['subMenu']>0">
 			</li>
@@ -42,7 +42,7 @@
 			<input type="hidden" name="menu_srl" value="" />
 			<input type="hidden" name="menu_item_srl" value="{$menu_info->menu_srl}" />
 			<input type="hidden" name="parent_srl" value="{$menu_info->menu_srl}" />
-				<h2 class="h2">My Navigation Setting</h2>
+				<h2 class="h2">Add Menu | Edit Menu</h2>
 				<ul>
 					<li>
 						<p class="q"><label for="name">Name</label></p>
@@ -98,9 +98,19 @@
 						</div>
 					</li>
 					<li>
-						<p class="q"><label for="menu_url">Module ID or URL</label></p>
+						<p class="q">What kind of?</p>
+						<p class="a">
+							<input type="radio" name="cType" id="board" /> <label for="board">board</label>
+							<input type="radio" name="cType" id="forum" /> <label for="forum">forum</label>
+							<input type="radio" name="cType" id="page" /> <label for="page">page</label>
+							<input type="radio" name="cType" id="wiki" /> <label for="wiki">wiki</label>
+							<input type="radio" name="cType" id="url" /> <label for="url">URL</label>
+						</p>
+					</li>
+					<li>
+						<p class="q"><label for="module_id">Create or insert module ID.</label></p>
 						<div class="a">
-							<input type="text" id="menu_url" name="menu_url" />
+							<input type="text" id="module_id" name="menu_url" />
 							<div id="findMid" class="suggestion">
 								<ul>
 									<li><button type="button">freeBoard</button></li>
@@ -110,6 +120,12 @@
 							<span class="desc"><a href="#findMid" class="tgAnchor">Find Module ID</a></span>
 						</div>
 					</li>
+					<li>
+						<p class="q"><label for="link_url">Insert URL.</label></p>
+						<div class="a">
+							<input type="text" id="link_url" name="menu_url" value="http://" />
+						</div>
+					</li>
 					<li>
 						<p class="q">Which window should be open?</p>
 						<p class="a">