diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 930c5aa55..30f0d22d1 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -84,71 +84,67 @@
 <!--@else-->
 
 <section class="section">
-	<h1>{$lang->extra_vars}</h1>
-
-	<div class="x_clearfix" style="margin-bottom:-48px">
+	<div class="x_clearfix">
 		<div class="x_btn-group x_pull-right">
 			<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
 		</div>
 	</div>
-
 	<table class="x_table x_table-striped x_table-hover">
 		<thead>
-			<tr>
+			<tr class="nowr">
 				<th>{$lang->no}</th>
 				<th>{$lang->eid}</th>
 				<th>{$lang->column_name}</th>
 				<th>{$lang->column_type}</th>
+				<th>{$lang->default_value}</th>
+				<th>{$lang->description}</th>
 				<th>{$lang->is_required}</th>
 				<th>{$lang->cmd_search}</th>
 				<th>&nbsp;</th>
+				<th>&nbsp;</th>
 			</tr>
 		</thead>
 		<tfoot>
-			<tr>
+			<tr class="nowr">
 				<th>{$lang->no}</th>
 				<th>{$lang->eid}</th>
 				<th>{$lang->column_name}</th>
 				<th>{$lang->column_type}</th>
+				<th>{$lang->default_value}</th>
+				<th>{$lang->description}</th>
 				<th>{$lang->is_required}</th>
 				<th>{$lang->cmd_search}</th>
 				<th>&nbsp;</th>
+				<th>&nbsp;</th>
 			</tr>
 		</tfoot>
 		<tbody>
-			<!--@foreach($extra_keys as $key => $val)-->
-			<tr>
-				<td rowspan="3">{$val->idx}</td>
-				<td rowspan="3">{$val->eid}</td>
-				<td><b>{$val->name}</b></td>
-				<td>{$lang->column_type_list[$val->type]}</td>
-				<td rowspan="3"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
-				<td rowspan="3"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
-				<td rowspan="3">
+			<tr loop="$extra_keys => $key,$val">
+				<td>{$val->idx}</td>
+				<td>{$val->eid}</td>
+				<td class="nowr"><strong>{$val->name}</strong></td>
+				<td class="nowr">{$lang->column_type_list[$val->type]}</td>
+				<td class="nowr">{$val->default}&nbsp;</td>
+				<td>{$val->desc}&nbsp;</td>
+				<td class="nowr"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
+				<td class="nowr"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
+				<td class="nowr">
 					<block cond="$val->idx > 1">
-						<a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;">{$lang->cmd_move_up}</a> <i class="vr">|</i>
+						<button type="button" class="x_btn x_btn-link" onclick="moveVar('up','{$module_srl}','{$val->idx}')">{$lang->cmd_move_up}</button> <i>|</i>
 					</block>
 					<block cond="count($extra_keys) > $val->idx">
-						<a href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;">{$lang->cmd_move_down}</a> <i class="vr">|</i>
+						<button type="button" class="x_btn x_btn-link" onclick="moveVar('down','{$module_srl}','{$val->idx}')">{$lang->cmd_move_down}</button> <i>|</i>
 					</block>
+				</td>
+				<td class="nowr">
 					<a href="{getUrl('selected_var_idx',$val->idx)}">{$lang->cmd_modify}...</a> <i class="vr">|</i>
-					<a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');">{$lang->cmd_delete}</a>
+					<button type="button" class="x_btn x_btn-link" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');">{$lang->cmd_delete}</button>
 				</td>
 			</tr>
-			<tr>
-				<td>{$lang->default_value}</td>
-				<td >{$val->default}&nbsp;</td>
-			</tr>
-			<tr>
-				<td>{$lang->description}</td>
-				<td >{$val->desc}&nbsp;</td>
-			</tr>
-			<!--@end-->
 		</tbody>
 	</table>
-
 	<div class="x_clearfix">
-		<div class="x_btn-group x_pull-right">
+		<div class="x_pull-right">
 			<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
 		</div>
 	</div>
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index 275879b35..45b5e4ed3 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -159,7 +159,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	<input type="hidden" name="act" value="{$act}" />
 	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="error_return_url" value="" />
-	<select name="search_target" title="{$lang->search_target}">
+	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach($lang->file_search_target_list as $key => $val)-->
 		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
 		<!--@end-->
diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html
index 08ebb34fb..0345ed5bd 100644
--- a/modules/page/tpl/index.html
+++ b/modules/page/tpl/index.html
@@ -7,13 +7,13 @@
 	<input type="hidden" name="mid" value="{$mid}" />
 	<input type="hidden" name="vid" value="{$vid}" />
 	<input type="hidden" name="act" value="dispPageAdminContent" />
