diff --git a/adm/admin.js b/adm/admin.js
index 7e1671082..5f3999fd9 100644
--- a/adm/admin.js
+++ b/adm/admin.js
@@ -44,3 +44,15 @@ function btn_check(f, act)
 
     f.submit();
 }
+
+function is_checked(elements_name) 
+{
+    var checked = false;
+    var chk = document.getElementsByName(elements_name);
+    for (var i=0; i<chk.length; i++) {
+        if (chk[i].checked) {
+            checked = true;
+        }
+    }
+    return checked;
+}
diff --git a/adm/board_list.php b/adm/board_list.php
index f16b7b308..4f631fd18 100644
--- a/adm/board_list.php
+++ b/adm/board_list.php
@@ -85,7 +85,7 @@ var list_delete_php = 'board_list_delete.php';
 </div>
 <?}?>
 
-<form id="fboardlist" name="fboardlist" method="post">
+<form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
 <input type="hidden" name="sst" value="<?=$sst?>">
 <input type="hidden" name="sod" value="<?=$sod?>">
 <input type="hidden" name="sfl" value="<?=$sfl?>">
@@ -183,13 +183,17 @@ if ($i == 0)
 </table>
 
 <div class="btn_list">
-    <button onclick="btn_check(this.form, 'update')">선택수정</button>
+    <input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택수정">
     <?if ($is_admin == 'super') {?>
-    <button onclick="btn_check(this.form, 'delete')">선택삭제</button>
+    <input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택삭제">
     <a href="./board_form.php">게시판추가</a>
     <?}?>
 </div>
 
