diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 2e85c4bd6..09c974759 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -196,7 +196,7 @@
                         foreach($layout_info->extra_var as $var_id => $val) {
                             $layout_info->{$var_id} = $val->value;
                         }
-                        unset($layout_info->extra_var);
+                        //unset($layout_info->extra_var);
                     }
                     
                     // 레이아웃 정보중 menu를 Context::set
diff --git a/layouts/sample_layout/layout.html b/layouts/sample_layout/layout.html
index cda6f0085..7d765e10a 100644
--- a/layouts/sample_layout/layout.html
+++ b/layouts/sample_layout/layout.html
@@ -1,5 +1,5 @@
 <script type="text/javascript">
-    loadTreeMenu("{$main_menu->xml_file}", "main_menu", "menu", "{$layout_info->main_menu?$layout_info->main_menu:'home'}");
+    loadTreeMenu("{$main_menu->xml_file}", "menu", "menu", "{$layout_info->main_menu?$layout_info->main_menu:'home'}");
 </script>
 
 <div style="height:50px;border:1px solid;margin-bottom:10px;">
@@ -57,6 +57,11 @@
             </div>
 
             <div id="menu"></div>
+            <!--@if($logged_info->is_admin == 'Y')-->
+            <div>
+                <a href="#" onclick="location.href='{getUrl('act','dispLayoutAdminMenu','layout_srl',$layout_info->layout_srl)}';return false;">{$lang->cmd_layout_management}</a>
+            </div>
+            <!--@end-->
 
             <!--@if($third_menu_list)-->
             <div>
diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
index dd361f4f7..e65b984cf 100644
--- a/modules/layout/lang/ko.lang.php
+++ b/modules/layout/lang/ko.lang.php
@@ -5,6 +5,8 @@
      * @brief  레이아웃(layout) 모듈의 기본 언어팩
      **/
 
+    $lang->cmd_layout_management = '레이아웃 설정';
+
     $lang->layout_name = '레이아웃 이름';
     $lang->menu_count = '메뉴의 수';
     $lang->menu_management = '메뉴 관리';
diff --git a/modules/layout/tpl/layout_info.html b/modules/layout/tpl/layout_info.html
index 008ee3fce..9db1252e2 100644
--- a/modules/layout/tpl/layout_info.html
+++ b/modules/layout/tpl/layout_info.html
@@ -47,7 +47,6 @@
             <th>{$lang->title}</th>
             <td><input type="text" name="title" value="{$layout_info->layout_title}" /></td>
         </tr>
-
         <!--@foreach($layout_info->extra_var as $id => $var)-->
         <tr>
             <th rowspan="2">{$var->name}</th>
@@ -73,7 +72,11 @@
         <!--@end-->
         <tr>
             <td colspan="2" align="center">
-                <input type="button" value="{$lang->cmd_list}" onclick="location.href='{getUrl('act','dispLayoutAdminContent')}';return false;"/>
+                <!--@if($module=='admin')-->
+                    <input type="button" value="{$lang->cmd_list}" onclick="location.href='{getUrl('act','dispLayoutAdminContent')}';return false;"/>
+                <!--@else-->
+                    <input type="button" value="{$lang->cmd_list}" onclick="location.href='{getUrl('act','')}';return false;"/>
+                <!--@end-->
                 <input type="submit" value="{$lang->cmd_save}" />
             </td>
         </tr>