diff --git a/adm/shop_admin/faqlist.php b/adm/shop_admin/faqlist.php
index 7bc04480b..369bd9619 100644
--- a/adm/shop_admin/faqlist.php
+++ b/adm/shop_admin/faqlist.php
@@ -4,7 +4,8 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], "r");
 
-$g4['title'] = 'FAQ 상세관리 : '.$fm['fm_subject'];
+$g4['title'] = 'FAQ 상세관리';
+if ($fm_subject) $g4['title'] .= ' : '.$fm_subject;
 include_once (G4_ADMIN_PATH.'/admin.head.php');
 
 $sql = " select * from {$g4['shop_faq_master_table']} where fm_id = '$fm_id' ";
@@ -21,78 +22,67 @@ $sql = "select * $sql_common order by fa_order , fa_id ";
 $result = sql_query($sql);
 ?>
 
-<table width=100%>
-<tr>
-    <td width=20%> </td>
-    <td width=60% align=center>&nbsp;</td>
-    <td width=20% align=right>건수 : <? echo $total_count ?>&nbsp;</td>
-</tr>
-</table>
+<section class="cbox">
+    <h2><?=$fm_subject?> 목록</h2>
 
+    <p>등록된 FAQ 상세내용 <?=$total_count ?>건</p>
 
-<table cellpadding=0 cellspacing=0 width=100%>
-<colgroup width=80>
-<colgroup width=''>
-<colgroup width=80>
-<colgroup width=80>
-<tr><td colspan=4 height=2 bgcolor=#0E87F9></td></tr>
-<tr align=center class=ht>
-    <td>번호</td>
-    <td>제목</td>
-    <td>순서</td>
-    <td>
-        <a href='./faqform.php?fm_id=<?=$fm['fm_id']?>'><img src='<?=G4_ADMIN_URL?>/img/icon_insert.gif' border=0></a>
-        <a href='<?=G4_SHOP_URL?>/faq.php?fm_id=<?=$fm['fm_id']?>'><img src='<?=G4_ADMIN_URL?>/img/icon_view.gif' border=0></a>
-    </td>
-</tr>
-<tr><td colspan=4 height=1 bgcolor=#CCCCCC></td></tr>
-<?
-for ($i=0; $row=sql_fetch_array($result); $i++)
-{
-    $row1 = sql_fetch(" select COUNT(*) as cnt from {$g4['shop_faq_table']} where fm_id = '{$row['fm_id']}' ");
-    $cnt = $row1[cnt];
+    <ol>
+        <li>FAQ는 무제한으로 등록할 수 있습니다</li>
+        <li><strong>FAQ 상세내용 추가</strong>를 눌러 자주하는 질문과 답변을 입력합니다.</li>
+    </ol>
 
-    $s_mod = icon("수정", "./faqform.php?w=u&fm_id={$row['fm_id']}&fa_id={$row['fa_id']}");
-    $s_del = icon("삭제", "javascript:del('./faqformupdate.php?w=d&fm_id={$row['fm_id']}&fa_id={$row['fa_id']}');");
+    <div id="btn_add">
+        <a href="./faqform.php?fm_id=<?=$fm['fm_id']?>">FAQ 상세내용 추가</a>
+    </div>
 
-    $num = $i + 1;
-
-    $list = $i%2;
-    echo "
-    <tr class='list$list ht'>
-        <td align=center>$num</td>
-        <td>" . stripslashes($row['fa_subject']) . "</td>
-        <td align=center>{$row['fa_order']}</td>
-        <td align=center>$s_mod $s_del</td>
-    </tr>";
-}
-
-if ($i == 0) {
-    echo "<tr><td colspan=20 align=center height=100 bgcolor=#ffffff><span class=point>자료가 한건도 없습니다.</span></td></tr>\n";
-}
-?>
-<tr><td colspan=4 height=1 bgcolor=CCCCCC></td></tr>
-</table><br><br>
-
-<table width=100% cellpadding=5 cellspacing=0 border=0 bgcolor=#F6F6F6>
+    <table>
+    <thead>
     <tr>
-        <td>
-            <table width=100% cellpadding=10 cellspacing=0 bgcolor=#FFFFFF>
-                <tr>
-                    <td style="line-height:220%;">
-                        <B><FONT COLOR="#18ABFF">&middot; FAQ 질문, 답변 등록하기</FONT></B><BR>
-
-                        &nbsp;&nbsp;: FAQ는 무제한으로 등록할 수 있습니다.<BR>
-                        1. <img src='<?=G4_ADMIN_URL?>/img/icon_insert.gif' align=absmiddle>를 눌러 세부적인 질문과 답변을 입력합니다.<BR>
-                    </td>
-                </tr>
-            </table>
-        </td>
+        <th scope="col">번호</th>
+        <th scope="col">제목</th>
+        <th scope="col">순서</th>
+        <th scope="col">관리</th>
     </tr>
-</table>
+    </thead>
+    <tbody>
+    <?
+    for ($i=0; $row=sql_fetch_array($result); $i++)
+    {
+        $row1 = sql_fetch(" select COUNT(*) as cnt from {$g4['shop_faq_table']} where fm_id = '{$row['fm_id']}' ");
+        $cnt = $row1[cnt];
 
-<p align=center>
-    <input type=button class=btn1 accesskey='l' value='  FAQ 관리  ' onclick="location='./faqmasterlist.php'">
+        $s_mod = icon("수정", "");
+        $s_del = icon("삭제", "");
+
+        $num = $i + 1;
+    ?>
+
+        <tr>
+            <td class="td_num"><?=$num?></td>
+            <td><?=stripslashes($row['fa_subject'])?></td>
+            <td class="td_num"><?=$row['fa_order']?></td>
+            <td class="td_smallmng">
+                <a href="./faqform.php?w=u&amp;fm_id=<?=$row['fm_id']?>&amp;fa_id=<?=$row['fa_id']?>">수정</a>
+                <a href="javascript:del('./faqformupdate.php?w=d&amp;fm_id=<?=$row['fm_id']?>&amp;fa_id=<?=$row['fa_id']?>');">삭제</a>
+            </td>
+        </tr>
+
+    <?
+    }
+
+    if ($i == 0) {
+        echo '<tr><td colspan="4" class="empty_table">자료가 없습니다.</td></tr>';
+    }
+    ?>
+    </tbody>
+    </table>
+
+</section>
+
+<div class="btn_confirm">
+    <a href="./faqmasterlist.php">FAQ 관리</a>
+</div>
 
 
 <?
diff --git a/adm/shop_admin/faqmasterlist.php b/adm/shop_admin/faqmasterlist.php
index 3873b9d12..da5ccadf8 100644
--- a/adm/shop_admin/faqmasterlist.php
+++ b/adm/shop_admin/faqmasterlist.php
@@ -61,7 +61,7 @@ $result = sql_query($sql);
         <td class="td_num"><?=$row['fm_id']?></td>
         <td><?=stripslashes($row['fm_subject']) ?></td>
         <td class="td_num"><?=$cnt?></td>
-        <td class="td_smallmng"><a href="./faqlist.php?fm_id=<?=$row['fm_id']?>">상세보기</a></td>
+        <td class="td_smallmng"><a href="./faqlist.php?fm_id=<?=$row['fm_id']?>&amp;fm_subject=<?=$row['fm_subject']?>">상세보기</a></td>
         <td class="td_mng">
             <a href="<?=G4_SHOP_URL?>/faq.php?fm_id=<?=$row['fm_id']?>">보기</a>
             <a href="./faqmasterform.php?w=u&amp;fm_id=<?=$row['fm_id']?>">수정</a>