diff --git a/modules/comment/tpl/comment_module_config.html b/modules/comment/tpl/comment_module_config.html
index c94cade55..90528ef33 100644
--- a/modules/comment/tpl/comment_module_config.html
+++ b/modules/comment/tpl/comment_module_config.html
@@ -1,49 +1,51 @@
-<form ruleset="insertCommentModuleConfig" action="./" method="post">
-	<input type="hidden" name="module" value="comment" />
-	<input type="hidden" name="act" value="procCommentInsertModuleConfig" />
-	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
-	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
-    <h3 class="h3">{$lang->comment}</h3>
-	<table class="x_table x_table-striped x_table-hover">
-		<tr>    
-			<th scope="row"><label for="comment_count">{$lang->comment_count}</label></th>
-			<td class="text">
-				<input type="text" name="comment_count" id="comment_count" value="{$comment_config->comment_count}" style="width:30px" />
-				<span class="desc">{$lang->about_comment_count}</span>
-			</td>
-		</tr>
-		<tr>    
-			<th scope="row"><label for="use_vote_up">{$lang->cmd_vote}</label></th>
-			<td class="text">
+<section class="section">
+	<h1>{$lang->comment}</h1>
+
+	<form ruleset="insertCommentModuleConfig" action="./" method="post" class="x_form-horizontal">
+		<input type="hidden" name="module" value="comment" />
+		<input type="hidden" name="act" value="procCommentInsertModuleConfig" />
+		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+		<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+
+		<div class="x_control-group">
+			<label for="comment_count" class="x_control-label">{$lang->comment_count}</label>
+			<div class="x_controls">
+				<input type="number" min="1" name="comment_count" id="comment_count" value="{$comment_config->comment_count}" style="width:40px" />
+				<span class="x_help-block">{$lang->about_comment_count}</span>
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label for="use_vote_up" class="x_control-label">{$lang->cmd_vote}</label>
+			<div class="x_controls">
 				<select name="use_vote_up" id="use_vote_up">
 					<option value="Y" selected="selected"|cond="$comment_config->use_vote_up=='Y'">{$lang->use}</option>
 					<option value="S" selected="selected"|cond="$comment_config->use_vote_up=='S'">{$lang->use_and_display}</option>
 					<option value="N" selected="selected"|cond="$comment_config->use_vote_up=='N'">{$lang->notuse}</option>
 				</select>
-			</td>
-		</tr>
-		<tr>    
-			<th scope="row"><label for="use_vote_down">{$lang->cmd_vote_down}</label></th>
-			<td class="text">
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label for="use_vote_down" class="x_control-label">{$lang->cmd_vote_down}</label>
+			<div class="x_controls">
 				<select name="use_vote_down" id="use_vote_down">
 					<option value="Y" selected="selected"|cond="$comment_config->use_vote_down=='Y'">{$lang->use}</option>
 					<option value="S" selected="selected"|cond="$comment_config->use_vote_down=='S'">{$lang->use_and_display}</option>
 					<option value="N" selected="selected"|cond="$comment_config->use_vote_down=='N'">{$lang->notuse}</option>
 				</select>
-			</td>
-		</tr>	
-		<tr>
-			<th scope="row"><label for="use_comment_validation">{$lang->cmd_comment_validation}</label></th>
-			<td>
-				<select name="use_comment_validation">
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label for="use_comment_validation" class="x_control-label">{$lang->cmd_comment_validation}</label>
+			<div class="x_controls">
+				<select name="use_comment_validation" id="use_comment_validation">
 					<option value="N" selected="selected"|cond="$comment_config->use_comment_validation=='N'">{$lang->notuse}</option>
 					<option value="Y" selected="selected"|cond="$comment_config->use_comment_validation=='Y'">{$lang->use}</option>
 				</select>
-				<p>{$lang->about_comment_validation}</p>
-			</td>
-		</tr>
-	</table>
-	<div class="x_clearfix">
-		<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-primary" />
-	</div>
-</form>
+				<span class="x_help-block">{$lang->about_comment_validation}</span>
+			</div>
+		</div>
+		<div class="x_clearfix btnArea">
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+		</div>
+	</form>
+</section>
diff --git a/modules/document/tpl/document_module_config.html b/modules/document/tpl/document_module_config.html
index cb7c5dd04..edcddd499 100644
--- a/modules/document/tpl/document_module_config.html
+++ b/modules/document/tpl/document_module_config.html
@@ -1,44 +1,46 @@
-<!--%import("filter/insert_document_module_config.xml")-->
-<form action="./" method="post">
-<input type="hidden" name="module" value="document" />
-<input type="hidden" name="act" value="procDocumentInsertModuleConfig" />
-<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
-	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
-    <h3 class="h3">{$lang->document}</h3>
-	<table class="x_table x_table-striped x_table-hover">
-		<tr>    
-			<th scope="row"><label for="use_history">{$lang->history}</label></th>
-			<td class="text">
+<section class="section">
+	<h1>{$lang->document}</h1>
+
+	<form action="./" method="post" class="x_form-horizontal">
+		<input type="hidden" name="module" value="document" />
+		<input type="hidden" name="act" value="procDocumentInsertModuleConfig" />
+		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+		<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+
+		<div class="x_control-group">
+			<label for="use_history" class="x_control-label">{$lang->history}</label>
+			<div class="x_controls">
 				<select name="use_history" id="use_history">
 					<option value="N" selected="selected"|cond="$document_config->use_history=='N'">{$lang->notuse}</option>
 					<option value="Y" selected="selected"|cond="$document_config->use_history=='Y'">{$lang->use}</option>
 					<option value="Trace" selected="selected"|cond="$document_config->use_history=='Trace'">{$lang->trace_only}</option>
 				</select>
-				<span class="desc">{$lang->about_use_history}</span>
-			</td>
-		</tr>
-		<tr>    
-			<th scope="row"><label for="use_vote_up">{$lang->cmd_vote}</label></th>
-			<td class="text">
+				<span class="x_help-block">{$lang->about_use_history}</span>
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label for="use_vote_up" class="x_control-label">{$lang->cmd_vote}</label>
+			<div class="x_controls">
 				<select name="use_vote_up" id="use_vote_up">
 					<option value="Y" selected="selected"|cond="$document_config->use_vote_up=='Y'">{$lang->use}</option>
 					<option value="S" selected="selected"|cond="$document_config->use_vote_up=='S'">{$lang->use_and_display}</option>
 					<option value="N" selected="selected"|cond="$document_config->use_vote_up=='N'">{$lang->notuse}</option>
 				</select>
-			</td>
-		</tr>
-		<tr>    
-			<th scope="row"><label for="use_vote_down">{$lang->cmd_vote_down}</label></th>
-			<td class="text">
+			</div>
+		</div>
+		<div class="x_control-group">
+			<label for="use_vote_down" class="x_control-label">{$lang->cmd_vote_down}</label>
+			<div class="x_controls">
 				<select name="use_vote_down" id="use_vote_down">
 					<option value="Y" selected="selected"|cond="$document_config->use_vote_down=='Y'">{$lang->use}</option>
 					<option value="S" selected="selected"|cond="$document_config->use_vote_down=='S'">{$lang->use_and_display}</option>
 					<option value="N" selected="selected"|cond="$document_config->use_vote_down=='N'">{$lang->notuse}</option>
 				</select>
-			</td>
-		</tr>
-	</table>
-    <div class="btnArea">
-		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
-	</div>
-</form>
+			</div>
+		</div>
+
+		<div class="btnArea">
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
+		</div>
+	</form>
+</section>