-	<select name="module_category_srl" title="{$lang->module_category}" style="margin-right:3px">
+	<select name="module_category_srl" title="{$lang->module_category}" style="margin-right:4px">
 		<option value="0" <!--@if($module_category_srl==="0")-->selected="selected"<!--@end-->>{$lang->not_exists}</option>
 		<!--@foreach($module_category as $key => $val)-->
 		<option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
 		<!--@end-->
 	</select>
-	<select name="search_target" style="margin-right:3px">
+	<select name="search_target" style="margin-right:4px">
 		<option value="s_mid" selected="selected"|cond="$search_target=='s_mid'">{$lang->mid}</option>
 		<option value="s_browser_title" selected="selected"|cond="$search_target=='s_browser_title'">{$lang->browser_title}</option>
 	</select>
@@ -28,21 +28,19 @@
 	<thead>
 		<tr>
 			<th scope="col">{$lang->no}</th>
-			<th scope="col"><input type="checkbox" /></th>
 			<th scope="col">{$lang->module_category}</th>
 			<th scope="col">{$lang->page_type}</th>
 			<th scope="col">{$lang->mid}</th>
 			<th scope="col">{$lang->browser_title}</th>
 			<th scope="col">{$lang->regdate}</th>
 			<th scope="col">&nbsp;</th>
-			</tr>
-		</thead>
-	
+			<th scope="col"><input type="checkbox" /></th>
+		</tr>
+	</thead>
 	<tbody>
 		<!--@foreach($page_list as $no => $val)-->
 		<tr class="row{$cycle_idx}">
 			<td>{$no}</td>
-			<td><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
 			<td>
 				<!--@if(!$val->module_category_srl)-->
 				<!--@if($val->site_srl)-->
@@ -63,19 +61,17 @@
 				<a href="{getUrl('','module','module','act','dispModuleAdminCopyModule','module_srl',$val->module_srl)}" onclick="popopen(this.href);return false;">{$lang->cmd_copy}</a>
 				<a href="{getUrl('act','dispPageAdminDelete','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a>
 				</td>
-			</tr>
-		<!--@end-->
-		</tbody>
+			<td><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
+		</tr>
+	<!--@end-->
+	</tbody>
 </table>
 
 <div class="x_clearfix">
-	<div class="x_btn-group x_pull-left">
+	<div class="x_btn-group x_pull-right">
 		<a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="x_btn">{$lang->cmd_setup}</a>
 		<a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="x_btn">{$lang->cmd_manage_grant}</a>
 	</div>
-	<div class="x_btn-group x_pull-right">
-		<a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="x_btn x_btn-inverse"><span>{$lang->cmd_make}</span></a>
-	</div>
 </div>
 
 </form>
@@ -86,38 +82,38 @@
 	<input type="hidden" name="act" value="{$act}" />
 	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
 	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
-		<ul>
-			<li class="x_disabled"|cond="!$page || $page == 1"><a href="{getUrl('page', '')}">&laquo; {$lang->first_page}</a></li>
-	
-			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
-				{@$isGoTo = true}
-				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
-					<span cond="$isGoTo" id="goTo" class="x_input-append">
-						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
-						<button type="submit" class="x_add-on">Go</button>
-					</span>
-				</li>
-			</block>
+	<ul>
+		<li class="x_disabled"|cond="!$page || $page == 1"><a href="{getUrl('page', '')}">&laquo; {$lang->first_page}</a></li>
 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-			{@$last_page = $page_no}
-			<li class="x_active"|cond="$page_no == $page"><a  href="{getUrl('page', $page_no)}">{$page_no}</a></li>
-			<!--@end-->
+		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
+			{@$isGoTo = true}
+			<li>
+				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<span cond="$isGoTo" id="goTo" class="x_input-append">
+					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
+					<button type="submit" class="x_add-on">Go</button>
+				</span>
+			</li>
+		</block>
 
-			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
-				{@$isGoTo = true}
-				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
-					<span cond="$isGoTo" id="goTo" class="x_input-append">
-						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
-						<button type="submit" class="x_add-on">Go</button>
-					</span>
-				</li>
-				
-			</block>
-	
-			<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
-		</ul>
-	</form>
+<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<li class="x_active"|cond="$page_no == $page"><a  href="{getUrl('page', $page_no)}">{$page_no}</a></li>
+		<!--@end-->
+
+		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
+			{@$isGoTo = true}
+			<li>
+				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<span cond="$isGoTo" id="goTo" class="x_input-append">
+					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
+					<button type="submit" class="x_add-on">Go</button>
+				</span>
+			</li>
+			
+		</block>
+
+		<li class="x_disabled"|cond="$page == $page_navigation->last_page"><a href="{getUrl('page', $page_navigation->last_page)}" title="{$page_navigation->last_page}">{$lang->last_page} &raquo;</a></li>
+	</ul>
+</form>
 
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index d0bf380ea..fdeb6170a 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -5,40 +5,42 @@
 </div>
 <p>{$lang->about_point_module} {$lang->point_update_desc}</p>
 <!-- SEARCH -->
