diff --git a/modules/addon/lang/ko.lang.php b/modules/addon/lang/ko.lang.php
index e4bcf8239..83c7e54db 100644
--- a/modules/addon/lang/ko.lang.php
+++ b/modules/addon/lang/ko.lang.php
@@ -5,9 +5,10 @@
      * @brief  한국어 언어팩 
      **/
 
-    $lang->addon_info = "애드온정보";
-    $lang->addon_maker = "애드온 제작자";
-    $lang->addon_history = "변경 사항 ";
+    $lang->addon_info = '애드온정보';
+    $lang->addon_maker = '애드온 제작자';
+    $lang->addon_history = '변경 사항 ';
 
-    $lang->about_addon = "애드온은 html결과물을 출력하기 보다 동작을 제어하는 역할을 합니다.\n원하시는 애드온을 on/ off하시는 것만으로 사이트 운영에 유용한 기능을 연동할 수 있습니다.";
+    $lang->about_addon = '애드온은 html결과물을 출력하기 보다 동작을 제어하는 역할을 합니다.<br />원하시는 애드온을 on/ off하시는 것만으로 사이트 운영에 유용한 기능을 연동할 수 있습니다.';
+    $lang->admin_module_title = '애드온'; 
 ?>
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index 4beae8528..718308523 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -1,10 +1,8 @@
 <!--%import("filter/toggle_activate_addon.xml")-->
 <!--%import("js/addon.js")-->
 
-<!-- 설명 -->
-<div style="border:1px solid #CCCCCC;margin-bottom:10px;padding:10px;">
-    {nl2br($lang->about_addon)}
-</div>
+<h3>{$lang->admin_module_title} <span class="gray">{$lang->cmd_management}</span></h3>
+<div class="infoText">{nl2br($lang->about_addon)}</div>
 
 <!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
 <form id="fo_addon" action="./" method="get">
@@ -12,47 +10,51 @@
 </form>
 
 <!-- 애드온의 목록 -->
-<table border="1" width="100%">
-<tr>
-    <td>{$lang->addon_name}</td>
-    <td>{$lang->version}</td>
-    <td>{$lang->author}</td>
-    <td>{$lang->date}</td>
-    <td>{$lang->installed_path}</td>
-    <td>{$lang->addon_info}</td>
-    <td>{$lang->cmd_setup}</td>
-    <td>{$lang->use}</td>
-</tr>
+<table cellspacing="0" class="tableType3">
+<thead>
+    <tr>
+        <th scope="col">{$lang->addon_name}</th>
+        <th scope="col">{$lang->version}</th>
+        <th scope="col">{$lang->author}</th>
+        <th scope="col">{$lang->date}</th>
+        <th scope="col">{$lang->installed_path}</th>
+        <th scope="col">{$lang->addon_info}</th>
+        <th scope="col">{$lang->cmd_setup}</th>
+        <th scope="col">{$lang->use}</th>
+    </tr>
+</thead>
 
+<tbody>
 <!--@foreach($addon_list as $key => $val)-->
 <tr>
-    <td rowspan="2">
+    <th scope="row" rowspan="2">
         {$val->title} <br />
         ({$val->addon})
-    </td>
-    <td>{$val->version}</td>
+    </th>
+    <td class="tahoma">{$val->version}</td>
     <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
-    <td>{$val->author->date}</td>
-    <td>{$val->path}</td>
-    <td rowspan="2"><a href="#" onclick="popopen('{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}','addon_info');return false">{$lang->cmd_view}</a></td>
-    <td rowspan="2">
+    <td class="tahoma">{$val->author->date}</td>
+    <td class="tahoma">{$val->path}</td>
+    <td class="tahoma"><a href="#" onclick="popopen('{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}','addon_info');return false">{$lang->cmd_view}</a></td>
+    <td class="tahoma">
         <!--@if($val->extra_vars)-->
             <a href="#" onclick="popopen('{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}','addon_info');return false">{$lang->cmd_setup}</a>
         <!--@end-->
     </td>
