diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index 00971499f..46ce27ddb 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -85,7 +85,7 @@
 
             $source_ftime = filemtime($tpl_file);
             $target_ftime = filemtime($compiled_tpl_file);
-            if($source_ftime>$target_ftime) return $this->_compileTplFile($tpl_file, $compiled_tpl_file);
+            if($source_ftime>$target_ftime || $target_ftime < filemtime('./classes/template/TemplateHandler.class.php') ) return $this->_compileTplFile($tpl_file, $compiled_tpl_file);
         }
 
         /**
@@ -157,6 +157,7 @@
          * @brief {@와 } 안의 @... 함수를 print func(..)로 변경
          **/
         function _compileVarToSilenceExecute($matches) {
+            if(strtolower(trim(str_replace(array(';',' '),'', $matches[1])))=='return') return '<?php return; ?>';
             return '<?php @'.preg_replace('/\$([a-zA-Z0-9\_\-\>]+)/i','$__Context->\\1', trim($matches[1])).';?>';
         }
 
diff --git a/modules/board/skins/xe_guestbook/comment.html b/modules/board/skins/xe_guestbook/comment.html
index 14c2492c5..ea341d2ac 100644
--- a/modules/board/skins/xe_guestbook/comment.html
+++ b/modules/board/skins/xe_guestbook/comment.html
@@ -1,6 +1,7 @@
 <!--@if($oDocument->getCommentCount())-->
 <div class="replyBox">
 
+    <a name="comment_{$comment->comment_srl}"></a>
     {@ $_comment_list = $oDocument->getComments() }
     <!--@foreach($_comment_list as $key => $comment)-->
 
@@ -9,24 +10,6 @@
             <div style="margin-left:{($comment->get('depth')-1)*20}px" class="replyIndent">
             <!--@end-->
 
-            <a name="comment_{$comment->comment_srl}"></a>
-
-            <div class="replyOption">
-                <!--@if($comment->isGranted() || !$comment->get('member_srl'))-->
-                    <a href="{getUrl('act','dispBoardDeleteComment','comment_srl',$comment->comment_srl)}"><img src="./images/common/buttonDeleteX.gif" alt="{$lang->cmd_delete}" width="12" height="13" /></a>
-                    <a href="{getUrl('act','dispBoardModifyComment','comment_srl',$comment->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonModifyE.gif" alt="{$lang->cmd_modify}" width="20" height="17" /></a> 
-                <!--@end-->
-                    <a href="{getUrl('act','dispBoardReplyComment','comment_srl',$comment->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonReply.gif" alt="{$lang->cmd_reply}" width="20" height="17" /></a> 
-            </div>
-
-            <div class="date">
-
-                <strong>{$comment->getRegdate('Y.m.d')}</strong> {$comment->getRegdate('H:i:s')}
-
-                <!--@if($grant->is_admin)-->
-                    ({$comment->get('ipaddress')})
-                <!--@end-->
-            </div>
 
             <div class="author">
             <!--@if(!$comment->member_srl)-->
@@ -40,6 +23,23 @@
             <!--@end-->
             </div>
 
