diff --git a/head.php b/head.php
index 9388c339b..c3e4d894e 100644
--- a/head.php
+++ b/head.php
@@ -39,7 +39,11 @@ include_once($g4['path'].'/lib/popular.lib.php');
         <input type="submit" value="검색">
     </fieldset>
     </form>
+<<<<<<< HEAD
     <? if (!isset($bo_table)) {?><h1><?=$g4['title']?></h1><? } ?>
+=======
+    <h1><?=$config['cf_title']?></h1>
+>>>>>>> c6d75730d63bbcb65a6e77baf559a24b33fb43c1
 </header>
 
 <div>
@@ -48,3 +52,9 @@ include_once($g4['path'].'/lib/popular.lib.php');
 </div>
 
 <div id="wrapper">
+    <p>
+        g4s 강좌 홈페이지에 오신 것을 환영합니다.
+    </p>
+    <p>
+        <a href="<?=$g4['path']?>/bbs/board.php?bo_table=1">테스트용 게시판</a>
+    </p>
diff --git a/index.php b/index.php
index de85191ca..37f77acdb 100644
--- a/index.php
+++ b/index.php
@@ -6,13 +6,6 @@ $g4['title'] = '';
 include_once('./_head.php');
 ?>
 
-<p>
-g4s 강좌 홈페이지에 오신 것을 환영합니다.
-</p>
-<p>
-<a href="<?=$g4['path']?>/bbs/board.php?bo_table=1">테스트용 게시판</a>
-</p>
-
 <?=latest("neo",1,5)?>
 <?=latest("neo",1,5)?>
 
diff --git a/skin/poll/neo/poll.skin.php b/skin/poll/neo/poll.skin.php
index d9562479f..328e610c2 100644
--- a/skin/poll/neo/poll.skin.php
+++ b/skin/poll/neo/poll.skin.php
@@ -14,7 +14,8 @@ if (!$po_id)
 $po = sql_fetch(" select * from $g4[poll_table] where po_id = '$po_id' ");
 ?>
 
-<div>
+<section>
+<h2>사이트 설문조사</h2>
 <form name="fpoll" method="post" action="<?=$g4[bbs_path]?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="winPoll">
 <input type="hidden" name="po_id" value="<?=$po_id?>">
 <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
@@ -28,7 +29,7 @@ $po = sql_fetch(" select * from $g4[poll_table] where po_id = '$po_id' ");
 <input type="submit" value="투표하기">
 <a href="javascript:;" onclick="poll_result('<?=$po_id?>');">결과보기</a>
 </form>
-</div>
+
 <script>
 function fpoll_submit(f)
 {
diff --git a/tail.php b/tail.php
index 7722a09b2..0a2cd479d 100644
--- a/tail.php
+++ b/tail.php
@@ -4,12 +4,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 </div>
 
-<div>
+<footer>
+    <h1><?=$config['cf_title']?> 정보</h1>
     <?=visit('neo'); // 방문자수 ?>
     <?=connect(); // 현재 접속자수 ?>
     <?=popular('neo'); // 인기검색어 ?>
     <p>Copyright &copy; 소유하신 도메인. All rights reserved.</p>
-</div>
+</footer>
 
 <script>
 function fsearchbox_submit(f)