-    <td rowspan="2">
+    <td class="tahoma">
         <!--@if($val->activated)-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->notuse}</a>
+        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" class="red">{$lang->notuse}</a>
         <!--@else-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;">{$lang->use}</a>
+        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" class="blue">{$lang->use}</a>
         <!--@end-->
     </td>
 </tr>
 <tr>
-    <td colspan="4">
+    <td colspan="7" class="colSpan">
         {nl2br($val->author->description)}
     </td>
 </tr>
 <!--@end-->
+</tbody>
 
 </table>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index c57d5d59a..7c1d39af9 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -90,6 +90,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:
 
 /* tableStyle */
 .infoText { border:1px solid #f2f2f0; margin-bottom:12px; background:#f9f9f6; padding:1.2em; color:#7b7972; font-size:.9em; line-height:1.4em;}
+.gap1 { margin-top:1em; }
 .tableSummaryType1 { font:bold .8em Tahoma; color:#a0a0a0; margin-bottom:10px;}
 .tableSummaryType1 strong { font:bold 1em Tahoma; color:#ff1a00;}
 .tableType1 { width:100%; border-bottom:2px solid #c1c0bd;}
@@ -171,3 +172,7 @@ h4 .view { color:#158692; padding-right:.6em; font:bold .9em Tahoma; background:
 #category_list .checkbox { margin-top:1em; border:0px; }
 #category_info { float:left; width:370px; padding-left:10px; }
 /* ----- Category Manager | End ----- */
+
+.widget_item { float: left; white-space:nowrap; background-color:#FEFEFE; line-height:150%; margin-right:1em; }
+.layout_editor_box { padding:10px; border:1px solid #DDDDDD; }
+.layout_editor { width:100%; height:500px; border:0px;}
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index e00b8301c..0eb59608a 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -20,6 +20,7 @@ function fixAdminLayoutFooter() {
     var footerHeight = xHeight(xGetElementById('footer'));
     var clientHeight = xClientHeight();
     var newHeight = clientHeight - footerHeight - headerHeight + 71 + 38;
+    if(typeof(editor_height)!='undefined') newHeight += editor_height;
 
     if(newHeight<bodyHeight) newHeight = bodyHeight;
     xHeight(xGetElementById('cBody'), newHeight);
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index 43e828972..6b1120c27 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -15,7 +15,7 @@
         <ul>
             <!--@foreach($shortcut_list as $key => $val)-->
             <li <!--@if($running_module==$val->module)-->class="on"<!--@end-->>
-                <a href="{getUrl('','module','admin','act',$val->default_act)}">{$val->title}</a>
+                <a href="{getUrl('','module','admin','act',$val->default_act)}">{cut_str($val->title,14,'..')}</a>
             </li>
             <!--@end-->
         </ul>
diff --git a/modules/blog/tpl/blog_delete.html b/modules/blog/tpl/blog_delete.html
index 13d4793ba..215def022 100644
--- a/modules/blog/tpl/blog_delete.html
+++ b/modules/blog/tpl/blog_delete.html
@@ -1,33 +1,35 @@
 <!--%import("filter/delete_blog.xml")-->
 <!--%import("js/blog_admin.js")-->
+<!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, delete_blog)">
     <input type="hidden" name="page" value="{$page}" />
     <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
 
-    <table>
+    <table cellspacing="0" class="tableType4">
+    <col width="150" />
+    <col />
     <tr>
-        <th colspan="2">{$lang->confirm_delete}</th>
+        <th scope="row" colspan="2">{$lang->confirm_delete}</th>
     </tr>
     <tr>
-        <th>{$lang->module_name}</th>
+        <th scope="row">{$lang->module_name}</th>
         <td>{$module_info->mid}</td>
     </tr>
     <tr>
-        <th>{$lang->module}</th>
+        <th scope="row">{$lang->module}</th>
         <td>{$module_info->module}</td>
     </tr>
     <tr>
-        <th>{$lang->document_count}</th>
+        <th scope="row">{$lang->document_count}</th>
         <td>{$module_info->document_count}</td>
     </tr>
-    <tr>
-        <td colspan="2">
-            <input type="submit" value="{$lang->cmd_delete}" />
-            <input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','dispBlogAdminContent')}'" />
-        </td>
-    </tr>
     </table>
 
+    <ul class="buttonRight">
+        <li><a href="{getUrl('act','dispBlogAdminContent')}" class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_back}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
+        <li><span class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" /><img src="../../admin/tpl/images/iconCreate.gif" width="8" height="4" alt="" class="icon" /><input type="submit" value="{$lang->cmd_delete}" /><img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></span></li>
+    </ul>
+
 </form>
 
diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index 74a8520bc..6d77a40c7 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -3,6 +3,7 @@
 <!--%import("./lang")-->
 <!-- 에디터 활성화 -->
 <script type="text/javascript">
+    var editor_height = '{$editor_path}';
     var editor_path = "{$editor_path}";
     editorInit("{$upload_target_srl}", {$enable_resizable}, {$editor_height});
 </script>
diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
index cac86a54f..9421115e6 100644
--- a/modules/layout/lang/ko.lang.php
+++ b/modules/layout/lang/ko.lang.php
@@ -29,4 +29,6 @@
         "아래 레이아웃의 코드를 직접 수정후 저장하시면 서비스에 반영이 됩니다.
         꼭 미리보기를 하신 후에 저장을 하세요.
         제로보드XE의 템플릿 문법은 <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">[제로보드XE 템플릿]</a> 을 참고하시면 됩니다.";
+
+    $lang->admin_module_title = '레이아웃';
 ?>
diff --git a/modules/layout/tpl/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html
index 388c95510..05663027e 100644
--- a/modules/layout/tpl/downloaded_layout_list.html
+++ b/modules/layout/tpl/downloaded_layout_list.html
@@ -1,19 +1,20 @@
 <!--#include("header.html")-->
 
 <!-- 레이아웃의 목록 -->
-<div>
-    <table border="1" width="100%">
+<table cellspacing="0" class="tableType3 gap1">
+<thead>
     <tr>
-        <td>{$lang->layout_name}</td>
-        <td>{$lang->layout_info}</td>
-        <td>{$lang->version}</td>
-        <td>{$lang->author}</td>
-        <td>{$lang->menu_count}</td>
-        <td>{$lang->date}</td>
-        <td>{$lang->path}</td>
-        <td>{$lang->cmd_make}</td>
+        <th scope="col">{$lang->layout_name}</th>
+        <th scope="col">{$lang->version}</th>
+        <th scope="col">{$lang->author}</th>
+        <th scope="col">{$lang->menu_count}</th>
+        <th scope="col">{$lang->date}</th>
+        <th scope="col">{$lang->path}</th>
+        <th scope="col">{$lang->layout_info}</th>
+        <th scope="col">{$lang->cmd_make}</th>
     </tr>
-
+</thead>
+<tbody>
     <!--@foreach($layout_list as $key => $val)-->
 
         <!-- 레이아웃 정보 파일(conf/info.xml)가 있는 경우-->
@@ -23,16 +24,16 @@
                 {$val->title} <br />
                 ({$val->layout})
             </td>
-            <td><a href="#" onclick="popopen('{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}','layout_info');return false">{$lang->cmd_view}</a></td>
-            <td>{$val->version}</td>
+            <td class="tahoma">{$val->version}</td>
             <td><a href="#" onclick="window.open('{$val->author->homepage}')">{$val->author->name}</a></td>
-            <td>{$val->menu_count}</td>
-            <td>{$val->author->date}</td>
-            <td>{$val->path}</td>
-            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
+            <td class="tahoma">{$val->menu_count}</td>
+            <td class="tahoma">{$val->author->date}</td>
+            <td class="tahoma">{$val->path}</td>
+            <td class="tahoma"><a href="#" onclick="popopen('{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}','layout_info');return false" class="red">{$lang->cmd_view}</a></td>
+            <td class="tahoma"><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}" class="blue">{$lang->cmd_make}</a></td>
         </tr>
         <tr>
-            <td colspan="7">
+            <td colspan="7" class="left">
                 {nl2br($val->author->description)}
             </td>
         </tr>
@@ -40,11 +41,10 @@
         <!--@else-->
         <tr>
             <td colspan="6">{$val->layout}</td>
-            <td>{$val->path}</td>
-            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
+            <td class="tahoma">{$val->path}</td>
+            <td class="tahoma blue"><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
         </tr>
         <!--@end-->
     <!--@end-->
-
-    </table>
-</div>
+</tbody>
+</table>
diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html
index 50669d912..174a92c0d 100644
--- a/modules/layout/tpl/header.html
+++ b/modules/layout/tpl/header.html
@@ -1,20 +1,14 @@
 <!--%import("js/layout_admin.js")-->
 
+<h3>{$lang->admin_module_title} <span class="gray">{$lang->cmd_management}</span></h3>
+
 <!-- 관리자 페이지용 메뉴 -->
 <!--@if($module == 'admin')-->
-    <div style="margin-bottom:20px;">
-        <span <!--@if($act=='dispLayoutAdminContent')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispLayoutAdminContent')}">{$lang->layout_list}</a>]</span>
-        <span <!--@if($act=='dispLayoutAdminDownloadedList')-->style="font-weight:bold"<!--@end-->>[<a href="{getUrl('act','dispLayoutAdminDownloadedList')}">{$lang->downloaded_list}</a>]</span>
-    </div>
-<!--@end-->
 
-<!-- 레이아웃 수정 메뉴 -->
-<!--@if($layout_info)-->
-    <div style="margin-bottom:20px;">
-        <!--@if($act=='dispLayoutAdminModify')-->
-            {$lang->cmd_layout_management}
-        <!--@elseif($act=='dispLayoutAdminEdit')-->
-            {$lang->cmd_layout_edit}</a>
-        <!--@end-->
-    </div>
+<div class="header4">
+    <ul class="localNavigation">
+        <li <!--@if($act=='dispLayoutAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminContent')}">{$lang->layout_list}</a></li>
+        <li <!--@if($act=='dispLayoutAdminDownloadedList')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminDownloadedList')}">{$lang->downloaded_list}</a></li>
+    </ul>
+</div>
 <!--@end-->
diff --git a/modules/layout/tpl/index.html b/modules/layout/tpl/index.html
index 18a884648..f47910fb5 100644
--- a/modules/layout/tpl/index.html
+++ b/modules/layout/tpl/index.html
@@ -1,15 +1,8 @@
 <!--%import("filter/delete_layout.xml")-->
 
-<!-- 설명 -->
-<div style="border:1px solid #CCCCCC;margin-bottom:10px;padding:10px;">
-    {nl2br($lang->about_layout)}
-</div>
-
 <!--#include("header.html")-->
 
-<div>
-    {$lang->total_count} {number_format(count($layout_list))}
-</div>
+<div class="infoText gap1">{nl2br($lang->about_layout)}</div>
 
 <!-- 삭제를 위한 임시 form -->
 <form id="fo_layout" action="./" method="get" onsubmit="return procFilter(this, delete_layout)">
@@ -17,21 +10,22 @@
 </form>
 
 <!-- 목록 -->
-<div>
-    <table>
+<table cellspacing="0" class="tableType1">
+<thead>
     <tr>
-        <th>{$lang->no}</th>
-        <th>{$lang->layout}</th>
-        <th>{$lang->title}</th>
-        <th>{$lang->regdate}</th>
-        <th>{$lang->cmd_layout_management}</th>
-        <th>{$lang->cmd_layout_edit}</th>
-        <th>{$lang->cmd_delete}</th>
+        <th scope="col">{$lang->no}</th>
+        <th scope="col">{$lang->layout}</th>
+        <th scope="col">{$lang->title}</th>
+        <th scope="col">{$lang->regdate}</th>
+        <th scope="col">{$lang->cmd_layout_management}</th>
+        <th scope="col">{$lang->cmd_layout_edit}</th>
+        <th scope="col">{$lang->cmd_delete}</th>
     </tr>
-
+</thead>
+<tbody>
     <!--@foreach($layout_list as $no => $val)-->
     <tr>
-        <td>{$no+1}</td>
+        <td class="tahoma">{$no+1}</td>
         <td>
             {$val->layout}
             <!--@if($val->module_srl)-->
@@ -39,27 +33,26 @@
             <!--@end-->
         </td>
         <td>{htmlspecialchars($val->title)}</td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        <td>
+        <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
+        <td class="tahoma">
             <!--@if(!$val->module_srl)-->
                 <a href="#" onclick="location.href='{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}';return false;">{$lang->cmd_layout_management}</a>
             <!--@end-->
         </td>
-        <td>
+        <td class="tahoma">
             <a href="#" onclick="location.href='{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}';return false;">{$lang->cmd_layout_edit}</a>
         </td>
-        <td>
+        <td class="tahoma">
             <!--@if(!$val->module_srl)-->
                 <a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;">{$lang->cmd_delete}</a>
             <!--@end-->
         </td>
     </tr>
     <!--@end-->
-
-    </table>
-</div>
+</tbody>
+</table>
 
 <!-- 버튼 -->
-<div>
-    [<a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','')}">{$lang->cmd_make}</a>]
-</div>
+<ul class="buttonRight">
+    <li><a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','')}" class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" /><img src="../../admin/tpl/images/iconCreate.gif" width="8" height="4" class="icon" alt="" />{$lang->cmd_make}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
+</ul>
diff --git a/modules/layout/tpl/insert_layout.html b/modules/layout/tpl/insert_layout.html
index 52d6cade8..ae8cc4364 100644
--- a/modules/layout/tpl/insert_layout.html
+++ b/modules/layout/tpl/insert_layout.html
@@ -3,31 +3,31 @@
 <!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, insert_layout)">
-    <div style="margin-bottom:10px;">
-        <table border="1" width="100%">
-        <tr>
-            <th>{$lang->layout_name}</th>
-            <td>
-                <select name="layout">
-                    <!--@foreach($layout_list as $key => $val)-->
-                    <option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="true"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
-                    <!--@end-->
-                </select>
-            </td>
-        </tr>
-        <tr>  
-            <th rowspan="2">{$lang->title}</th>
-            <td><input type="text" name="title" value="{$info->title}" /></td>
-        </tr>
-        <tr>
-            <td>{$lang->about_title}</td>
-        </tr>
-        <tr>
-            <td colspan="2">
-                <input type="button" value="{$lang->cmd_list}" onclick="location.href='{getUrl('act','dispLayoutAdminContent')}';return false;" />
-                <input type="submit" value="{$lang->cmd_next}" />
-            </td>
-        </tr>
-        </table>
+
+    <table cellspacing="0" class="tableType2 gap1">
+    <col width="150" />
+    <col />
+    <tr>
+        <th scope="row">{$lang->layout_name}</th>
+        <td>
+            <select name="layout">
+                <!--@foreach($layout_list as $key => $val)-->
+                <option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="true"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
+                <!--@end-->
+            </select>
+        </td>
+    </tr>
+    <tr>  
+        <th scope="row">{$lang->title}</th>
+        <td>
+            <input type="text" name="title" value="{$info->title}" class="inputTypeText" />
+            <p>{$lang->about_title}</p>
+        </td>
+    </tr>
+    </table>
+
+    <div class="buttonRight">
+        <span class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" /><img src="../../admin/tpl/images/iconCreate.gif" alt="" width="8" height="4" class="icon" /><input type="submit" value="{$lang->cmd_next}" accesskey="s" /><img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></span>
     </div>
+
 </form>
diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html
index bd1d7c91e..03f6398f4 100644
--- a/modules/layout/tpl/layout_edit.html
+++ b/modules/layout/tpl/layout_edit.html
@@ -3,37 +3,50 @@
 
 <!--#include("header.html")-->
 
-<table border="1" width="100%">
-<tr>
-    <th>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</th>
-</tr>
-<tr>
-    <td>{nl2br($lang->about_layout_code)}</td>
-</tr>
+<table cellspacing="0" class="tableType3 gap1">
+<thead>
+    <tr>
+        <th scope="col">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</th>
+    </tr>
+</thead>
+<tbody>
+    <tr>
+        <td class="left">{nl2br($lang->about_layout_code)}</td>
+    </tr>
+</tbody>
 </table>
 
-<div style="margin-bottom:10px;border:1px solid #DDDDDD;padding:5px;">
-    <div style="font-weight:bold">{$lang->widget}</div>
-    <div>
-        <!--@foreach($widget_list as $widget)-->
-        [<a href="#" onclick="popopen('./?module=widget&amp;act=dispWidgetGenerateCode&amp;selected_widget={$widget->widget}&amp;module_srl={$module_srl}','GenerateCodeInPage');return false;">{$widget->title}</a>]
-        <!--@end-->
-    </div>
-</div>
+<table cellspacing="0" class="tableType3 gap1">
+<thead>
+    <tr>
+        <th scope="col">{$lang->widget}</th>
+    </tr>
+</thead>
+<tbody>
+    <tr>
+        <td class="left">
+            <!--@foreach($widget_list as $widget)-->
+            <div class="widget_item">[<a href="#" onclick="popopen('./?module=widget&amp;act=dispWidgetGenerateCode&amp;selected_widget={$widget->widget}&amp;module_srl={$module_srl}','GenerateCodeInPage');return false;">{$widget->title}</a>]</div>
+            <!--@end-->
+        </td>
+    </tr>
+</tbody>
+</table>
 
-<div style="margin-bottom:10px;">
+<div class="gap1">
     <form id="fo_layout" action="./" method="post" onsubmit="return procFilter(this, update_layout_code);">
         <input type="hidden" name="layout_srl" value="{$layout_srl}" />
         <input type="hidden" name="module" value="layout" />
         <input type="hidden" name="act" value="" />
 
-        <div>
-            <textarea name="code" style="width:99%;height:400px;border:2px solid #DDDDDD;">{htmlspecialchars($layout_code)}</textarea>
-        </div>
-        <div>
-            <input type="submit" value="{$lang->cmd_save}" />
-            <input type="button" value="{$lang->cmd_preview}" onclick="doPreviewLayoutCode();return false" />
-            <input type="button" value="{$lang->cmd_reset}" onclick="doResetLayoutCode('{$layout_srl}');return false" />
+        <div class="layout_editor_box">
+            <textarea name="code" class="layout_editor">{htmlspecialchars($layout_code)}</textarea>
         </div>
+
+        <ul class="buttonRight">
+            <li><span class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" /><img src="../../admin/tpl/images/iconCreate.gif" width="8" height="4" alt="" class="icon" /><input type="submit" value="{$lang->cmd_save}" /><img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></span></li>
+            <li><a href="#" onclick="doPreviewLayoutCode();return false"  class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_preview}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
+            <li><a href="#"  onclick="doResetLayoutCode('{$layout_srl}');return false"  class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_reset}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
+        </ul>
     </form>
 </div>
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index 84a82be50..626872f3d 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -2,96 +2,90 @@
 
 <!--#include("header.html")-->
 
-<div style="margin-bottom:10px;">
-    <table border="1" width="100%">
-    <col width="140" />
+<table cellspacing="0" class="tableType2 gap1">
+<col width="150" />
+<col />
+<tr>
+    <th scope="row">{$lang->layout}</th>
+    <td>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</td>
+</tr>
+<tr>  
+    <th scope="row">{$lang->path}</th>
+    <td>{$selected_layout->path}</td>
+</tr>
+<!--@if($selected_layout->author->homepage)-->
+<tr>  
+    <th scope="row">{$lang->author}</th>
+    <td><a href="#" onclick="window.open('{$selected_layout->author->homepage}');return false;">{$selected_layout->author->name}</a></td>
+</tr>
+<!--@end-->
+<!--@if($selected_layout->author->description)-->
+<tr>  
+    <th scope="row">{$lang->description}</th>
+    <td>{nl2br($selected_layout->author->description)}</td>
+</tr>
+<!--@end-->
+</table>
+
+<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="{$selected_layout->layout}" />
+
+    <table cellspacing="0" class="tableType3 gap1">
+    <col width="150" />
     <col width="*" />
-    <tr>  
-        <th>{$lang->layout}</th>
-        <td>{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</td>
+    <tr>
+        <th scope="row">{$lang->title}</th>
+        <td class="left">
+            <input type="text" name="title" value="{htmlspecialchars($selected_layout->layout_title)}" />
+            <p>{$lang->about_title}</p>
+        </td>
     </tr>
-    <tr>  
-        <th>{$lang->path}</th>
-        <td>{$selected_layout->path}</td>
-    </tr>
-    <!--@if($selected_layout->author->homepage)-->
-    <tr>  
-        <th>{$lang->author}</th>
-        <td><a href="#" onclick="window.open('{$selected_layout->author->homepage}');return false;">{$selected_layout->author->name}</a></td>
+    <!--@foreach($selected_layout->extra_var as $name => $var)-->
+    <tr>
+        <th scope="row">{$var->title}</th>
+
+        <td class="left">
+        <!--@if($var->type == "text")-->
+            <input type="text" name="{$name}" value="{htmlspecialchars($var->value)}"  class="inputTypeTextArea w100"/>
+
+        <!--@elseif($var->type == "textarea")-->
+            <textarea name="{$name}" class="inputTypeTextArea w100">{htmlspecialchars($var->value)}</textarea>
+
+        <!--@elseif($var->type == "select")-->
+            <select name="{$name}">
+                <!--@foreach($var->options as $key => $val)-->
+                <option value="{$key}" <!--@if($key==$var->value)-->selected="true"<!--@end-->>{$val}</option>
+                <!--@end-->
+            </select>
+        <!--@end-->
+            <p>{$var->description}</p>
+        </td>
     </tr>
     <!--@end-->
-    <!--@if($selected_layout->author->description)-->
-    <tr>  
-        <th>{$lang->description}</th>
-        <td>{nl2br($selected_layout->author->description)}</td>
+    <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
+    <tr>
+        <th scope="row">{$menu_info->title}<br />({$menu_name})</th>
+        <td class="left tahoma">
+            <select name="{$menu_name}">
+                <option value="0">------------------------</option>
+                <!--@foreach($menu_list as $key => $val)-->
+                <option value="{$val->menu_srl}" <!--@if($val->menu_srl == $menu_info->menu_srl)-->selected="true"<!--@end-->>{$val->title}</option>
+                <!--@end-->
+            </select>
+
+            <a href="#" onclick="doMenuManagement('{$menu_name}');return false;" class="blue">{$lang->cmd_management}</a>
+        </td>
     </tr>
     <!--@end-->
     </table>
-</div>
 
-<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="{$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($selected_layout->layout_title)}" /></td>
-        </tr>
-        <tr>
-            <td>{$lang->about_title}</td>
-        </tr>
-        <!--@foreach($selected_layout->extra_var as $name => $var)-->
-        <tr>
-            <th rowspan="2">{$var->title}</th>
-            <!--@if($var->type == "text")-->
-            <td><input type="text" name="{$name}" value="{htmlspecialchars($var->value)}" /></td>
-
-            <!--@elseif($var->type == "textarea")-->
-            <td><textarea name="{$name}">{htmlspecialchars($var->value)}</textarea></td>
-
-            <!--@elseif($var->type == "select")-->
-            <td>
-                <select name="{$name}">
-                    <!--@foreach($var->options as $key => $val)-->
-                    <option value="{$key}" <!--@if($key==$var->value)-->selected="true"<!--@end-->>{$val}</option>
-                    <!--@end-->
-                </select>
-            </td>
-            <!--@end-->
-        </tr>
-        <tr>
-            <td>{$var->description}</td>
-        </tr>
+    <ul class="buttonRight">
+        <li><span class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" /><img src="../../admin/tpl/images/iconCreate.gif" width="8" height="4" alt="" class="icon" /><input type="submit" value="{$lang->cmd_save}" /><img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></span></li>
+        <!--@if($module=="admin")-->
+        <li><a href="{getUrl('act','dispLayoutAdminContent')}" class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_list}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
+        <!--@else-->
+        <li><a href="{getUrl('act','')}" class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_back}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
         <!--@end-->
-        <!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
-        <tr>
-            <th>{$menu_info->title}<br />({$menu_name})</th>
-            <td>
-                <select name="{$menu_name}">
-                    <option value="0">------------------------</option>
-                    <!--@foreach($menu_list as $key => $val)-->
-                    <option value="{$val->menu_srl}" <!--@if($val->menu_srl == $menu_info->menu_srl)-->selected="true"<!--@end-->>{$val->title}</option>
-                    <!--@end-->
-                </select>
-                <input type="button" value="{$lang->cmd_management}" onclick="doMenuManagement('{$menu_name}');return false;"/>
-            </td>
-        </tr>
-        <!--@end-->
-        <tr>
-            <td colspan="2" align="center">
-                <!--@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_back}" onclick="location.href='{getUrl('act','')}';return false;"/>
-                <!--@end-->
-                <input type="submit" value="{$lang->cmd_save}" />
-            </td>
-        </tr>
-        </table>
-
-    </form>
-</div>
+    </ul>
+</form>
diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html
index ae789b73a..9765f8389 100644
--- a/modules/page/tpl/page_delete.html
+++ b/modules/page/tpl/page_delete.html
@@ -1,28 +1,31 @@
 <!--%import("filter/delete_page.xml")-->
 <!--%import("js/page_admin.js")-->
