diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
index d8c4340bf..ba59c498e 100644
--- a/modules/admin/tpl/_header.html
+++ b/modules/admin/tpl/_header.html
@@ -4,7 +4,7 @@
 		<ul class="gnb">
             <li><a href="{getUrl('module','admin','act','procAdminLogout')}">Sign out</a></li>
 			<!--@if($logged_info->is_admin=='Y')--><li><a href="{getUrl('','module','admin','act','dispAdminConfig')}">Settings</a></li><!--@end-->
-			<li><a href="#" onclick="toggleAdminLang();return false;">Language</a>
+			<li><a href="#adminLang" onclick="toggleAdminLang();return false;">Language</a>
 				<ul id="adminLang">
                     <!--@foreach($lang_supported as $key => $val)-->
 					<li <!--@if($key == $lang_type)-->class="open"<!--@end-->><a href="#" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
diff --git a/modules/admin/tpl/_spHeader.html b/modules/admin/tpl/_spHeader.html
index 2afd6944c..3d2af13d4 100644
--- a/modules/admin/tpl/_spHeader.html
+++ b/modules/admin/tpl/_spHeader.html
@@ -2,24 +2,11 @@
 	<p class="skipNav"><a href="#content">Skip Navigation</a></p>
 	<div class="header">
 		<h1><a href="{getUrl('','module','admin')}"><img src="{getUrl('')}{$gnb_title_info->adminLogo}" alt="{$gnb_title_info->adminTitle}" /> {$gnb_title_info->adminTitle}</a></h1>
-		<div class="siteTool">
-			<a href="#moveSiteList" class="i tgAnchor" data-effect="slide" data-duration="100">Move to Site</a>
-			<div class="tgContent" id="moveSiteList">
-				<ul class="lined">
-					<li>XpressEngine - <a href="#">http://xe.xpressengine.net/</a></li>
-					<li>XpressEngine - <a href="#">http://xe.xpressengine.net/</a></li>
-					<li>XpressEngine - <a href="#">http://xe.xpressengine.net/</a></li>
-				</ul>
-				<p class="btnArea">
-					<a href="#" class="more"><span>&rsaquo;</span> more</a>
-				</p>
-			</div>
-		</div>
 		<div class="account">
 			<ul>
 				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'is_admin', 'Y', 'member_srl', $logged_info->member_srl)}">{$logged_info->email_address}</a></li>
 				<li><a href="{getUrl('', 'module','admin','act','procAdminLogout')}">Log-out</a></li>