+<noscript>
+<p>자바스크립트를 사용하지 않는 경우<br>별도의 확인 절차 없이 바로 선택수정 및 선택삭제 처리하므로 주의하시기 바랍니다.</p>
+</noscript>
+
 <?
 $pagelist = get_paging($config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page=');
 ?>
@@ -204,6 +208,16 @@ if (isset($stx))
 </form>
 
 <script>
+function fboardlist_submit(f)
+{
+    if (!is_checked("chk[]")) {
+        alert(document.pressed+" 하실 항목을 하나 이상 선택하세요.");
+        return false;
+    }
+
+    return true;
+}
+
 function board_copy(bo_table) {
     window.open("./board_copy.php?bo_table="+bo_table, "BoardCopy", "left=10,top=10,width=500,height=200");
 }
diff --git a/adm/board_list_update.php b/adm/board_list_update.php
index 64dab2d7b..e8ca8cf0f 100644
--- a/adm/board_list_update.php
+++ b/adm/board_list_update.php
@@ -4,35 +4,65 @@ include_once('./_common.php');
 
 check_demo();
 
-auth_check($auth[$sub_menu], 'w');
+if (!count($_POST['chk'])) {
+    alert($_POST['btn_submit']." 하실 항목을 하나 이상 선택하세요.");
+}
 
-for ($i=0; $i<count($_POST['chk']); $i++) {
+if ($_POST['btn_submit'] == "선택수정") {
 
-    // 실제 번호를 넘김
-    $k = $_POST['chk'][$i];
+    auth_check($auth[$sub_menu], 'w');
 
-    if ($is_admin != 'super') {
-        $sql = " select count(*) as cnt from {$g4['board_table']} a, {$g4['group_table']} b
-                  where a.gr_id = '{$_POST['gr_id'][$k]}'
-                    and a.gr_id = b.gr_id
-                    and b.gr_admin = '{$member['mb_id']}' ";
-        $row = sql_fetch($sql);
-        if (!$row['cnt'])
-            alert('최고관리자가 아닌 경우 다른 관리자의 게시판('.$board_table[$k].')은 수정이 불가합니다.');
+    for ($i=0; $i<count($_POST['chk']); $i++) {
+
+        // 실제 번호를 넘김
+        $k = $_POST['chk'][$i];
+
+        if ($is_admin != 'super') {
+            $sql = " select count(*) as cnt from {$g4['board_table']} a, {$g4['group_table']} b
+                      where a.gr_id = '{$_POST['gr_id'][$k]}'
+                        and a.gr_id = b.gr_id
+                        and b.gr_admin = '{$member['mb_id']}' ";
+            $row = sql_fetch($sql);
+            if (!$row['cnt'])
+                alert('최고관리자가 아닌 경우 다른 관리자의 게시판('.$board_table[$k].')은 수정이 불가합니다.');
+        }
+
+        $sql = " update {$g4['board_table']}
+                    set gr_id               = '{$_POST['gr_id'][$k]}',
+                        bo_subject          = '{$_POST['bo_subject'][$k]}',
+                        bo_skin             = '{$_POST['bo_skin'][$k]}',
+                        bo_read_point       = '{$_POST['bo_read_point'][$k]}',
+                        bo_write_point      = '{$_POST['bo_write_point'][$k]}',
+                        bo_comment_point    = '{$_POST['bo_comment_point'][$k]}',
+                        bo_download_point   = '{$_POST['bo_download_point'][$k]}',
+                        bo_use_search       = '{$_POST['bo_use_search'][$k]}',
+                        bo_order_search     = '{$_POST['bo_order_search'][$k]}'
+                  where bo_table            = '{$_POST['board_table'][$k]}' ";
+        sql_query($sql);
     }
 
-    $sql = " update {$g4['board_table']}
-                set gr_id               = '{$_POST['gr_id'][$k]}',
-                    bo_subject          = '{$_POST['bo_subject'][$k]}',
-                    bo_skin             = '{$_POST['bo_skin'][$k]}',
-                    bo_read_point       = '{$_POST['bo_read_point'][$k]}',
-                    bo_write_point      = '{$_POST['bo_write_point'][$k]}',
-                    bo_comment_point    = '{$_POST['bo_comment_point'][$k]}',
-                    bo_download_point   = '{$_POST['bo_download_point'][$k]}',
-                    bo_use_search       = '{$_POST['bo_use_search'][$k]}',
-                    bo_order_search     = '{$_POST['bo_order_search'][$k]}'
-              where bo_table            = '{$_POST['board_table'][$k]}' ";
-    sql_query($sql);
+} else if ($_POST['btn_submit'] == "선택삭제") {
+
+    if ($is_admin != 'super')
+        alert('게시판 삭제는 최고관리자만 가능합니다.');
+
+    auth_check($auth[$sub_menu], 'd');
+
+    check_token();
+
+    // _BOARD_DELETE_ 상수를 선언해야 board_delete.inc.php 가 정상 작동함
+    define("_BOARD_DELETE_", TRUE);
+
+    for ($i=0; $i<count($_POST['chk']); $i++) {
+        // 실제 번호를 넘김
+        $k = $_POST['chk'][$i];
+
+        // include 전에 $bo_table 값을 반드시 넘겨야 함
+        $tmp_bo_table = escape_trim($_POST['board_table'][$k]);
+        include ('./board_delete.inc.php');
+    }
+
+
 }
 
 goto_url('./board_list.php?'.$qstr);
diff --git a/bbs/gcaptcha/gcaptcha.js b/bbs/gcaptcha/gcaptcha.js
index 10ffd978c..4950778fb 100644
--- a/bbs/gcaptcha/gcaptcha.js
+++ b/bbs/gcaptcha/gcaptcha.js
@@ -33,7 +33,6 @@ $(function() {
             $("#captcha_key").focus();//이미지 새로고침 후 입력박스에 포커스 : 지운아빠 2012-07-13
         }
     })
-    .css("cursor", "pointer")
     .trigger("click");
 
     $("#captcha_wav").click(function(){
diff --git a/bbs/gcaptcha/gcaptcha.lib.php b/bbs/gcaptcha/gcaptcha.lib.php
index 3a9d6c6f0..90e12a582 100644
--- a/bbs/gcaptcha/gcaptcha.lib.php
+++ b/bbs/gcaptcha/gcaptcha.lib.php
@@ -6,7 +6,7 @@ class gcaptcha
     // 이미지크기 폭
     var $width = 70;
     // 이미지크기 높이
-    var $height = 20;
+    var $height = 22;
     // 폰트 사이즈
     var $size = 13;
     // 폰트 기울기
@@ -149,9 +149,8 @@ function captcha_html($class="captcha")
 
     $html  = '<fieldset id="captcha" class="'.$class.'">';
     $html .= '<legend class="sound_only">스팸방지</legend>';
-    $html .= '<img src="'.captcha_file('.png').'" title="스팸방지 숫자">';
-    $html .= '<a href="'.captcha_file('.wav').'" id="captcha_wav">음성듣기</a>';
-    $html .= '<label for="captcha_key">스팸방지 숫자 입력</label>';
+    $html .= '<img src="'.captcha_file('.png').'" alt="스팸방지 숫자">';
+    $html .= '<a href="'.captcha_file('.wav').'" id="captcha_wav"><img src="'.$g4['bbs_path'].'/gcaptcha/img/sound.gif" alt="숫자를 음성으로 듣기"></a>';
     $html .= '<input type="text" id="captcha_key" name="captcha_key" class="captcha_box fieldset_input" size="6" maxlength="6" required title="스팸방지 숫자 입력">';
     $html .= '<p class="sound_only">스팸방지 숫자를 순서대로 입력하세요.</p>';
     $html .= '</fieldset>';
diff --git a/bbs/gcaptcha/img/sound.gif b/bbs/gcaptcha/img/sound.gif
new file mode 100644
index 000000000..ff3e242a9
Binary files /dev/null and b/bbs/gcaptcha/img/sound.gif differ
diff --git a/bbs/register_form_update.php b/bbs/register_form_update.php
index 813f269f1..aab123d33 100644
--- a/bbs/register_form_update.php
+++ b/bbs/register_form_update.php
@@ -1,4 +1,5 @@
 <?
+define('_CAPTCHA_', 1);
 include_once('./_common.php');
 include_once($g4['path'].'/lib/register.lib.php');
 include_once($g4['path'].'/lib/mailer.lib.php');
@@ -301,16 +302,14 @@ if ($w == '') {
 
 
 // 사용자 코드 실행
-@include_once ($g4['path'].'/skin/member/'.$config[cf_member_skin].'/register_update.skin.php');
+@include_once ($g4['path'].'/skin/member/'.$config['cf_member_skin'].'/register_update.skin.php');
 
 
 if ($msg) 
     echo '<script>alert(\''.$msg.'\');</script>';
 
-$https_url = $g4['url'].'/'.$g4['bbs'];
-
 if ($w == "") {
-    goto_url($https_url.'/register_result.php');
+    goto_url($g4['bbs_url'].'/register_result.php');
 } else if ($w == 'u') {
     $row  = sql_fetch(" select mb_password from {$g4['member_table']} where mb_id = '{$member[mb_id]}' ");
     $tmp_password = $row['mb_password'];
@@ -319,9 +318,11 @@ if ($w == "") {
         set_session("ss_mb_id", "");
         alert('회원 정보가 수정 되었습니다.\n\nE-mail 주소가 변경되었으므로 다시 인증하셔야 합니다.', $g4['path']);
     } else {
+        alert('회원 정보가 수정 되었습니다.', $g4['url']);
+        /*
         echo '
         <html><title>회원정보수정</title><meta http-equiv="Content-Type" content="text/html; charset=$g4[charset]"></html><body>
-        <form name="fregisterupdate" method="post" action="'.$https_url.'/register_form.php">
+        <form name="fregisterupdate" method="post" action="'.$g4['bbs_url'].'/register_form.php">
         <input type="hidden" name="w" value="u">
         <input type="hidden" name="mb_id" value="'.$mb_id.'">
         <input type="hidden" name="mb_password" value="'.$tmp_password.'">
@@ -333,6 +334,7 @@ if ($w == "") {
         </script>
         </body>
         </html>';
+        */
     }
 }
 ?>
diff --git a/css/default.css b/css/default.css
index 115f1e5da..275044fd4 100644
--- a/css/default.css
+++ b/css/default.css
@@ -20,11 +20,6 @@ hr {display:none}
 #to_content a:focus,
 #to_content a:active {padding:10px 0;width:100%;height:auto;background:#333;color:#fff;text-align:center;overflow:auto}
 
-/* 자동등록방지 */
-.captcha {display:inline-block;vertical-align:middle}
-.captcha label {display:inline-block;margin:0;padding:0;width:0;height:0;overflow:hidden}
-#captcha_iframe {display:inline-block;margin:0;padding:0;width:80px;height:25px;border:0;vertical-align:middle;overflow:hidden}
-
 /* 기본테이블 */
 table {margin-bottom:20px;width:100%;border-collapse:collapse;border-spacing:0}
 tfoot th {border-top:1px solid #c9c9c9;border-bottom:1px solid #c9c9c9}
@@ -36,6 +31,10 @@ th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록
 td {padding:10px 0;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;font-size:0.75em}
 .empty_table {padding:85px 0;text-align:center}
 
+/* 캡챠 자동등록(입력)방지 기본 */
+#captcha img {border:1px solid #ddd;border-right:0}
+#captcha_wav img {border:1px solid #ddd;border-left:0;background:#494949}
+
 /* 필드셋 */
 fieldset {margin-bottom:20px;padding:13px;border:1px solid #dedace;background:#fefefe}
 legend {margin-left:0;padding:7px 10px;border:1px solid #dedace;background:#333;color:#fff}
@@ -73,24 +72,24 @@ a {color:#000;text-decoration:none}
 #header h1 {margin:0;height:0;overflow:hidden}
 
 /* 로고 */
-#logo {padding-top:35px;border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center}
+#logo {margin-top:31px;border-bottom:3px solid #666;background:url('../img/logo_bg.jpg') #333 top center repeat-x;text-align:center}
 #logo a {display:inline-block;padding:20px 30px 20px}
 
 /* 상단메뉴 */
-#tnb {position:absolute;top:0;left:0;width:100%;border-bottom:1px solid #000;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1}
+#tnb {position:absolute;top:-31px;left:0;width:100%;border-bottom:1px solid #bbb;background:url('../img/tnb_bg.jpg') #fff bottom left repeat-x;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:left}
-#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #ccc;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
+#tnb a {display:inline-block;padding:0 10px;height:30px;border-right:1px solid #dadada;font-family:"dotum";font-size:0.7em;text-decoration:none;line-height:2.7em}
 
 /* 전체검색 */
-#hdsch {z-index:3;position:absolute;top:0;right:0;margin:0;padding:0;width:220px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x}
+#hdsch {z-index:3;position:absolute;top:-31px;right:0;margin:0;padding:0;width:219px;border:0;border-left:1px solid #bbb;background:url('../img/search_bg.jpg') #fff bottom left repeat-x}
 #hdsch legend {position:absolute;padding:0;width:0;height:0;border:0;overflow:hidden}
 #hdsch_stx {margin:5px 0 5px 5px;padding:0 5px;height:20px;width:170px;border:0;background:transparent;font-size:1em;line-height:1.4em}
 #hdsch_stx:focus {background:#464649;color:#fff}
 #hdsch_submit {position:relative}
 
 /* 사이드 네비게이션: 아웃로그인, 설문조사 등 */
-#snb {z-index:3;position:absolute;top:115px;right:0;font-family:"verdana","dotum"}
+#snb {z-index:3;position:absolute;top:111px;right:0;font-family:"verdana","dotum"}
 #snb ul {margin:0;padding:0;list-style:none}
 
 /* 아웃로그인 */
@@ -176,7 +175,7 @@ a {color:#000;text-decoration:none}
 #wrapper h1 {font-size:1em}
 
 /* 레이아웃 하단 */
-#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #bbb;color:#595959;font-size:0.75em}
+#footer {z-index:1;position:relative;padding:15px 0 20px;border-top:1px solid #666;color:#595959;font-size:0.75em}
 #footer h1 {margin:0;height:0;overflow:hidden}
 #footer section {margin-left:20px}
 #footer h2 {margin:0;width:100px;color:#000;font-size:1em}
@@ -245,6 +244,8 @@ a {color:#000;text-decoration:none}
 .frm_tbl select {padding:2px}
 .frm_file {display:block;margin-bottom:5px}
 .frm_info {display:block;padding:5px 0 0;color:#595959;line-height:1.3em}
+.frm_tbl #captcha {margin:0;padding:0;border:0;background:transparent}
+.frm_tbl #captcha input {margin-left:5px}
 
 .readonly {background:#ff3061}
 
@@ -365,23 +366,21 @@ a {color:#000;text-decoration:none}
 .bo_vc_info dt {float:left}
 .bo_vc_info dd {float:left;margin:0 15px 0 10px}
 #bo_vc p {padding:0;font-size:0.75em}
-#bo_vc fieldset {margin:0;padding:5px 0 0;border:0;border-top:1px solid #ddd;background:transparent;font-size:0.75em}
-#bo_vc .captcha {padding:0;border:0;font-size:1em !important}
-#bo_vc .captcha a {display:inline-block;margin-right:5px;text-decoration:underline}
-#bo_vc .fieldset_input {margin-right:5px;vertical-align:top}
+#bo_vc fieldset {margin:0 0 10px;padding:0;border:0;background:transparent;font-size:0.75em}
+#bo_vc #bo_vc_winfo {float:left}
+#bo_vc #captcha {float:left;margin-left:10px;padding:0 5px 0 0;border:0}
+#bo_vc #captcha a {display:inline-block;margin-right:5px;text-decoration:underline;vertical-align:middle}
+#bo_vc .fieldset_input {margin-right:5px}
 #bo_vc footer {zoom:1}
 #bo_vc footer:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_vc_act {float:right;margin:0;font-size:0.75em;list-style:none;zoom:1}
 .bo_vc_act:after {display:block;visibility:hidden;clear:both;content:""}
 .bo_vc_act li {float:left;margin-left:5px}
-#bo_vc_w {position:relative;margin-top:10px;zoom:1}
-#bo_vc_w:after {display:block;visibility:hidden;clear:both;content:""}
-#bo_vc_w fieldset {margin:0;padding:0 0 0 10px;border:0;background:transparent;font-size:0.75em}
+#bo_vc_w {position:relative;margin-top:10px}
 #bo_vc_w #char_cnt {position:absolute;top:5px;right:10px}
-/* 댓글 CAPTCHA */
-#bo_vc_w #captcha_comment {font-size:1em !important}
-#bo_vc_warea {position:relative;margin:10px 100px 10px 0}
-#bo_vc_warea textarea {width:100%;height:50px}
+#bo_vc_warea {clear:both;position:relative;margin:0 100px 10px 0}
+#bo_vc_warea textarea {padding:3px;width:100%;height:50px;border:1px solid #ddd;background:#fff;vertical-align:middle}
+#bo_vc_warea textarea:focus {padding:4px;border:0;background:#494949;color:#fff}
 #bo_vc_warea .bo_vc_submit {position:absolute;top:0;right:-90px !important;right:10px;width:75px;height:57px;border:1px solid #666;background:#494949;color:#fff;letter-spacing:-0.1em}
 
 /* 우편번호 검색 */
diff --git a/head.php b/head.php
index da8e225a3..d9e5b2789 100644
--- a/head.php
+++ b/head.php
@@ -18,8 +18,6 @@ include_once($g4['path'].'/lib/popular.lib.php');
     <h1><?=$config['cf_title']?></h1>
 
     <ul id="tnb">
-        <li><a href="<?=$g4['bbs_path']?>/current_connect.php">현재접속자</a></li>
-        <li><a href="<?=$g4['bbs_path']?>/new.php">최근게시물</a></li>
         <? if ($is_member) { ?>
         <? if ($is_admin) { ?><li><a href="<?=$g4['path']?>/adm">관리자</a></li><? } ?>
         <li><a href="<?=$g4['bbs_path']?>/member_confirm.php?url=register_form.php">정보수정</a></li>
@@ -28,6 +26,8 @@ include_once($g4['path'].'/lib/popular.lib.php');
         <li><a href="<?=$g4['bbs_path']?>/register.php">회원가입</a></li>
         <li><a href="<?=$g4['bbs_path']?>/login.php">로그인</a></li>
         <? } ?>
+        <li><a href="<?=$g4['bbs_path']?>/current_connect.php">현재접속자</a></li>
+        <li><a href="<?=$g4['bbs_path']?>/new.php">최근게시물</a></li>
     </ul>
 
     <fieldset id="hdsch">
diff --git a/img/btn_search.jpg b/img/btn_search.jpg
index ae0f6ee50..9d52ca640 100644
Binary files a/img/btn_search.jpg and b/img/btn_search.jpg differ
diff --git a/img/logo_bg.jpg b/img/logo_bg.jpg
index 4e58cbed9..7dc6fe0f6 100644
Binary files a/img/logo_bg.jpg and b/img/logo_bg.jpg differ
diff --git a/img/search_bg.jpg b/img/search_bg.jpg
index 3fdd862b2..855d74492 100644
Binary files a/img/search_bg.jpg and b/img/search_bg.jpg differ
diff --git a/img/tnb_bg.jpg b/img/tnb_bg.jpg
index 3fdd862b2..855d74492 100644
Binary files a/img/tnb_bg.jpg and b/img/tnb_bg.jpg differ
diff --git a/img/wrapper_bg.jpg b/img/wrapper_bg.jpg
index 5f9a7ff00..6f852f316 100644
Binary files a/img/wrapper_bg.jpg and b/img/wrapper_bg.jpg differ
diff --git a/lib/common.lib.php b/lib/common.lib.php
index 53489334c..af32393c9 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -120,7 +120,7 @@ function alert($msg='', $url='')
     if (!$msg) $msg = '올바른 방법으로 이용해 주십시오.';
     $msg = str_replace("\\n", "<br>", $msg);
 
-    if (!$url) $url = "javascript:history.go(-1);";
+    if (!$url) $url = $_SERVER['HTTP_REFERER'];
 
     /*
     //header("Content-Type: text/html; charset=$g4['charset']");
diff --git a/skin/board/neo/view_comment.skin.php b/skin/board/neo/view_comment.skin.php
index eced74792..fa32fe089 100644
--- a/skin/board/neo/view_comment.skin.php
+++ b/skin/board/neo/view_comment.skin.php
@@ -26,10 +26,12 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
     ?>
     <article id="c_<?=$comment_id?>">
         <header>
-            <h1><?=$list[$i]['name']?>님의 댓글</h1>
+            <h1><?=$list[$i]['name']?><span class="sound_only">님의 댓글</span></h1>
             <dl class="bo_vc_info">
+                <? if ($is_ip_view) { ?>
                 <dt>아이피</dt>
-                <dd><? if ($is_ip_view) { echo $list[$i]['ip'];} ?></dd>
+                <dd><?=$list[$i]['ip'];?></dd>
+                <? } ?>
                 <dt>작성일</dt>
                 <dd><time datetime="<?=date('Y-m-d\TH:i:s+09:00', strtotime($list[$i]['datetime']))?>"><?=$list[$i]['datetime']?></time></dd>
             </dl>
@@ -42,7 +44,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
         <span id="reply_<?=$comment_id?>"></span><!-- 답변 -->
 
         <input type="hidden" id="secret_comment_<?=$comment_id?>" value="<?=strstr($list[$i]['wr_option'],"secret")?>">
-        <textarea id="save_comment_<?=$comment_id?>"><?=get_text($list[$i]['content1'], 0)?></textarea>
+        <textarea id="save_comment_<?=$comment_id?>" style="display:none"><?=get_text($list[$i]['content1'], 0)?></textarea>
 
         <? if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) { ?>
         <footer>
@@ -71,22 +73,23 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
 
     <aside id="bo_vc_w">
         <h2>댓글쓰기</h2>
-        <fieldset>
+        <fieldset id="bo_vc_winfo">
+            <legend class="sound_only">작성자</legend>
             <? if ($is_guest) { ?>
             <label for="wr_name">이름</label> <input type="text" id="wr_name" name="wr_name" class="fieldset_input required" maxLength="20" size="5" required>
             <label for="wr_password">패스워드</label> <input type="password" id="wr_password" name="wr_password" class="fieldset_input required" maxLength="20" size="10" required>
-            <? echo $captcha_html; ?>
             <? } ?>
             <input type="checkbox" id="wr_secret" name="wr_secret" value="secret">
             <label for="wr_secret">비밀글</label>
-            <? if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?}?>
-            <div id="bo_vc_warea">
-                <textarea id="wr_content" name="wr_content" required
-                <? if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?}?>></textarea>
-                <? if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?}?>
-                <input type="submit" class="bo_vc_submit" value="댓글입력">
-            </div>
-        </fieldset>
+       </fieldset>
+       <? echo $captcha_html; ?>
+        <? if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?}?>
+        <div id="bo_vc_warea">
+            <textarea id="wr_content" name="wr_content" required
+            <? if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?}?>></textarea>
+            <? if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?}?>
+            <input type="submit" class="bo_vc_submit" value="댓글입력">
+        </div>
     </aside>
 
     </form>
diff --git a/skin/board/neo/write.skin.php b/skin/board/neo/write.skin.php
index 6489dfd67..51d1ee60a 100644
--- a/skin/board/neo/write.skin.php
+++ b/skin/board/neo/write.skin.php
@@ -118,7 +118,7 @@ echo $option_hidden;
 <tr>
     <th scope="row">파일 #<?=$i?></th>
     <td>
-        <input type="file" name="bf_file[]" class="frm_input frm_file" title="파일 용량 <?=$upload_max_filesize?> 이하만 업로드 가능">
+        <input type="file" name="bf_file[]" class="frm_input" title="파일 용량 <?=$upload_max_filesize?> 이하만 업로드 가능">
         <? if ($is_file_content) { ?>
         <input type="text" name="bf_content[]" class="frm_input" size="50" title="파일 설명을 입력해주세요.">
         <?}?>
@@ -126,14 +126,21 @@ echo $option_hidden;
 </tr>
 <?}?>
 
+<? if ($is_guest) { //자동등록방지 ?>
+<tr>
+    <th scope="row">자동등록방지</th>
+    <td>
+        <?=$captcha_html?>
+    </td>
+</tr>
+<? } ?>
+
 </tbody>
 </table>
 
-<?=$captcha_html?>
-
 <div class="btn_confirm">
-    <input type="submit" id="btn_submit" value="글쓰기" accesskey="s">
-    <a href="./board.php?bo_table=<?=$bo_table?>" title="글쓰기를 취소하고 목록으로 돌아가기">목록</a>
+    <input type="submit" id="btn_submit" class="btn_submit" value="글쓰기" accesskey="s">
+    <a href="./board.php?bo_table=<?=$bo_table?>" class="btn_cancel" title="글쓰기를 취소하고 목록으로 돌아가기">목록</a>
 </div>
 </form>
 
diff --git a/skin/member/neo/login.skin.php b/skin/member/neo/login.skin.php
index 55621ecbe..ded13682e 100644
--- a/skin/member/neo/login.skin.php
+++ b/skin/member/neo/login.skin.php
@@ -28,13 +28,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 </form>
 
 <script>
-$(document).ready(function(){
+$(function(){
     $("#login_auto_login").click(function(){
         if (this.checked) {
             this.checked = confirm("자동로그인을 사용하시면 다음부터 회원아이디와 패스워드를 입력하실 필요가 없습니다.\n\n공공장소에서는 개인정보가 유출될 수 있으니 사용을 자제하여 주십시오.\n\n자동로그인을 사용하시겠습니까?");
         }
     });
-}
+});
 
 function flogin_submit(f)
 {
diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index 291be10d3..757797e42 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -19,11 +19,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
 <section id="poll">
     <header>
         <h2>설문조사</h2>
-<<<<<<< HEAD
         <? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
-=======
-        <? if ($is_admin == "super") { ?><a href="<?=$g4[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
->>>>>>> 8acf7f8c214b606db9e4d7b3533a916ca4171b83
         <p><?=$po['po_subject']?></p>
     </header>
     <ul>