diff --git a/modules/blog/blog.view.php b/modules/blog/blog.view.php
index 68753475e..f6084c310 100644
--- a/modules/blog/blog.view.php
+++ b/modules/blog/blog.view.php
@@ -84,7 +84,6 @@
             /**
              * 블로그는 자체 레이아웃을 관리하기에 이와 관련된 세팅을 해줌
              **/
-            /*
             // 레이아웃 경로와 파일 지정 (블로그는 자체 레이아웃을 가지고 있음)
             $this->setLayoutPath($template_path);
             $this->setLayoutFile("layout");
@@ -110,7 +109,6 @@
 
             // layout_info 변수 설정 
             Context::set('layout_info',$this->module_info);
-            */
 
             // 모듈정보 세팅
             Context::set('module_info',$this->module_info);
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index 722300265..bcae6e899 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -52,7 +52,7 @@
             // 등록된 레이아웃이 없으면 오류 표시
             if(!$layout_info) return $this->dispLayoutAdminContent();
 
-            Context::set('layout_info', $layout_info);
+            Context::set('selected_layout', $layout_info);
 
             // 메뉴 목록을 가져옴
             $oMenuModel = &getModel('menu');
@@ -75,7 +75,7 @@
 
             // 등록된 레이아웃이 없으면 오류 표시
             if(!$layout_info) return $this->dispLayoutAdminContent();
-            Context::set('layout_info', $layout_info);
+            Context::set('selected_layout', $layout_info);
             
             // 레이아웃 코드 가져오기
             $layout_file = sprintf('./files/cache/layout/%d.html', $layout_info->layout_srl);
diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html
index d4842426a..ae63d346e 100644
--- a/modules/layout/tpl/layout_edit.html
+++ b/modules/layout/tpl/layout_edit.html
@@ -5,7 +5,7 @@
 
 <table border="1" width="100%">
 <tr>
-    <th>{$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})</th>
+    <th>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</th>
 </tr>
 <tr>
     <td>{nl2br($lang->about_layout_code)}</td>
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index c17ac7877..84a82be50 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -8,22 +8,22 @@
     <col width="*" />
     <tr>  
         <th>{$lang->layout}</th>
-        <td>{$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})</td>
+        <td>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</td>
     </tr>
     <tr>  
         <th>{$lang->path}</th>
-        <td>{$layout_info->path}</td>
+        <td>{$selected_layout->path}</td>
     </tr>
-    <!--@if($layout_info->author->homepage)-->
+    <!--@if($selected_layout->author->homepage)-->
     <tr>  
         <th>{$lang->author}</th>
-        <td><a href="#" onclick="window.open('{$layout_info->author->homepage}');return false;">{$layout_info->author->name}</a></td>
+        <td><a href="#" onclick="window.open('{$selected_layout->author->homepage}');return false;">{$selected_layout->author->name}</a></td>
     </tr>
     <!--@end-->
-    <!--@if($layout_info->author->description)-->
+    <!--@if($selected_layout->author->description)-->
     <tr>  
         <th>{$lang->description}</th>
-        <td>{nl2br($layout_info->author->description)}</td>
+        <td>{nl2br($selected_layout->author->description)}</td>
     </tr>
     <!--@end-->
     </table>
@@ -32,19 +32,19 @@
 <div style="margin-bottom:10px;">
     <form id="fo_layout" action="./" method="get" onsubmit="return procFilter(this, update_layout_info)">
         <input type="hidden" name="layout_srl" value="{$layout_srl}" />
-        <input type="hidden" name="layout" value="{$layout_info->layout}" />
+        <input type="hidden" name="layout" value="{$selected_layout->layout}" />
 
         <table border="1" width="100%">
         <col width="140" />
         <col width="*" />
         <tr>
             <th rowspan="2">{$lang->title}</th>
-            <td><input type="text" name="title" value="{htmlspecialchars($layout_info->layout_title)}" /></td>
+            <td><input type="text" name="title" value="{htmlspecialchars($selected_layout->layout_title)}" /></td>
         </tr>
         <tr>
             <td>{$lang->about_title}</td>
         </tr>
-        <!--@foreach($layout_info->extra_var as $name => $var)-->
+        <!--@foreach($selected_layout->extra_var as $name => $var)-->
         <tr>
             <th rowspan="2">{$var->title}</th>
             <!--@if($var->type == "text")-->
@@ -67,7 +67,7 @@
             <td>{$var->description}</td>
         </tr>
         <!--@end-->
-        <!--@foreach($layout_info->menu as $menu_name => $menu_info)-->
+        <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
         <tr>
             <th>{$menu_info->title}<br />({$menu_name})</th>
             <td>