diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 58e22fc32..ac7d4d238 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -140,6 +140,13 @@ class ModuleObject extends BaseObject
 			return;
 		}
 		
+		// Set admin layout
+		if(preg_match('/^disp[A-Z][a-z0-9\_]+Admin/', $this->act))
+		{
+			$this->setLayoutPath('modules/admin/tpl');
+			$this->setLayoutFile('layout');
+		}
+		
 		// Execute init
 		if(method_exists($this, 'init'))
 		{
diff --git a/modules/admin/tpl/_footer.html b/modules/admin/tpl/_footer.html
index 219e305de..5d5d778fa 100644
--- a/modules/admin/tpl/_footer.html
+++ b/modules/admin/tpl/_footer.html
@@ -1,6 +1,6 @@
 	</div>
 	<!-- /BODY -->
-	<footer class="footer">
+	<footer class="footer" cond="$this->user->isAdmin()">
 		<p class="power">
 			Powered by <strong>Rhymix {__XE_VERSION__}</strong>
 			<!--@if(isset($released_version))-->
@@ -8,13 +8,14 @@
 			<!--@end-->
 		</p>
 		<p class="cache">
-			<button type="button" class="x_btn-link" onclick="doResetAdminMenu();">{$lang->cmd_admin_menu_reset}</button> <span class="vr">|</span>  
-			<button type="button" class="x_btn-link" onclick="doRecompileCacheFile();">{$lang->cmd_remake_cache}</button> <span class="vr">|</span> 
-			<button type="button" class="x_btn-link" onclick="doClearSession();">{$lang->cmd_clear_session}</button> <span class="vr">|</span> 
-			<a href="./index.php?module=admin&act=dispAdminViewServerEnv" style="vertical-align:middle">{$lang->cmd_view_server_env}</a> <span class="vr">|</span> 
-			<a href="https://github.com/rhymix/rhymix/issues" target="_blank" style="vertical-align:middle">{$lang->bug_report}</a>
+			<button type="button" class="x_btn-link" onclick="doResetAdminMenu();">{lang('admin.cmd_admin_menu_reset')}</button> <span class="vr">|</span>  
+			<button type="button" class="x_btn-link" onclick="doRecompileCacheFile();">{lang('common.cmd_remake_cache')}</button> <span class="vr">|</span> 
+			<button type="button" class="x_btn-link" onclick="doClearSession();">{lang('admin.cmd_clear_session')}</button> <span class="vr">|</span> 
+			<a href="./index.php?module=admin&act=dispAdminViewServerEnv" style="vertical-align:middle">{lang('admin.cmd_view_server_env')}</a> <span class="vr">|</span> 
+			<a href="https://github.com/rhymix/rhymix/issues" target="_blank" style="vertical-align:middle">{lang('admin.bug_report')}</a>
 		</p>
+		<load target="../../session/tpl/js/session.js" />
 	</footer>
 </div>
-<load target="./js/config.js" usecdn="true" />
-<load target="../../session/tpl/js/session.js" usecdn="true" />
+<load target="./js/config.js" />
+
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
index 4b1da51ca..3195c6109 100644
--- a/modules/admin/tpl/_header.html
+++ b/modules/admin/tpl/_header.html
@@ -14,17 +14,28 @@
 	xe.lang.confirm_run = "{$lang->confirm_run}";
 	xe.lang.confirm_reset_admin_menu = "{$lang->confirm_reset_admin_menu}";
 </script>
+{@ $module_manager = $current_module_info->module !== 'admin'}
 <div class="x">
 <p class="skipNav"><a href="#content">{$lang->skip_to_content}</a></p>
 	<header class="header">
+		<!--@if($module_manager)-->
+		<h1>module manager</h1>
+		<a href="{getUrl('module', 'admin', 'act', $act, 'module_srl', $module_info->module_srl, 'mid', '')}" cond="$this->user->isAdmin()">Admin Panel</a>
+		<!--@else-->
 		<h1>
 			<a href="{getUrl('','module','admin')}"><img cond="$gnb_title_info->adminLogo" src="{getUrl('')}{$gnb_title_info->adminLogo}" alt="{$gnb_title_info->adminTitle}" /> {$gnb_title_info->adminTitle}</a>
 		</h1>
 		<p class="site"><a href="{$xe_default_url}">{$xe_default_url}</a></p>
+		<!--@end-->
 		<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')}">{$lang->cmd_logout}</a></li>
+				<!--@if($module_manager)-->
+				<li><a href="{getUrl('', 'mid', $mid, 'act', 'dispMemberInfo')}">{$logged_info->email_address}</a></li>
+				<li><a href="{getUrl('', 'mid', $mid, 'act', 'dispMemberLogout')}">{$lang->cmd_logout}</a></li>
+				<!--@else-->
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'member_srl', $logged_info->member_srl)}">{$logged_info->email_address}</a></li>
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'procAdminLogout')}">{$lang->cmd_logout}</a></li>
+				<!--@end-->
 				<li><a href="#lang" class="lang" data-toggle>{$lang_supported[$lang_type]}</a>
 					<ul id="lang" class="x_dropdown-menu">
 						<li loop="$lang_supported=>$key,$val" class="x_active"|cond="$key==$lang_type"><a href="{getUrl('l',$key)}" data-langcode="{$key}" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
@@ -34,9 +45,9 @@
 		</div>
 	</header>
 	<!-- BODY -->
-	<div class="body <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'close')-->wide<!--@end-->">
+	<div class="body <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'close')-->wide<!--@end-->" style="padding-left:0"|cond="$module_manager">
 		<!-- GNB -->
-		<nav class="gnb <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'open')-->open<!--@end-->" id="gnb">
+		<nav class="gnb <!--@if($_COOKIE['__xe_admin_gnb_status'] == 'open')-->open<!--@end-->" id="gnb" cond="!$module_manager">
 			<a href="#gnbNav"><i class="x_icon-align-justify x_icon-white"></i><b></b> Menu Open/Close</a>
 			<ul id="gnbNav" class="ex">
 			<script>