+<!--#include("header.html")-->
 
 <form action="./" method="get" onsubmit="return procFilter(this, delete_page)">
 <input type="hidden" name="page" value="{$page}" />
 <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-    <table>
+    <table cellspacing="0" class="tableType4">
+    <col width="150" />
+    <col />
     <tr>
-        <th colspan="2">{$lang->confirm_delete}</th>
+        <th scope="row" colspan="2">{$lang->confirm_delete}</th>
     </tr>
     <tr>
-        <th>{$lang->module_name}</th>
+        <th scope="row">{$lang->module_name}</th>
         <td>{$module_info->mid}</td>
     </tr>
     <tr>
-        <th>{$lang->module}</th>
+        <th scope="row">{$lang->module}</th>
         <td>{$module_info->module}</td>
     </tr>
-    <tr>
-        <td colspan="2">
-            <input type="submit" value="{$lang->cmd_delete}" />
-            <input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','dispPageAdminContent')}'" />
-        </td>
-    </tr>
     </table>
 
+    <ul class="buttonRight">
+        <li><a href="{getUrl('act','dispPageAdminContent')}" class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" />{$lang->cmd_back}<img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></a></li>
+        <li><span class="buttonTypeA"><img src="../../admin/tpl/images/blank.gif" alt="" class="leftCap" /><img src="../../admin/tpl/images/iconCreate.gif" width="8" height="4" alt="" class="icon" /><input type="submit" value="{$lang->cmd_delete}" /><img src="../../admin/tpl/images/blank.gif" alt="" class="rightCap" /></span></li>
+    </ul>
+
+
 </form>