-<form action="./" method="get" no-error-return-url="true" class="x_clearfix" style="margin:0 0 -45px 0">
-	<input type="hidden" name="module" value="{$module}" />
-	<input type="hidden" name="act" value="{$act}" />
-    <fieldset class="x_pull-right">
-		<select name="is_admin" style="width:auto">
-			<option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-			<option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
-		</select>
-		<select name="is_denied" style="width:auto">
-			<option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-			<option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
-		</select>
-		<select name="selected_group_srl" style="width:auto" title="{$lang->member_group}">
-			<option value="0">{$lang->member_group}</option>
-			<!--@foreach($group_list as $key => $val)-->
-			<option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
-			<!--@end-->
-		</select>
-		<select name="search_target" title="{$lang->search_target}">
-			<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{Context::getLang($identifier)}</option>
-			<!--@foreach($lang->search_target_list as $key => $val)-->
-			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-			<!--@end-->
-		</select>
-		<span class="x_input-append">
-			<input type="search" required name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" style="width:100px" />
-			<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_search}</button>
-			<button class="x_btn" type="button" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;">{$lang->cmd_cancel}</button>
-		</span>
-    </fieldset>
-</form>
 
 <table class="x_table x_table-striped x_table-hover">
-	<caption>Total <strong>{number_format($total_count)}</strong>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}</caption>
+	<caption>
+		Total <strong>{number_format($total_count)}</strong>, Page <strong>{number_format($page)}</strong>/{number_format($total_page)}
+		<form action="./" method="get" no-error-return-url="true"  class="x_pull-right"style="margin:0">
+			<input type="hidden" name="module" value="{$module}" />
+			<input type="hidden" name="act" value="{$act}" />
+			<fieldset>
+				<select name="is_admin" style="width:auto">
+					<option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
+					<option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
+				</select>
+				<select name="is_denied" style="width:auto">
+					<option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
+					<option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
+				</select>
+				<select name="selected_group_srl" style="width:auto" title="{$lang->member_group}">
+					<option value="0">{$lang->member_group}</option>
+					<!--@foreach($group_list as $key => $val)-->
+					<option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+				</select>
+				<select name="search_target" title="{$lang->search_target}">
+					<option value="{$identifier}" selected="selected"|cond="$search_target == $identifier">{Context::getLang($identifier)}</option>
+					<!--@foreach($lang->search_target_list as $key => $val)-->
+					<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+					<!--@end-->
+				</select>
+				<span class="x_input-append">
+					<input type="search" required name="search_keyword" value="{htmlspecialchars($search_keyword)}" title="{$lang->cmd_search}" style="width:100px" />
+					<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_search}</button>
+					<button class="x_btn" type="button" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;">{$lang->cmd_cancel}</button>
+				</span>
+			</fieldset>
+		</form>
+	</caption>
 	<thead>
 		<tr>
 			<th scope="col">{$lang->no}</th>
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html
index 0e711746a..5d79add9d 100644
--- a/modules/poll/tpl/poll_list.html
+++ b/modules/poll/tpl/poll_list.html
@@ -56,6 +56,9 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 					<input type="checkbox" name="cart[]" value="{$val->poll_index_srl}" />
 				</td>
 			</tr>
+			<tr cond="!$poll_list">
+				<td colspan="7" style="text-align:center">{$lang->no_data}</td>
+			</tr>
 		</tbody>
 	</table>
 	<span class="x_pull-right">
@@ -105,7 +108,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 	<input type="hidden" name="module" value="{$module}" />
 	<input type="hidden" name="act" value="{$act}" />
 	<input type="hidden" name="error_return_url" value="" />
-	<select name="search_target" title="{$lang->search_target}">
+	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<option loop="$lang->search_poll_target_list => $key, $val" value="{$key}" selected="selected"|cond="$search_target==$key">{$val}</option>
 	</select>
 	<input type="search" name="search_keyword" required value="{htmlspecialchars($search_keyword)}" />
diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html
index feb226ccb..3e656c80a 100644
--- a/modules/trackback/tpl/trackback_list.html
+++ b/modules/trackback/tpl/trackback_list.html
@@ -96,7 +96,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	<input type="hidden" name="act" value="{$act}" />
 	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="error_return_url" value="" />
-	<select name="search_target" title="{$lang->search_target}">
+	<select name="search_target" title="{$lang->search_target}" style="margin-right:4px">
 		<!--@foreach($lang->search_target_list as $key => $val)-->
 		<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
 		<!--@end-->