+            <div class="replyOption">
+                <!--@if($comment->isGranted() || !$comment->get('member_srl'))-->
+                    <a href="{getUrl('act','dispBoardDeleteComment','document_srl',$oDocument->document_srl, 'comment_srl',$comment->comment_srl)}"><img src="./images/common/buttonDeleteX.gif" alt="{$lang->cmd_delete}" width="12" height="13" /></a>
+                    <a href="{getUrl('act','dispBoardModifyComment','document_srl',$oDocument->document_srl, 'comment_srl',$comment->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonModifyE.gif" alt="{$lang->cmd_modify}" width="20" height="17" /></a> 
+                <!--@end-->
+                    <a href="{getUrl('act','dispBoardReplyComment','document_srl',$oDocument->document_srl, 'comment_srl',$comment->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonReply.gif" alt="{$lang->cmd_reply}" width="20" height="17" /></a> 
+            </div>
+
+            <div class="date">
+
+                <strong>{$comment->getRegdate('Y.m.d')}</strong> {$comment->getRegdate('H:i:s')}
+
+                <!--@if($grant->is_admin)-->
+                    ({$comment->get('ipaddress')})
+                <!--@end-->
+            </div>
+
             <!--@if($comment->get('voted_count')!=0)-->
             <div class="voted">
                 ({$lang->voted_count}:
diff --git a/modules/board/skins/xe_guestbook/comment_form.html b/modules/board/skins/xe_guestbook/comment_form.html
index ececd1007..c764982b3 100644
--- a/modules/board/skins/xe_guestbook/comment_form.html
+++ b/modules/board/skins/xe_guestbook/comment_form.html
@@ -18,6 +18,24 @@
         </div>
     </div>
 </div>
+<!-- 원글의 댓글을 다는 것이라면 원글을 보여줌 -->
+<!--@elseif($oDocument)-->
+<div class="replyBox">
+    <div class="replyItem">
+        <div class="author"><div class="member_{$oDocument->getMemberSrl()}">{$oDocument->getNickName()}</div></div>
+        <div class="date">
+            {$oDocument->getRegdate("Y.m.d H:i")}
+            <!--@if($grant->is_admin)-->
+                ({$oDocument->get('ipaddress')})
+            <!--@end-->
+        </div>
+        <div class="clear"></div>
+
+        <div class="replyContent gap1">
+            {$oDocument->getContent(false)}
+        </div>
+    </div>
+</div>
 <!--@end-->
 
 <!-- 글쓰기 폼 -->
@@ -31,36 +49,42 @@
 
 <div class="boardWrite commentEditor">
 
-    <div class="userNameAndPw">
-        <!--@if(!$is_logged)-->
-        <label for="userName">{$lang->writer}</label>
-        <input type="text" name="nick_name" value="{$oComment->get('nick_name')}" class="userName inputTypeText" id="userName"/>
-
-        <label for="userPw">{$lang->password}</label>
-        <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
-
-        <label for="emailAddress">{$lang->email_address}</label>
-        <input type="text" name="email_address" value="{htmlspecialchars($oComment->get('email_address'))}" id="emailAddress" class="emailAddress inputTypeText"/>
-
-        <label for="homePage">{$lang->homepage}</label>
-        <input type="text" name="homepage" value="{htmlspecialchars($oComment->get('homepage'))}" id="homePage" class="homePage inputTypeText"/>
-        <!--@else-->
-        <input type="checkbox" name="notify_message" value="Y" <!--@if($oComment->useNotify())-->checked="checked"<!--@end--> id="notify_message" />
-        <label for="notify_message">{$lang->notify}</label>
+    <!--@if(!$is_logged)-->
+        <div class="inputItem">
+            <input type="text" name="nick_name" value="{$oComment->get('nick_name')}" class="userName inputTypeText" id="userName"/>
+            <label for="userName">{$lang->writer}</label>
+        </div>
+        <div class="inputItem">
+            <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
+            <label for="userPw">{$lang->password}</label>
+        </div>
+        <div class="inputItem">
+            <input type="text" name="email_address" value="{htmlspecialchars($oComment->get('email_address'))}" id="emailAddress" class="emailAddress inputTypeText"/>
+            <label for="emailAddress">{$lang->email_address}</label>
+        </div>
+        <div class="inputItem">
+            <input type="text" name="homepage" value="{htmlspecialchars($oComment->get('homepage'))}" id="homePage" class="homePage inputTypeText"/>
+            <label for="homePage">{$lang->homepage}</label>
+        </div>
+    <!--@end-->
+    <div class="inputItem">
+        <!--@if($is_logged)-->
+            <input type="checkbox" name="notify_message" value="Y" <!--@if($oComment->useNotify())-->checked="checked"<!--@end--> id="notify_message" />
+            <label for="notify_message">{$lang->notify}</label>
         <!--@end-->
-
         <input type="checkbox" name="is_secret" value="Y" <!--@if($oComment->isSecret())-->checked="checked"<!--@end--> id="is_secret" />
         <label for="is_secret">{$lang->secret}</label>
     </div>
 
     <div class="editor">{$oComment->getEditor()}</div>
-</div>
 
-<div class="commentButton tRight">
-    <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'"/></span>
-    <span class="button"><input type="submit" value="{$lang->cmd_comment_registration}" accesskey="s" /></span>
-</div>
+    <div class="commentButton tRight">
+        <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'"/></span>
+        <span class="button"><input type="submit" value="{$lang->cmd_comment_registration}" accesskey="s" /></span>
+    </div>
 
+</div>
+<div class="clear"></div>
 </form>
 
 <!--#include("footer.html")-->
diff --git a/modules/board/skins/xe_guestbook/css/common.css b/modules/board/skins/xe_guestbook/css/common.css
index 78beca3fa..ef670709a 100644
--- a/modules/board/skins/xe_guestbook/css/common.css
+++ b/modules/board/skins/xe_guestbook/css/common.css
@@ -44,14 +44,17 @@ Jeong, Chan Myeong 070601~070630
 .blogNotice .item .replyAndTrackback { color:#AAAAAA; font-size:.9em; }
 
 /* boardRead */
-.viewDocument { border:1px solid #e0e1db; padding:10px; border-bottom:2px solid #AAAAAA; margin-bottom:20px; }
+.viewDocument { border:1px solid #e0e1db; margin-bottom:20px; overflow:hidden;}
 
+.boardRead { padding:10px; }
 .boardRead .contentInfo .userInfo { float:left; white-space:nowrap; }
 .boardRead .contentInfo .userInfo .author { color:#3074a5; }
 .boardRead .contentInfo .userInfo .author a { color:#3074a5; text-decoration:none; }
 
 .boardRead .contentInfo { clear:both; white-space:nowrap; color:#444444; float:left; font-size:.9em; font-family:tahoma; line-height:17px; padding-bottom:10px; width:100%;}
-.boardRead .contentInfo .date { float:right; background:url("../images/common/calendar.gif") no-repeat left top; padding-left:18px; margin-left:10px; }
+.boardRead .contentInfo .date { font:.8em Tahoma; color:#cccccc; float:right; margin-top:3px; }
+.boardRead .contentInfo .replyOption { height:20px; float:right; white-space:nowrap; margin-left:.2em;}
+.boardRead .contentInfo .replyOption img { vertical-align:middle;}
 
 /* extraVars list */
 .boardRead .extraVarsList { width:100%; border:1px solid #e0e1db; border-bottom:none; margin:0 0 5px 0; table-layout:fixed;}
@@ -60,7 +63,6 @@ Jeong, Chan Myeong 070601~070630
 .boardRead .extraVarsList td a { color:#555555; }
 
 .boardRead .readBody { color:#555555; }
-.boardRead .readBody .contentBody .ipaddress { text-align:right; margin-top:10px; color:#bbbbbb; font-family:tahoma;}
 
 .boardRead .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px;}
 .boardRead .fileAttached ul { margin:0; padding:0; }
@@ -71,19 +73,9 @@ Jeong, Chan Myeong 070601~070630
 
 .boardRead .contentButton { text-align:right;padding-top:10px;}
 
-.trackbackBox { padding:.6em .6em; color:#666666; border:1px solid #e0e1db;;margin-top:.5em; }
-.trackbackBox .trackbackUrl { color:#1F3DAE; font-size:.9em; background:url("../images/common/iconTrackback.gif") no-repeat left top; padding-left:18px; margin:0 0 3px 10px; }
-.trackbackBox .trackbackItem { background-color:#F3F3F3; padding:.6em .8em .6em .6em; line-height:1.25em; border-top:1px dotted #EEEEEE; list-style:none;}
-.trackbackBox p { display:inline; margin-bottom:1em;}
-.trackbackBox a { color:#666666; text-decoration:none;}
-.trackbackBox div  { clear:both; }
-.trackbackBox address { display:block; padding:0 .3em 0 0; }
-.trackbackBox address a { font-size:.9em; color:#3074a5; margin-right:.3em; float:left;}
-.trackbackBox address .date { font:.8em Tahoma; color:#cccccc; float:right;}
-
-.replyBox { color:#666666; border-top:1px solid #e0e1db; margin-top:.5em;}
-.replyBox .replyItem { background-color:#FFFFFF; padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
-.replyBox p { display:inline; margin-bottom:1em;}
+.replyBox { color:#666666; margin-top:10px;}
+.replyBox .replyItem { background-color:#FFFFFF; padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; list-style:none;  border-top:1px solid #e0e1db;}
+.replyBox p { margin:0; padding:0; display:inline; margin-bottom:1em;}
 .replyBox .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
 .replyBox .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
 .replyBox .voted { float:left; font-size:.9em; color:#AAAAAA; margin:0 .3em .5em 1em;}
@@ -93,8 +85,8 @@ Jeong, Chan Myeong 070601~070630
 .replyBox .replyOption img { vertical-align:middle;}
 
 .replyBox .replyContent { clear:left; }
-.replyBox .replyContent p { display:block; }
-.replyBox .reply { background-color:#F4F4F4; border-bottom:1px dotted #DDDDDD;}
+.replyBox .replyContent p { margin:0; padding:0; display:block; }
+.replyBox .reply { background-color:#F4F4F4;  border-top:1px dotted #e0e1db; }
 .replyBox .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
 
 .replyBox .fileAttached { border:1px solid #EFEFEF; background-color:#F4F4F4; padding:5px; margin-top:10px;}
@@ -224,23 +216,24 @@ Jeong, Chan Myeong 070601~070630
 
 /* boardWrite */
 .boardEditor { margin-bottom:10px; }
-.commentEditor { margin-top:10px; }
+.commentEditor { margin-top:10px; clear:both; }
+
 .boardWrite { border:1px solid #e0e1db; padding-bottom:10px;}
 .boardWrite fieldset { border:none; }
-.boardWrite .userNameAndPw { margin:10px 10px 0 10px; }
-.boardWrite .userNameAndPw .userName {width:60px; margin-right:10px; }
-.boardWrite .userNameAndPw .userPw {width:60px; margin-right:10px; }
-.boardWrite .userNameAndPw .emailAddress {width:60px; margin-right:10px; }
-.boardWrite .userNameAndPw .homePage {width:60px; margin-right:10px; }
+.boardWrite .inputItem { margin:10px 10px 0 10px; }
+.boardWrite .inputItem .userName {width:220px; margin-right:10px; }
+.boardWrite .inputItem .userPw {width:220px; margin-right:10px; }
+.boardWrite .inputItem .emailAddress {width:220px; margin-right:10px; }
+.boardWrite .inputItem .homePage {width:220px; margin-right:10px; }
 
 .boardWrite .title { margin-top:5px; }
 .boardWrite .title .category { margin-left:10px; }
-.boardWrite .title label.title { margin:0 10px 0 10px; }
+.boardWrite .title label.title { padding:0; margin:0 10px 0 10px; }
 .boardWrite .title input.title { width:60%;}
 
 .boardWrite dl.option { margin:10px 0 3px 10px; padding:0;}
-.boardWrite dl.option dd { display:inline; margin-right:5px; }
-.boardWrite dl.option dd * { vertical-align:middle;}
+.boardWrite dl.option dd { padding:0; margin:0; display:inline; margin-right:5px; }
+.boardWrite dl.option dd * { padding:0; margin:0; vertical-align:middle;}
 .boardWrite dl.option dd select { width:8em; font-size:.95em; }
 
 .boardWrite .tag { margin-top:10px; margin-left:10px; }
@@ -281,3 +274,5 @@ h5 { padding:2px; }
 .tags .tagTypeD a { font-weight:bold; margin:0; background-color:#EFEFEF;}
 .tags .tagTypeE a { font-weight:normal; margin:0;}
 
+
+.listWrite { margin-bottom:20px; }
diff --git a/modules/board/skins/xe_guestbook/input_password_form.html b/modules/board/skins/xe_guestbook/input_password_form.html
index 0f935eb92..2617d680b 100644
--- a/modules/board/skins/xe_guestbook/input_password_form.html
+++ b/modules/board/skins/xe_guestbook/input_password_form.html
@@ -1,6 +1,7 @@
 <!--%import("filter/input_password.xml")-->
 <!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
+sadf
 <div class="smallBox w400">
 
     <div class="header">
diff --git a/modules/board/skins/xe_guestbook/js/board.js b/modules/board/skins/xe_guestbook/js/board.js
index f23633952..6b4d69475 100644
--- a/modules/board/skins/xe_guestbook/js/board.js
+++ b/modules/board/skins/xe_guestbook/js/board.js
@@ -14,9 +14,9 @@ function completeDocumentInserted(ret_obj) {
 
     //alert(message);
 
-    var url = current_url.setQuery('mid',mid).setQuery('act','');
+    var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl','').setQuery('rnd',document_srl);
     if(category_srl) url = url.setQuery('category',category_srl);
-    location.href = url;
+    location.href = url+'#document_'+document_srl;
 }
 
 /* 글 삭제 */
@@ -62,7 +62,7 @@ function completeInsertComment(ret_obj) {
     var document_srl = ret_obj['document_srl'];
     var comment_srl = ret_obj['comment_srl'];
 
-    var url = current_url.setQuery('mid',mid).setQuery('act','');
+    var url = current_url.setQuery('mid',mid).setQuery('act','').setQuery('document_srl','');
     if(comment_srl) url = url.setQuery('rnd',comment_srl)+"#comment_"+comment_srl;
 
     //alert(message);
@@ -78,12 +78,12 @@ function completeDeleteComment(ret_obj) {
     var document_srl = ret_obj['document_srl'];
     var page = ret_obj['page'];
 
-    var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act','');
+    var url = current_url.setQuery('mid',mid).setQuery('document_srl','').setQuery('act','').setQuery('rnd',document_srl);
     if(page) url = url.setQuery('page',page);
 
     //alert(message);
 
-    location.href = url;
+    location.href = url+'#document_'+document_srl;
 }
 
 /* 트랙백 삭제 */
@@ -94,7 +94,7 @@ function completeDeleteTrackback(ret_obj) {
     var document_srl = ret_obj['document_srl'];
     var page = ret_obj['page'];
 
-    var url = current_url.setQuery('mid',mid).setQuery('document_srl',document_srl).setQuery('act','');
+    var url = current_url.setQuery('mid',mid).setQuery('document_srl','').setQuery('act','');
     if(page) url = url.setQuery('page',page);
 
     //alert(message);
diff --git a/modules/board/skins/xe_guestbook/list.html b/modules/board/skins/xe_guestbook/list.html
index f4165bf06..dd080c4a8 100644
--- a/modules/board/skins/xe_guestbook/list.html
+++ b/modules/board/skins/xe_guestbook/list.html
@@ -5,43 +5,31 @@
     <!--%import("filter/search.xml")-->
 
 <!-- 선택된 게시물이 있고 권한이 있으면 내용 출력 -->
+    
+<!-- 글 쓰기 폼 출력 -->
+    <!--@if(!$oDocument->isExists())-->
+        <div class="listWrite">
+        <!--#include("write_form.html")-->
+        </div>
+    <!--@end-->
 
     <!--@if($grant->list)-->
         <!-- 공지사항 -->
         <!--@if($notice_list)-->
-            <div class="blogNotice">
-            <!--@foreach($notice_list as $no => $document)-->
-                <div class="item">
-                    <span class="date">[{$document->getRegdate("Y-m-d")}]</span>
-                    <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getContentText(20)}</a>
-
-                    <!--@if($document->getCommentCount())-->
-                        <span class="replyAndTrackback" title="Replies"><img src="./images/common/iconReply.gif" alt="" width="12" height="12" class="icon" /> <strong>{$document->getCommentCount()}</strong></span>
-                    <!--@end-->
-
-                    <!--@if($document->getTrackbackCount())-->
-                        <span class="replyAndTrackback" title="Trackbacks"><img src="./images/common/iconTrackback.gif" alt="" width="12" height="13" class="trackback icon" /> <strong>{$document->getTrackbackCount()}</strong></span>
-                    <!--@end-->
-
-                    {$document->printExtraImages(60*60*$module_info->duration_new)}
+            <!--@foreach($notice_list as $no => $oDocument)-->
+                <div class="viewDocument">
+                <!--#include("./view_document.html")-->
+                <div class="clear"></div>
                 </div>
             <!--@end-->
-            </div>
-        <!--@end-->
-
-        <!--@if($oDocument->isExists())-->
-        <div class="viewDocument">
-        <!--#include("./view_document.html")-->
-        </div>
         <!--@end-->
 
         <!-- 일반글 -->
         <!--@foreach($document_list as $no => $oDocument)-->
-            <!--@if($oDocument->document_srl != $document_srl)-->
-                <div class="viewDocument">
-                <!--#include("./view_document.html")-->
-                </div>
-            <!--@end-->
+            <div class="viewDocument">
+            <!--#include("./view_document.html")-->
+            <div class="clear"></div>
+            </div>
         <!--@end-->
     <!--@end-->
 
diff --git a/modules/board/skins/xe_guestbook/skin.xml b/modules/board/skins/xe_guestbook/skin.xml
index 46d9f2b21..8b363a574 100644
--- a/modules/board/skins/xe_guestbook/skin.xml
+++ b/modules/board/skins/xe_guestbook/skin.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
-    <title xml:lang="ko">방명록 기본 스킨</title>
-	<title xml:lang="zh-CN">留言本默认皮肤</title>
-    <title xml:lang="jp">ゲストブックのデフォルトスキン</title>
-	<title xml:lang="en">Zeroboard XE Basic Guestbook Skin</title>
+    <title xml:lang="ko">zbXE 방명록 기본 스킨</title>
+	<title xml:lang="zh-CN">zbXE 留言本默认皮肤</title>
+    <title xml:lang="jp">zbXE ゲストブックのデフォルトスキン</title>
+	<title xml:lang="en">zbXE Basic Guestbook Skin</title>
     <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2008. 2. 28">
         <name xml:lang="ko">제로</name>
         <name xml:lang="zh-CN">Zero</name>
         <name xml:lang="jp">Zero</name>
 		<name xml:lang="en">Zero</name>
-        <description xml:lang="ko">board모듈의 default스킨</description>
+        <description xml:lang="ko">board모듈의 기본 방명록 스킨</description>
         <description xml:lang="zh-CN">留言本模块的默认皮肤。</description>
         <description xml:lang="jp">ボード（board）モジュールのデフォルトスキンです。</description>
 		<description xml:lang="en">This is the basic guestbook skin of Zeroboard XE.</description>
diff --git a/modules/board/skins/xe_guestbook/view_document.html b/modules/board/skins/xe_guestbook/view_document.html
index d073ff0b9..ff8518884 100644
--- a/modules/board/skins/xe_guestbook/view_document.html
+++ b/modules/board/skins/xe_guestbook/view_document.html
@@ -19,9 +19,19 @@
                     <!--@end-->
                 </div>
                 <!--@end-->
+                <div class="replyOption">
+                    <!--@if($oDocument->isEditable())-->
+                    <a href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl, 'comment_srl','')}"><img src="./images/common/buttonDeleteX.gif" alt="{$lang->cmd_delete}" width="12" height="13" /></a>
+                    <a href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl, 'comment_srl','')}"><img src="./images/{$module_info->colorset}/buttonModifyE.gif" alt="{$lang->cmd_modify}" width="20" height="17" /></a> 
+                    <!--@end-->
+                    <a href="{getUrl('act','dispBoardWriteComment','document_srl',$oDocument->document_srl, 'comment_srl',0)}"><img src="./images/{$module_info->colorset}/buttonReply.gif" alt="{$lang->cmd_reply}" width="20" height="17" /></a> 
+                </div>
 
                 <div class="date" title="{$lang->regdate}">
                     <strong>{$oDocument->getRegdate('Y.m.d')}</strong> {$oDocument->getRegdate('H:i:s')}
+                    <!--@if($grant->is_admin)-->
+                    ({$oDocument->get('ipaddress')})
+                    <!--@end-->
                 </div>
 
                 <div class="clear"></div>
@@ -52,6 +62,7 @@
 
         <div class="readBody">
             <div class="contentBody">
+                <a name="document_{$oDocument->document_srl}" />
 
                 <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
                     <!--%import("filter/input_password.xml")-->
@@ -69,10 +80,6 @@
                 <!--@else-->
                     {$oDocument->getContent(false,false)}
                 <!--@end-->
-
-                <!--@if($grant->is_admin)-->
-                <div class="ipaddress">ipaddress : {$oDocument->get('ipaddress')}</div>
-                <!--@end-->
             </div>
         </div>
 
@@ -88,18 +95,8 @@
         </div>
         <!--@end-->
     </div>
-
-    <!-- 목록, 수정/삭제 버튼 --> 
-    <div class="contentButton">
-        <a href="{getUrl('act','dispBoardWriteComment','document_srl',$oDocument->document_srl,'comment_srl','0')}" class="button"><span>{$lang->cmd_reply}</span></a>
-        <!--@if($oDocument->isEditable())-->
-        <a href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}" class="button"><span>{$lang->cmd_modify}</span></a>
-        <a href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}" class="button"><span>{$lang->cmd_delete}</span></a>
-        <!--@end-->
-    </div>
-
-    <!-- 댓글 -->
-    <a name="comment"></a>
-    <!--#include("./comment.html")-->
-
 </div>
+
+<!-- 댓글 -->
+<!--#include("./comment.html")-->
+
diff --git a/modules/board/skins/xe_guestbook/write_form.html b/modules/board/skins/xe_guestbook/write_form.html
index c7a66a096..08ead726f 100644
--- a/modules/board/skins/xe_guestbook/write_form.html
+++ b/modules/board/skins/xe_guestbook/write_form.html
@@ -1,102 +1,104 @@
-<!--%import("filter/insert.xml")-->
-<!--#include("header.html")-->
+<!--@if($act=="dispBoardWrite")-->
+    <!--#include("header.html")-->
+<!--@end-->
 
+<!--%import("filter/insert.xml")-->
 <form action="./" method="post" onsubmit="return procFilter(this, window.insert)" id="fo_write">
 <input type="hidden" name="mid" value="{$mid}" />
 <input type="hidden" name="content" value="{$oDocument->getContentText()}" />
 <input type="hidden" name="document_srl" value="{$document_srl}" />
 
-<div class="boardWrite">
-    <!--@if(!$is_logged)-->
-    <div class="userNameAndPw">
-        <label for="userName">{$lang->writer}</label>
-        <input type="text" name="nick_name" value="{$oDocument->getNickName()}" class="userName inputTypeText" id="userName"/>
+    <div class="boardWrite">
+        <!--@if(!$is_logged)-->
+        <div class="inputItem">
+            <input type="text" name="nick_name" value="{$oDocument->getNickName()}" class="userName inputTypeText" id="userName"/>
+            <label for="userName">{$lang->writer}</label>
+        </div>
+        <div class="inputItem">
+            <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
+            <label for="userPw">{$lang->password}</label>
+        </div>
+        <div class="inputItem">
+            <input type="text" name="email_address" value="{htmlspecialchars($oDocument->get('email_address'))}" id="emailAddress" class="emailAddress inputTypeText"/>
+            <label for="emailAddress">{$lang->email_address}</label>
+        </div>
+        <div class="inputItem">
+            <input type="text" name="homepage" value="{htmlspecialchars($oDocument->get('homepage'))}" id="homePage" class="homePage inputTypeText"/>
+            <label for="homePage">{$lang->homepage}</label>
+        </div>
+        <!--@end-->
 
-        <label for="userPw">{$lang->password}</label>
-        <input type="password" name="password" value="" id="userPw" class="userPw inputTypeText" />
+        <dl class="option">
+            <!--@if($grant->manager)-->
+            {@ $_color = array('555555','222288','226622','2266EE','8866CC','88AA66','EE2222','EE6622','EEAA22','EEEE22') }
+            <dd><select name="title_color" id="title_color" <!--@if($oDocument->get('title_color'))-->style="background-color:#{$oDocument->get('title_color')};"<!--@end--> onchange="this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor;">
+                    <option value="" style="background-color:#FFFFFF;">{$lang->title_color}</option>
+                    <!--@foreach($_color as $_col)-->
+                    <option value="{$_col}" style="background-color:#{$_col}" <!--@if($oDocument->get('title_color')==$_col)-->selected="selected"<!--@end-->>{$lang->title_color}</option>
+                    <!--@end-->
+                </select></dd>
+            <dd>
+                <input type="checkbox" name="title_bold" id="title_bold" value="Y" <!--@if($oDocument->get('title_bold')=='Y')-->checked="checked"<!--@end--> />
+                <label for="title_bold">{$lang->title_bold}</label>
+            </dd>
+            <dd>
+                <input type="checkbox" name="is_notice" value="Y" <!--@if($oDocument->isNotice())-->checked="checked"<!--@end--> id="is_notice" />
+                <label for="is_notice">{$lang->notice}</label>
+            </dd>
+            <dd>
+                <input type="checkbox" name="lock_comment" value="Y" <!--@if($oDocument->isLocked())-->checked="checked"<!--@end--> id="lock_comment" />
+                <label for="lock_comment">{$lang->lock_comment}</label>
+            </dd>
+            <!--@end-->
+            <dd>
+                <input type="checkbox" name="is_secret" value="Y" <!--@if($oDocument->isSecret())-->checked="checked"<!--@end--> id="is_secret" />
+                <label for="is_secret">{$lang->secret}</label>
+            </dd>
+            <dd>
+                <input type="checkbox" name="allow_comment" value="Y" <!--@if($oDocument->allowComment())-->checked="checked"<!--@end--> id="allow_comment" />
+                <label for="allow_comment">{$lang->allow_comment}</label>
+            </dd>
+            <!--@if($is_logged)-->
+            <dd>
+                <input type="checkbox" name="notify_message" value="Y" <!--@if($oDocument->useNotify())-->checked="checked"<!--@end--> id="notify_message" />
+                <label for="notify_message">{$lang->notify}</label>
+            </dd>
+            <!--@end-->
+        </dl>
 
-        <label for="emailAddress">{$lang->email_address}</label>
-        <input type="text" name="email_address" value="{htmlspecialchars($oDocument->get('email_address'))}" id="emailAddress" class="emailAddress inputTypeText"/>
+        <!--@if($module_info->extra_vars)-->
+        <table cellspacing="0" summary="" class="extraVarsList">
+        <col width="150" />
+        <col />
+        <!--@foreach($module_info->extra_vars as $key => $val)-->
+            <!--@if($val->name)-->
+        <tr>
+            <th scope="row">{$val->name} <!--@if($val->is_required=='Y')-->*<!--@end--></th>
+            <td><!--#include("./extra_var_form.html")--></td>
+        </tr>
+            <!--@end-->
+        <!--@end-->
+        </table>
+        <!--@end-->
+
+        <div class="editor">{$oDocument->getEditor()}</div>
+
+        <div class="fl gap1">
+            &nbsp;
+            <!--@if($is_logged)-->
+            <span class="button"><input type="button" value="{$lang->cmd_temp_save}"  onclick="doDocumentSave(this); return false;" /></span>
+            <span class="button"><input type="button" value="{$lang->cmd_load}"  onclick="doDocumentLoad(this); return false;" /></span>
+            <!--@end-->
+            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'" /></span>
+            <span class="button"><input type="button" value="{$lang->cmd_preview}" onclick="doDocumentPreview(this); return false;" /></span>
+            <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+        </div>
+
+        <div class="clear"></div>
 
-        <label for="homePage">{$lang->homepage}</label>
-        <input type="text" name="homepage" value="{htmlspecialchars($oDocument->get('homepage'))}" id="homePage" class="homePage inputTypeText"/>
     </div>
-    <!--@end-->
-
-    <dl class="option">
-        <!--@if($grant->manager)-->
-        {@ $_color = array('555555','222288','226622','2266EE','8866CC','88AA66','EE2222','EE6622','EEAA22','EEEE22') }
-        <dd><select name="title_color" id="title_color" <!--@if($oDocument->get('title_color'))-->style="background-color:#{$oDocument->get('title_color')};"<!--@end--> onchange="this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor;">
-                <option value="" style="background-color:#FFFFFF;">{$lang->title_color}</option>
-                <!--@foreach($_color as $_col)-->
-                <option value="{$_col}" style="background-color:#{$_col}" <!--@if($oDocument->get('title_color')==$_col)-->selected="selected"<!--@end-->>{$lang->title_color}</option>
-                <!--@end-->
-            </select></dd>
-        <dd>
-            <input type="checkbox" name="title_bold" id="title_bold" value="Y" <!--@if($oDocument->get('title_bold')=='Y')-->checked="checked"<!--@end--> />
-            <label for="title_bold">{$lang->title_bold}</label>
-        </dd>
-        <dd>
-            <input type="checkbox" name="is_notice" value="Y" <!--@if($oDocument->isNotice())-->checked="checked"<!--@end--> id="is_notice" />
-            <label for="is_notice">{$lang->notice}</label>
-        </dd>
-        <dd>
-            <input type="checkbox" name="lock_comment" value="Y" <!--@if($oDocument->isLocked())-->checked="checked"<!--@end--> id="lock_comment" />
-            <label for="lock_comment">{$lang->lock_comment}</label>
-        </dd>
-        <!--@end-->
-        <dd>
-            <input type="checkbox" name="is_secret" value="Y" <!--@if($oDocument->isSecret())-->checked="checked"<!--@end--> id="is_secret" />
-            <label for="is_secret">{$lang->secret}</label>
-        </dd>
-        <dd>
-            <input type="checkbox" name="allow_comment" value="Y" <!--@if($oDocument->allowComment())-->checked="checked"<!--@end--> id="allow_comment" />
-            <label for="allow_comment">{$lang->allow_comment}</label>
-        </dd>
-        <dd>
-            <input type="checkbox" name="allow_trackback" value="Y" <!--@if($oDocument->allowTrackback())-->checked="checked"<!--@end--> id="allow_trackback" />
-            <label for="allow_trackback">{$lang->allow_trackback}</label>
-        </dd>
-        <!--@if($is_logged)-->
-        <dd>
-            <input type="checkbox" name="notify_message" value="Y" <!--@if($oDocument->useNotify())-->checked="checked"<!--@end--> id="notify_message" />
-            <label for="notify_message">{$lang->notify}</label>
-        </dd>
-        <!--@end-->
-    </dl>
-
-    <!--@if($module_info->extra_vars)-->
-    <table cellspacing="0" summary="" class="extraVarsList">
-    <col width="150" />
-    <col />
-    <!--@foreach($module_info->extra_vars as $key => $val)-->
-        <!--@if($val->name)-->
-    <tr>
-        <th scope="row">{$val->name} <!--@if($val->is_required=='Y')-->*<!--@end--></th>
-        <td><!--#include("./extra_var_form.html")--></td>
-    </tr>
-        <!--@end-->
-    <!--@end-->
-    </table>
-    <!--@end-->
-
-    <div class="editor">{$oDocument->getEditor()}</div>
-
-</div>
-
-    <div class="fl gap1">
-        <!--@if($is_logged)-->
-        <span class="button"><input type="button" value="{$lang->cmd_temp_save}"  onclick="doDocumentSave(this); return false;" /></span>
-        <span class="button"><input type="button" value="{$lang->cmd_load}"  onclick="doDocumentLoad(this); return false;" /></span>
-        <!--@end-->
-    </div>
-
-    <div class="fr gap1">
-        <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href='{getUrl('act','')}'" /></span>
-        <span class="button"><input type="button" value="{$lang->cmd_preview}" onclick="doDocumentPreview(this); return false;" /></span>
-        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-    </div>
-
-    <div class="clear"></div>
 </form>
-<!--#include("footer.html")-->
+
+<!--@if($act=="dispBoardWrite")-->
+    <!--#include("footer.html")-->
+<!--@end-->