-				<li><a href="#language" class="tgAnchor language" data-effect="slide" data-duration="100">Language</a>
+				<li><a href="#language" class="tgAnchor language" data-effect="slide" data-duration="100"><!--@foreach($lang_supported as $key => $val)--><block cond="$key==$lang_type">{$val}</block><!--@end--></a>
 					<ul class="tgContent" id="language">
                     	<!--@foreach($lang_supported as $key => $val)-->
 						<li class="selected"|cond="$key==$lang_type"><a href="{getUrl('l',$key)}" data-langcode="{$key}" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index f5ddb3518..1d4a4766b 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -244,13 +244,6 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .header h1 *{vertical-align:middle}
 .header h1 a{color:#fff;text-shadow:1px 1px 0 #000;filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);zoom:1}
 .header h1 .url{font-size:12px;font-weight:normal}
-.header .siteTool{position:absolute !important;top:42px;right:0;padding:0 2em 0 0;z-index:2}
-.header .siteTool .i{position:relative;z-index:2;display:inline-block;color:#fff;padding:0 6px;line-height:24px}
-.header .siteTool .i:first-child{border:0}
-.header .siteTool .tgAnchor{padding-right:16px;background:url(../img/iconArrow.gif) no-repeat right -156px}
-.header .siteTool .tgAnchor.active{border:1px solid #ccc;border-bottom:0;background-color:#fff;color:#333;text-decoration:none;border-radius:5px 5px 0 0}
-.header .siteTool .tgContent{position:absolute;top:24px;right:2em;border:1px solid #ccc;z-index:1;background-color:#fff;border-radius:5px 0 5px 5px}
-.header .siteTool .tgContent .btnArea{margin:0}
 .header #moveSiteList{padding:10px 1em 5px 1em;margin:0}
 .header #moveSiteList ul{list-style:none;margin:0;padding:0}
 .header #moveSiteList li{white-space:nowrap;margin:0;padding:4px 0;border-bottom:1px dotted #ccc}
@@ -265,13 +258,10 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .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 li{border:0;display:block;padding:1px 8px;text-align:left;line-height:1}
-.header #language li.selected{background:transparent url(../img/checked.png) no-repeat left center}
+.header #language li.selected a{text-decoration:underline}
 .header h1 a:hover,
 .header h1 a:active,
 .header h1 a:focus,
-.header .siteTool a:hover,
-.header .siteTool a:active,
-.header .siteTool a:focus,
 .header .account a:hover,
 .header .account a:active,
 .header .account a:focus{color:#6e9cf2;text-decoration:underline}
@@ -508,8 +498,6 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 @media only all and (max-width:860px){
 	.header h1{margin-left:.7em}
 	.header .account{padding-right:1em}
-	.header .siteTool{padding-right:1em}
-	.header .siteTool .tgContent{right:1em}
 	.body{padding:1em}
 	.content{float:none;margin-left:0}
 	.lnb{float:none;width:auto;margin:1em 0}
diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css
index aca0ddba8..1d4a4766b 100644
--- a/modules/admin/tpl/css/admin.min.css
+++ b/modules/admin/tpl/css/admin.min.css
@@ -61,6 +61,7 @@ p{line-height:1.5}
 .form li label em{font-weight:normal}
 .form input[type=text],.form input[type=password],.form input[type=file],.form textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
 .form input[type=text],.form input[type=password],.form input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}
+.form input[type=text].loading,.form input.loading[type=password]{padding-right:24px;width:260px;background:transparent url(../img/preLoader16.gif) no-repeat 265px center}
 .form input[type=checkbox],.form input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle}
 .form input[type=text][disabled=disabled],
 .form input[type=password][disabled=disabled],
@@ -243,13 +244,6 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .header h1 *{vertical-align:middle}
 .header h1 a{color:#fff;text-shadow:1px 1px 0 #000;filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);zoom:1}
 .header h1 .url{font-size:12px;font-weight:normal}
-.header .siteTool{position:absolute !important;top:42px;right:0;padding:0 2em 0 0;z-index:2}
-.header .siteTool .i{position:relative;z-index:2;display:inline-block;color:#fff;padding:0 6px;line-height:24px}
-.header .siteTool .i:first-child{border:0}
-.header .siteTool .tgAnchor{padding-right:16px;background:url(../img/iconArrow.gif) no-repeat right -156px}
-.header .siteTool .tgAnchor.active{border:1px solid #ccc;border-bottom:0;background-color:#fff;color:#333;text-decoration:none;border-radius:5px 5px 0 0}
-.header .siteTool .tgContent{position:absolute;top:24px;right:2em;border:1px solid #ccc;z-index:1;background-color:#fff;border-radius:5px 0 5px 5px}
-.header .siteTool .tgContent .btnArea{margin:0}
 .header #moveSiteList{padding:10px 1em 5px 1em;margin:0}
 .header #moveSiteList ul{list-style:none;margin:0;padding:0}
 .header #moveSiteList li{white-space:nowrap;margin:0;padding:4px 0;border-bottom:1px dotted #ccc}
@@ -264,13 +258,10 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .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 li{border:0;display:block;padding:1px 8px;text-align:left;line-height:1}
-.header #language li.selected{background:transparent url(../img/checked.png) no-repeat left center}
+.header #language li.selected a{text-decoration:underline}
 .header h1 a:hover,
 .header h1 a:active,
 .header h1 a:focus,
-.header .siteTool a:hover,
-.header .siteTool a:active,
-.header .siteTool a:focus,
 .header .account a:hover,
 .header .account a:active,
 .header .account a:focus{color:#6e9cf2;text-decoration:underline}
@@ -499,12 +490,14 @@ button.text{border:0;overflow:visible;padding:0;margin:0;color:#33a;background:n
 .fileBox .portlet ul{margin:1em;list-style:none;padding:0;border:0}
 .fileBox .portlet li{border-top:1px solid #ddd;border-bottom:0;padding:8px 0}
 .fileBox .side{position:absolute;top:8px;right:0}
+/* Messages */
+.desc.error{color:#f00}
+.desc.success{color:#080}
+
 /* Responsive Layout */
 @media only all and (max-width:860px){
 	.header h1{margin-left:.7em}
 	.header .account{padding-right:1em}
-	.header .siteTool{padding-right:1em}
-	.header .siteTool .tgContent{right:1em}
 	.body{padding:1em}
 	.content{float:none;margin-left:0}
 	.lnb{float:none;width:auto;margin:1em 0}
diff --git a/modules/admin/tpl/img/checked.png b/modules/admin/tpl/img/checked.png
deleted file mode 100644
index 419b7514f..000000000
Binary files a/modules/admin/tpl/img/checked.png and /dev/null differ