diff --git a/src/main/webapp/WEB-INF/orig/view/advance.jsp b/src/main/webapp/WEB-INF/orig/view/advance.jsp
index 92a4e7429..e7c473cb7 100644
--- a/src/main/webapp/WEB-INF/orig/view/advance.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/advance.jsp
@@ -98,7 +98,6 @@
 					<input class="form-control" type="text" id="as_q" name="as.q" value="${f:h(fe:join(as.q))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -109,7 +108,6 @@
 					<input class="form-control" type="text" id="as_epq" name="as.epq" value="${f:h(fe:join(as.epq))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -120,7 +118,6 @@
 					<input class="form-control" type="text" id="as_oq" name="as.oq" value="${f:h(fe:join(as.oq))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -131,7 +128,6 @@
 					<input class="form-control" type="text" id="as_nq" name="as.nq" value="${f:h(fe:join(as.nq))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -152,7 +148,6 @@
 					</la:select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -210,7 +205,6 @@
 					</la:select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -225,7 +219,6 @@
 					</la:select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<c:if test="${displayLabelTypeItems}">
@@ -241,7 +234,6 @@
 						</la:select>
 					</div>
 					<div class="col-lg-4 d-none d-lg-flex align-items-center">
-						<!-- TODO -->
 					</div>
 				</div>
 			</c:if>
@@ -267,7 +259,6 @@
 					</select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -295,7 +286,6 @@
 					</select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -314,7 +304,6 @@
 					</select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -325,7 +314,6 @@
 					<input class="form-control" type="text" id="as_sitesearch" name="as.sitesearch" value="${f:h(fe:join(as.sitesearch))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 
diff --git a/src/main/webapp/WEB-INF/orig/view/help.jsp b/src/main/webapp/WEB-INF/orig/view/help.jsp
index 871276114..fd517c94c 100644
--- a/src/main/webapp/WEB-INF/orig/view/help.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/help.jsp
@@ -29,6 +29,7 @@
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${fe:url('/js/jquery-3.4.1.min.js')}"></script>
+	<script src="${fe:url('/js/admin/popper.min.js')}" type="text/javascript"></script>
 	<script type="text/javascript" src="${fe:url('/js/bootstrap.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/suggestor.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/help.js')}"></script>
diff --git a/src/main/webapp/WEB-INF/orig/view/login/index.jsp b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
index 70d38ea2f..f99878d1e 100644
--- a/src/main/webapp/WEB-INF/orig/view/login/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/login/index.jsp
@@ -22,53 +22,56 @@
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
-		<!-- /.login-logo -->
 		<div class="notification">${notification}</div>
-		<div class="login-box-body">
-			<p class="login-box-msg">
-				<la:message key="labels.login" />
-			</p>
-			<%-- Message --%>
-			<div>
-				<la:info id="msg" message="false">
-					<div class="alert alert-info">${msg}</div>
-				</la:info>
-				<la:errors />
-			</div>
-			<la:form styleId="login" method="post">
-				<div class="form-group has-feedback">
-					<div class="input-group">
-						<span class="input-group-addon"><em class="fa fa-user fa-fw"></em></span>
+		<div class="card">
+			<div class="card-body login-card-body">
+				<p class="login-box-msg">
+					<la:message key="labels.login" />
+				</p>
+				<%-- Message --%>
+				<div>
+					<la:info id="msg" message="false">
+						<div class="alert alert-info">${msg}</div>
+					</la:info>
+					<la:errors />
+				</div>
+				<la:form styleId="login" method="post">
+					<div class="input-group mb-3">
 						<c:set var="ph_username">
 							<la:message key="labels.login.placeholder_username" />
 						</c:set>
 						<la:text property="username" styleId="username"
 							class="form-control" placeholder="${ph_username}" />
+						<div class="input-group-append">
+							<span class="input-group-text">
+								<em class="fa fa-user fa-fw"></em>
+            				</span>
+						</div>
 					</div>
-				</div>
-				<div class="form-group has-feedback">
-					<div class="input-group">
-						<span class="input-group-addon"><em class="fa fa-lock fa-fw"></em></span>
+					<div class="input-group mb-3">
 						<c:set var="ph_password">
 							<la:message key="labels.login.placeholder_password" />
 						</c:set>
 						<la:password property="password" class="form-control"
 							placeholder="${ph_password}" />
+						<div class="input-group-append">
+							<span class="input-group-text">
+								<em class="fa fa-lock fa-fw"></em>
+							</span>
+						</div>
 					</div>
-				</div>
-				<div class="text-center">
-					<button type="submit" name="login"
-						class="btn btn-primary btn-block btn-flat"
-						value="<la:message key="labels.login"/>">
-						<em class="fa fa-sign-in"></em>
-						<la:message key="labels.login" />
-					</button>
-				</div>
-			</la:form>
+					<div class="text-center">
+						<button type="submit" name="login"
+							class="btn btn-primary btn-block"
+							value="<la:message key="labels.login"/>">
+							<em class="fa fa-sign-in"></em>
+							<la:message key="labels.login" />
+						</button>
+					</div>
+				</la:form>
+			</div>
 		</div>
-		<!-- /.login-box-body -->
 	</div>
-	<!-- /.login-box -->
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript" src="${fe:url('/js/admin/popper.min.js')}"></script>
 	<script type="text/javascript"
diff --git a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
index faf1cdd05..0ef74a800 100644
--- a/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/profile/index.jsp
@@ -22,69 +22,68 @@
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
-		<!-- /.login-logo -->
-		<div class="login-box-body">
-			<p class="login-box-msg">
-				<la:message key="labels.profile" />
-			</p>
-			<%-- Message --%>
-			<div>
-				<la:info id="msg" message="false">
-					<div class="alert alert-info">${msg}</div>
-				</la:info>
-				<la:errors />
-			</div>
-			<la:form styleId="login" method="post">
-				<div class="form-group has-feedback">
-					<div class="input-group">
-						<span class="input-group-addon"><em class="fa fa-lock fa-fw"></em></span>
+		<div class="card">
+			<div class="card-body login-card-body">
+				<p class="login-box-msg">
+					<la:message key="labels.profile" />
+				</p>
+				<%-- Message --%>
+				<div>
+					<la:info id="msg" message="false">
+						<div class="alert alert-info">${msg}</div>
+					</la:info>
+					<la:errors />
+				</div>
+				<la:form styleId="login" method="post">
+					<div class="input-group mb-3">
 						<c:set var="ph_old_password">
 							<la:message key="labels.profile.placeholder_old_password" />
 						</c:set>
 						<la:password property="oldPassword" class="form-control"
-							placeholder="${ph_old_password}" />
+									 placeholder="${ph_old_password}" />
+						<div class="input-group-append">
+							<span class="input-group-text"><em class="fa fa-lock fa-fw"></em></span>
+						</div>
 					</div>
-				</div>
-				<div class="form-group has-feedback">
-					<div class="input-group">
-						<span class="input-group-addon"><em class="fa fa-lock fa-fw"></em></span>
+					<div class="input-group mb-3">
 						<c:set var="ph_new_password">
 							<la:message key="labels.profile.placeholder_new_password" />
 						</c:set>
 						<la:password property="newPassword" class="form-control"
-							     placeholder="${ph_new_password}" />
+									 placeholder="${ph_new_password}" />
+						<div class="input-group-append">
+							<span class="input-group-text"><em class="fa fa-lock fa-fw"></em></span>
+						</div>
 					</div>
-				</div>
-				<div class="form-group has-feedback">
-					<div class="input-group">
-						<span class="input-group-addon"><em class="fa fa-lock fa-fw"></em></span>
+					<div class="input-group mb-3">
 						<c:set var="ph_confirm_password">
 							<la:message key="labels.profile.placeholder_confirm_new_password" />
 						</c:set>
 						<la:password property="confirmNewPassword" class="form-control"
-							     placeholder="${ph_confirm_password}" />
+									 placeholder="${ph_confirm_password}" />
+						<div class="input-group-append">
+							<span class="input-group-text"><em class="fa fa-lock fa-fw"></em></span>
+						</div>
 					</div>
-				</div>
-				<div class="text-center">
-					<la:link href="/"
-						styleClass="btn btn-default">
-						<em class="fa fa-arrow-circle-left"></em>
-						<la:message key="labels.profile.back" />
-					</la:link>
-					<button type="submit" name="changePassword"
-						class="btn btn-warning"
-						value="<la:message key="labels.profile.update"/>">
-						<em class="fa fa-pencil-alt"></em>
-						<la:message key="labels.profile.update" />
-					</button>
-				</div>
-			</la:form>
+					<div class="text-center">
+						<la:link href="/"
+							styleClass="btn btn-default">
+							<em class="fa fa-arrow-circle-left"></em>
+							<la:message key="labels.profile.back" />
+						</la:link>
+						<button type="submit" name="changePassword"
+							class="btn btn-success"
+							value="<la:message key="labels.profile.update"/>">
+							<em class="fa fa-pencil-alt"></em>
+							<la:message key="labels.profile.update" />
+						</button>
+					</div>
+				</la:form>
+			</div>
 		</div>
-		<!-- /.login-box-body -->
 	</div>
-	<!-- /.login-box -->
 	<input type="hidden" id="contextPath" value="${contextPath}" />
-	<script type="text/javascript" src="${fe:url('/js/admin/popper.min.js')}"></script>
+	<script src="${fe:url('/js/admin/popper.min.js')}" type="text/javascript"></script>
 	<script type="text/javascript"
 		src="${fe:url('/js/admin/jquery-3.4.1.min.js')}"></script>
 	<script type="text/javascript" src="${fe:url('/js/admin/bootstrap.min.js')}"></script>
diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
index 01f8b6bdd..b0d529d3d 100644
--- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
@@ -33,8 +33,8 @@
 	</div>
 </c:if>
 <div id="result" class="row">
-	<input type="hidden" id="queryId" value="${f:u(queryId)}" /> <input
-		type="hidden" id="rt" value="${f:u(requestedTime)}" />
+	<input type="hidden" id="queryId" value="${f:h(queryId)}" /> <input
+		type="hidden" id="rt" value="${f:h(requestedTime)}" />
 	<ol class="list-unstyled col-md-8">
 		<c:forEach var="doc" varStatus="s" items="${documentItems}">
 			<li id="result${s.index}">
@@ -158,10 +158,11 @@
 							key="${facetQueryView.title}" /></li>
 					<c:set var="facetFound" value="F"/>
 					<c:forEach var="queryEntry" items="${facetQueryView.queryMap}">
-						<c:if test="${facetResponse.queryCountMap[queryEntry.value] != 0}">
+						<c:if test="${facetResponse.queryCountMap[queryEntry.value] > 0}">
 							<li class="list-group-item"><la:link
 									href="/search?q=${f:u(q)}&ex_q=${f:u(queryEntry.value)}&sdh=${f:u(fe:sdh(sdh))}${fe:pagingQuery(queryEntry.value)}${fe:facetQuery()}${fe:geoQuery()}">
-									<la:message key="${queryEntry.key}" />
+									<c:if test="${fn:startsWith(queryEntry.key, 'labels.')}"><la:message key="${queryEntry.key}" /></c:if>
+									<c:if test="${not fn:startsWith(queryEntry.key, 'labels.')}">${f:h(queryEntry.key)}</c:if>
 									<span class="badge badge-secondary badge-pill float-right">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
 								</la:link></li>
 							<c:set var="facetFound" value="T"/>
diff --git a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken.jsp b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken.jsp
index ac3e7bcc8..b0bdf2cbb 100644
--- a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken.jsp
@@ -35,7 +35,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -83,9 +82,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_details.jsp b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_details.jsp
index 82529eaa3..acfb7f043 100644
--- a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_details.jsp
@@ -91,13 +91,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp
index df31f88f7..233e434f1 100644
--- a/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/accesstoken/admin_accesstoken_edit.jsp
@@ -44,7 +44,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -97,13 +96,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp b/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp
index d5e6a5be3..132aeb358 100644
--- a/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/backup/admin_backup.jsp
@@ -37,7 +37,6 @@
                                 <la:message key="labels.backup_configuration"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -87,11 +86,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.data-wrapper -->
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp
index 0b6541698..360c71976 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword.jsp
@@ -64,7 +64,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -112,9 +111,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp
index 9e2c81b8f..cab2a7059 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_details.jsp
@@ -93,7 +93,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -114,13 +113,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp
index 5265641b6..45d04b23f 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_download.jsp
@@ -68,7 +68,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -82,7 +81,6 @@
                                             key="labels.bad_word_file"/></label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.bad_word_button_download" />">
@@ -90,9 +88,7 @@
                                     <la:message key="labels.bad_word_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp
index f282a7b23..d824dcf07 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_edit.jsp
@@ -91,7 +91,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -109,13 +108,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp
index ed549b953..699e20731 100644
--- a/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/badword/admin_badword_upload.jsp
@@ -68,7 +68,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -87,7 +86,6 @@
                             </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                         <div class="card-footer">
                             <button type="submit" class="btn btn-success" name="upload"
                                     value="<la:message key="labels.bad_word_button_upload" />">
@@ -95,9 +93,7 @@
                                 <la:message key="labels.bad_word_button_upload"/>
                             </button>
                         </div>
-                        <!-- /.card-footer -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
index d52b63ed4..3d49b12e2 100644
--- a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc.jsp
@@ -35,7 +35,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -118,9 +117,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_details.jsp b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_details.jsp
index c57077aa8..06f68fea5 100644
--- a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_details.jsp
@@ -75,13 +75,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_edit.jsp b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_edit.jsp
index b67ea1298..97c783294 100644
--- a/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/boostdoc/admin_boostdoc_edit.jsp
@@ -44,7 +44,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -81,13 +80,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp
index 4d9c4d72c..82827776e 100644
--- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo.jsp
@@ -41,7 +41,6 @@
                                 <la:message key="labels.crawling_info_title"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -172,9 +171,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
index a678b8c70..c974103fd 100644
--- a/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/crawlinginfo/admin_crawlinginfo_details.jsp
@@ -70,7 +70,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -98,7 +97,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-footer">
                                 <c:if test="${crudMode == 4}">
                                     <button type="submit" class="btn btn-default" name="back"
@@ -156,9 +154,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
index 40104461a..fca3185bb 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig.jsp
@@ -35,7 +35,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -141,9 +140,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
index b38145b70..2a9218626 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_details.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -117,7 +116,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                                 <c:if test="${fe:permission('admin-scheduler')}">
@@ -128,9 +126,7 @@
                                     </la:link>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
index e50e61eb8..a6a001a8e 100644
--- a/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dataconfig/admin_dataconfig_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -147,13 +146,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp b/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
index b780e9710..71a5c3559 100644
--- a/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/design/admin_design.jsp
@@ -41,7 +41,6 @@
                                     <la:message key="labels.design_title_file"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div class="form-group row">
                                     <la:errors property="fileName"/>
@@ -52,7 +51,6 @@
                                     </la:select>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.design_download_button" />">
@@ -101,12 +99,10 @@
                                     </div>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </la:form>
                     </div>
                 </div>
                 <div class="col-md-6">
-                    <!-- /.card -->
                     <c:if test="${editable}">
                         <div class="card card-outline card-primary">
                             <la:form action="/admin/design/">
@@ -115,7 +111,6 @@
                                         <la:message key="labels.design_file_title_edit"/>
                                     </h3>
                                 </div>
-                                <!-- /.card-header -->
                                 <div class="card-body">
                                     <div class="form-group row">
                                         <la:errors property="fileName"/>
@@ -126,7 +121,6 @@
                                         </la:select>
                                     </div>
                                 </div>
-                                <!-- /.card-body -->
                                 <div class="card-footer">
                                     <button type="submit" class="btn btn-primary" name="edit"
                                             value="<la:message key="labels.design_edit_button" />">
@@ -140,11 +134,9 @@
                                         <la:message key="labels.design_use_default_button"/>
                                     </button>
                                 </div>
-                                <!-- /.card-footer -->
                             </la:form>
                         </div>
                     </c:if>
-                    <!-- /.card -->
                 </div>
                 <div class="col-md-12">
                     <c:if test="${editable}">
@@ -156,7 +148,6 @@
                                         <la:message key="labels.design_title_file_upload"/>
                                     </h3>
                                 </div>
-                                <!-- /.card-header -->
                                 <div class="card-body">
                                     <div class="form-group row">
                                         <label class="col-sm-3 text-sm-right col-form-label"><la:message
@@ -176,7 +167,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <!-- /.card-body -->
                                 <div class="card-footer">
                                     <button type="submit" class="btn btn-success" name="upload"
                                             value="<la:message key="labels.design_button_upload" />">
@@ -184,11 +174,9 @@
                                         <la:message key="labels.design_button_upload"/>
                                     </button>
                                 </div>
-                                <!-- /.card-footer -->
                             </la:form>
                         </div>
                     </c:if>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp b/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp
index 5a6589568..272a2a744 100644
--- a/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/design/admin_design_edit.jsp
@@ -42,7 +42,6 @@
                                         <la:message key="labels.design_title_edit_content"/>
                                     </h3>
                                 </div>
-                                <!-- /.card-header -->
                                 <div class="card-body">
                                     <h4>${f:h(displayFileName)}</h4>
                                     <div>
@@ -51,7 +50,6 @@
                                                      styleClass="form-control"></la:textarea>
                                     </div>
                                 </div>
-                                <!-- /.card-body -->
                                 <div class="card-footer">
                                     <button type="submit" class="btn btn-default" name="back"
                                             value="<la:message key="labels.design_button_back" />">
@@ -64,12 +62,10 @@
                                         <la:message key="labels.design_button_update"/>
                                     </button>
                                 </div>
-                                <!-- /.card-footer -->
                                 <la:hidden property="fileName"/>
                             </la:form>
                         </c:if>
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp b/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp
index bb3e05235..dcc8606cf 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/admin_dict.jsp
@@ -40,7 +40,6 @@
                                 <la:message key="labels.dict_list_link"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -77,9 +76,7 @@
                                 </table>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp
index 79c5e5460..75e99efba 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji.jsp
@@ -70,7 +70,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -158,9 +157,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp
index b2b404cd7..70147927e 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_details.jsp
@@ -126,13 +126,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp
index 807c32458..e01f1fe51 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_download.jsp
@@ -77,7 +77,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -90,7 +89,6 @@
                                     <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.dict_kuromoji_button_download" />">
@@ -98,9 +96,7 @@
                                     <la:message key="labels.dict_kuromoji_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp
index e13a7486a..e36d3d530 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_edit.jsp
@@ -93,7 +93,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -135,13 +134,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp
index a20cd0025..ef0cf8284 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/kuromoji/admin_dict_kuromoji_upload.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -95,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         value="<la:message key="labels.dict_kuromoji_button_upload" />">
@@ -103,9 +101,7 @@
                                     <la:message key="labels.dict_kuromoji_button_upload"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp
index ced479b53..5784cef0c 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping.jsp
@@ -70,7 +70,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -159,9 +158,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp
index 6b4539639..7491ea1b5 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_details.jsp
@@ -119,13 +119,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp
index 9662e3675..4a4d67f1b 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_download.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -91,7 +90,6 @@
                                     <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.dict_mapping_button_download" />">
@@ -99,9 +97,7 @@
                                     <la:message key="labels.dict_mapping_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp
index ccbfdc789..f3dcae5ad 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_edit.jsp
@@ -94,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -120,13 +119,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp
index da5f595f9..a0d9a8299 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/mapping/admin_dict_mapping_upload.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -95,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         value="<la:message key="labels.dict_mapping_button_upload" />">
@@ -103,9 +101,7 @@
                                     <la:message key="labels.dict_mapping_button_upload"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp
index 0aa1d8ff1..ad6339149 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords.jsp
@@ -71,7 +71,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -157,9 +156,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp
index 32523cee3..5e2014edc 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_details.jsp
@@ -115,13 +115,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp
index b54691450..5b96da181 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_download.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -91,7 +90,6 @@
                                     <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.dict_protwords_button_download" />">
@@ -99,9 +97,7 @@
                                     <la:message key="labels.dict_protwords_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp
index 4eaca3960..1d97f72fa 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_edit.jsp
@@ -94,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -112,13 +111,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp
index d5da83d69..0e3bf08fa 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/protwords/admin_dict_protwords_upload.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -95,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         value="<la:message key="labels.dict_protwords_button_upload" />">
@@ -103,9 +101,7 @@
                                     <la:message key="labels.dict_protwords_button_upload"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp
index 81db926ef..80e585d56 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride.jsp
@@ -71,7 +71,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -159,9 +158,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp
index f355d2ec0..9dff897cc 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_details.jsp
@@ -119,13 +119,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp
index 1c4012c4d..00ecc546c 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_download.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -91,7 +90,6 @@
                                     <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.dict_stemmeroverride_button_download" />">
@@ -99,9 +97,7 @@
                                     <la:message key="labels.dict_stemmeroverride_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp
index ecda190fb..45ec66a51 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_edit.jsp
@@ -94,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -119,13 +118,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp
index 4f828507d..ca29efe7d 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stemmeroverride/admin_dict_stemmeroverride_upload.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -95,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         value="<la:message key="labels.dict_stemmeroverride_button_upload" />">
@@ -103,9 +101,7 @@
                                     <la:message key="labels.dict_stemmeroverride_button_upload"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp
index 1d92a58c3..120d66101 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords.jsp
@@ -71,7 +71,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -157,9 +156,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp
index 9fa423d7e..c45e905c5 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_details.jsp
@@ -115,13 +115,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp
index 8c00559b2..15b435a5a 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_download.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -91,7 +90,6 @@
                                     <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.dict_stopwords_button_download" />">
@@ -99,9 +97,7 @@
                                     <la:message key="labels.dict_stopwords_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp
index 204c6ef38..ee019112b 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_edit.jsp
@@ -94,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -112,13 +111,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp
index b4e5c1512..db1209e15 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/stopwords/admin_dict_stopwords_upload.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -95,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         value="<la:message key="labels.dict_stopwords_button_upload" />">
@@ -103,9 +101,7 @@
                                     <la:message key="labels.dict_stopwords_button_upload"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp
index 217464456..a0f2a6e56 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym.jsp
@@ -71,7 +71,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -159,9 +158,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp
index 461e94c92..cdfdfa674 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_details.jsp
@@ -119,13 +119,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp
index fe9a6f95f..db63fa6e7 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_download.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -91,7 +90,6 @@
                                     <label for="name" class="col-sm-12 text-sm-right col-form-label">${f:h(path)}</label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.dict_synonym_button_download" />">
@@ -99,9 +97,7 @@
                                     <la:message key="labels.dict_synonym_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp
index 8f67443c1..9fb63a73f 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_edit.jsp
@@ -94,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -121,13 +120,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp
index 9261c258a..405ceb06c 100644
--- a/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/dict/synonym/admin_dict_synonym_upload.jsp
@@ -78,7 +78,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -95,7 +94,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         value="<la:message key="labels.dict_synonym_button_upload" />">
@@ -103,9 +101,7 @@
                                     <la:message key="labels.dict_synonym_button_upload"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
index 7bea34437..57cffec2c 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -121,9 +120,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp
index 6ed8a5b4b..1081c6655 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_details.jsp
@@ -73,13 +73,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp
index 0412baa82..fa3e931b3 100644
--- a/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/duplicatehost/admin_duplicatehost_edit.jsp
@@ -46,7 +46,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -73,13 +72,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp
index 82c556828..33d3bb8c9 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword.jsp
@@ -65,7 +65,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -113,9 +112,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp
index 274bced29..f6a91b8d7 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_details.jsp
@@ -88,7 +88,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -134,13 +133,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp
index 945b95757..2251c8470 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_download.jsp
@@ -70,7 +70,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -84,7 +83,6 @@
                                             key="labels.elevate_word_file"/></label>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary" name="download"
                                         value="<la:message key="labels.elevate_word_button_download" />">
@@ -92,9 +90,7 @@
                                     <la:message key="labels.elevate_word_button_download"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
index 12fdb30d3..d25be6ee8 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_edit.jsp
@@ -88,7 +88,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -144,13 +143,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp
index ad274108f..8b8ff0827 100644
--- a/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/elevateword/admin_elevateword_upload.jsp
@@ -69,7 +69,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -88,7 +87,6 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                         <div class="card-footer">
                             <button type="submit" class="btn btn-success" name="upload"
                                     value="<la:message key="labels.elevate_word_button_upload" />">
@@ -97,9 +95,7 @@
                                         key="labels.elevate_word_button_upload"/>
                             </button>
                         </div>
-                        <!-- /.card-footer -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp
index 45b7d77fd..cacf05135 100644
--- a/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/esreq/admin_esreq.jsp
@@ -38,7 +38,6 @@
                                 <la:message key="labels.esreq_configuration"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -68,11 +67,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.data-wrapper -->
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
index dcbdce547..78bc47082 100644
--- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl.jsp
@@ -38,7 +38,6 @@
                                 <la:message key="labels.failure_url_configuration"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -192,11 +191,8 @@
                                     </div>
                                 </c:if>
                             </div>
-                            <!-- /.data-wrapper -->
                         </div>
-                        <!-- ./card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp
index 045a03698..42f810847 100644
--- a/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/failureurl/admin_failureurl_details.jsp
@@ -64,7 +64,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -117,7 +116,6 @@
                                     </table>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <c:if test="${crudMode == 4}">
                                     <button type="submit" class="btn btn-default" name="back"
@@ -168,9 +166,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp
index 1ad600b2d..250c8b824 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth.jsp
@@ -43,7 +43,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -94,9 +93,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-body -->
                         </div>
-                        <!-- /.card -->
                     </c:if>
                 </div>
             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp
index 90be5fbf3..61a9851e1 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_details.jsp
@@ -101,13 +101,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp
index 6b2c5b4c3..0a7196ffb 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileauth/admin_fileauth_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -122,13 +121,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp
index e118f5f7e..4dcf961be 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig.jsp
@@ -136,9 +136,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
index 099f64532..43df8b663 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_details.jsp
@@ -46,7 +46,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -162,7 +161,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                                 <c:if test="${fe:permission('admin-scheduler')}">
@@ -172,9 +170,7 @@
                                         <la:message key="labels.file_crawling_button_create_job"/>
                                     </la:link></c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
index 5d2e0921e..29c3360c2 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileconfig/admin_fileconfig_edit.jsp
@@ -46,7 +46,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -225,13 +224,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
index 6648245e7..0946ee018 100644
--- a/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/general/admin_general.jsp
@@ -543,7 +543,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <c:if test="${editable}">
                                     <button type="submit" class="btn btn-success" name="update"
@@ -553,9 +552,7 @@
                                     </button>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp b/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp
index a536850d5..819dd1b51 100644
--- a/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/group/admin_group.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -81,9 +80,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp b/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp
index d38b77624..e0ba0ce99 100644
--- a/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/group/admin_group_details.jsp
@@ -69,13 +69,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp b/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp
index 100dc7198..b4025000f 100644
--- a/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/group/admin_group_edit.jsp
@@ -43,7 +43,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -72,13 +71,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
index 346acbb4e..74a3a7f1b 100644
--- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog.jsp
@@ -42,7 +42,6 @@
                                 <la:message key="labels.joblog_link_list"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -168,9 +167,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
index 6a43841b5..d0bca94b3 100644
--- a/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/joblog/admin_joblog_details.jsp
@@ -59,7 +59,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -109,7 +108,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-default" name="back"
                                         value="<la:message key="labels.joblog_button_back" />">
@@ -158,9 +156,7 @@
                                     </div>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
index b05c8c448..2a9883ec1 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -118,9 +117,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp
index a07acf426..763d3ea7d 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_details.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -89,13 +88,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp
index a547dbc95..a621d2fbf 100644
--- a/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/keymatch/admin_keymatch_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -97,13 +96,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
index d9856b60e..ce4d1682b 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -160,9 +159,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp
index f69b249ae..991737bac 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_details.jsp
@@ -94,13 +94,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp
index 4653093ef..77bc6d497 100644
--- a/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/labeltype/admin_labeltype_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -117,13 +116,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/log/admin_log.jsp b/src/main/webapp/WEB-INF/view/admin/log/admin_log.jsp
index b58026f59..3d96bde3f 100644
--- a/src/main/webapp/WEB-INF/view/admin/log/admin_log.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/log/admin_log.jsp
@@ -37,7 +37,6 @@
                                 <la:message key="labels.log_configuration"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -72,11 +71,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.data-wrapper -->
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
index 7f1c5ff4e..43aa77df5 100644
--- a/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/maintenance/admin_maintenance.jsp
@@ -44,7 +44,6 @@
                                     <la:message key="labels.upgrade_reindex"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div class="form-group row">
                                     <label for="replaceAliases" class="col-sm-3 text-sm-right col-form-label"><la:message
@@ -92,7 +91,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary ${f:h(editableClass)}"
                                         name="reindexOnly"
@@ -101,9 +99,7 @@
                                     <la:message key="labels.reindex_start_button"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                     <div class="col-md-12">
                         <div class="card card-outline card-primary">
@@ -112,7 +108,6 @@
                                     <la:message key="labels.reload_doc_index"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary"
                                         name="reloadDocIndex"
@@ -121,9 +116,7 @@
                                     <la:message key="labels.reload_doc_index_button"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                     <div class="col-md-12">
                         <div class="card card-outline card-primary">
@@ -132,7 +125,6 @@
                                     <la:message key="labels.clear_crawler_index"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-danger"
                                         name="clearCrawlerIndex"
@@ -141,9 +133,7 @@
                                     <la:message key="labels.clear_crawler_index_button"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </c:if>
                 <div class="col-md-12">
@@ -153,7 +143,6 @@
                                 <la:message key="labels.diagnostic_logs"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-footer">
                             <button type="submit" class="btn btn-primary"
                                     name="downloadLogs"
@@ -162,9 +151,7 @@
                                 <la:message key="labels.download_diagnostic_logs_button"/>
                             </button>
                         </div>
-                        <!-- /.card-footer -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </la:form>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
index 21628a8ac..2f94e691a 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -119,9 +118,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp
index 1e258617d..4c03c13e9 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_details.jsp
@@ -88,13 +88,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp
index 8cd374853..29de0e0c5 100644
--- a/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/pathmap/admin_pathmap_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -108,13 +107,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
index 657228345..0f2fa3074 100644
--- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin.jsp
@@ -45,7 +45,6 @@
                                 </div>
                             </div>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -141,11 +140,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.data-wrapper -->
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp
index 646b30de8..517b8d2a5 100644
--- a/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/plugin/admin_plugin_installplugin.jsp
@@ -40,7 +40,6 @@
                                 <la:message key="labels.plugin_install"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <la:form action="/admin/plugin/install" enctype="multipart/form-data">
                         <div class="card-body">
                             <ul class="nav nav-tabs" role="tablist">
@@ -87,7 +86,6 @@
                                 <la:message key="labels.crud_button_install"/>
                             </button>
                         </div>
-                        <!-- /.card-body -->
                         </la:form>
                         <div class="card-footer">
                             <la:form action="/admin/plugin/">
@@ -98,9 +96,7 @@
                             </button>
                             </la:form>
                         </div>
-                        <!-- /.card-footer -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
index 785c890ae..64be37f6b 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -118,9 +117,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp
index e6f73cf43..4aff57dc3 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_details.jsp
@@ -81,13 +81,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp
index aad8dbde9..a120367fd 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedcontent/admin_relatedcontent_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -88,13 +87,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
index 8a279c314..902b4f8fd 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -118,9 +117,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp
index 0120c9d78..51c1a04bb 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_details.jsp
@@ -76,13 +76,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp
index f6f5a8750..d7c0cfbf3 100644
--- a/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/relatedquery/admin_relatedquery_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -80,13 +79,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp
index 7f4753e90..74092882b 100644
--- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader.jsp
@@ -42,7 +42,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -88,9 +87,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-body -->
                         </div>
-                        <!-- /.card -->
                     </c:if>
                 </div>
             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp
index 988983347..152f72c75 100644
--- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_details.jsp
@@ -77,13 +77,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp
index 8648f0993..35734eeb1 100644
--- a/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/reqheader/admin_reqheader_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -83,13 +82,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp
index 336e9e91a..ca1448868 100644
--- a/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -81,9 +80,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp
index 1515f6d1a..b0bd09149 100644
--- a/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role_details.jsp
@@ -63,7 +63,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-default" name="list" value="back">
                                     <em class="fa fa-arrow-circle-left"></em>
@@ -111,9 +110,7 @@
                                     </div>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp b/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp
index a88cc18fc..111c0bbbb 100644
--- a/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/role/admin_role_edit.jsp
@@ -43,7 +43,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -60,13 +59,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler.jsp b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler.jsp
index a03c23881..701f84904 100644
--- a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler.jsp
@@ -35,7 +35,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -102,9 +101,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp
index 1e1f305de..58f47fa87 100644
--- a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_details.jsp
@@ -111,7 +111,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-default" name="list" value="back">
                                     <em class="fa fa-arrow-circle-left"></em>
@@ -180,9 +179,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_edit.jsp b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_edit.jsp
index 59b45b445..347918dc5 100644
--- a/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/scheduler/admin_scheduler_edit.jsp
@@ -44,7 +44,6 @@
                             <div class="card-header with-border">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -145,13 +144,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp
index 8d9b57b65..b7be0c915 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist.jsp
@@ -231,7 +231,6 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                         <div class="card-footer">
                             <c:if test="${f:h(allRecordCount) > 0}">
                                 <div class="row">
@@ -284,9 +283,7 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-footer -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
index 64f8f6396..db8f9aa3a 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlist/admin_searchlist_edit.jsp
@@ -82,7 +82,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -318,7 +317,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <c:if test="${crudMode == 1}">
                                     <la:link href="/admin/searchlist/search?q=${f:u(q)}" styleClass="btn btn-default">
@@ -343,9 +341,7 @@
                                     </button>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp
index f7c73dcaa..b039043d3 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog.jsp
@@ -42,7 +42,6 @@
                                 <la:message key="labels.searchlog_title"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -229,9 +228,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp
index e97912769..55b7ce7fd 100644
--- a/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/searchlog/admin_searchlog_details.jsp
@@ -61,7 +61,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -98,7 +97,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-footer">
                                 <c:if test="${crudMode == 4}">
                                     <button type="submit" class="btn btn-default" name="back"
@@ -149,9 +147,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
index b7d1cd978..3040c7743 100644
--- a/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/storage/admin_storage.jsp
@@ -55,7 +55,6 @@
                                 </div>
                             </c:if>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -270,11 +269,8 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.data-wrapper -->
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp b/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp
index d2e74b186..a01f34216 100644
--- a/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/suggest/admin_suggest.jsp
@@ -34,7 +34,6 @@
                                 <la:message key="labels.crud_title_list"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
diff --git a/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp b/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp
index 8b1f572fd..eaaa0fe90 100644
--- a/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/systeminfo/admin_systeminfo.jsp
@@ -43,7 +43,6 @@
 </c:forEach>
 								</textarea>
                         </div>
-                        <!-- /.card-body -->
                     </div>
                 </div>
                 <div class="col-md-6">
@@ -53,7 +52,6 @@
                                 <la:message key="labels.system_info_prop_title"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
 								<textarea id="propData" class="systemInfoData form-control"
                                           readonly>
@@ -61,7 +59,6 @@
 </c:forEach>
 								</textarea>
                         </div>
-                        <!-- /.card-body -->
                     </div>
                 </div>
             </div>
@@ -73,7 +70,6 @@
                                 <la:message key="labels.system_info_fess_prop_title"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <c:if test="${empty fessPropItems}">
 									<textarea id="fessPropData" class="systemInfoData form-control"
@@ -88,7 +84,6 @@
 									</textarea>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
                 </div>
                 <div class="col-md-6">
@@ -98,7 +93,6 @@
                                 <la:message key="labels.system_info_bug_report_title"/>
                             </h3>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
 								<textarea id="bugReportData" class="systemInfoData form-control"
                                           readonly>
@@ -106,7 +100,6 @@
 </c:forEach>
 								</textarea>
                         </div>
-                        <!-- /.card-body -->
                     </div>
                 </div>
             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
index 39c8e4a33..8f8998f53 100644
--- a/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/upgrade/admin_upgrade.jsp
@@ -44,7 +44,6 @@
                                     <la:message key="labels.upgrade_data_migration"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div class="form-group row">
                                     <label for="targetVersion" class="col-sm-3 text-sm-right col-form-label"><la:message
@@ -70,7 +69,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-primary ${f:h(editableClass)}"
                                         name="upgradeFrom"
@@ -79,9 +77,7 @@
                                     <la:message key="labels.upgrade_start_button"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </la:form>
             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp b/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp
index 771e492a8..5f38ddc0e 100644
--- a/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/user/admin_user.jsp
@@ -36,7 +36,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -81,9 +80,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp b/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp
index 50a162749..442e0f362 100644
--- a/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/user/admin_user_details.jsp
@@ -43,7 +43,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -258,13 +257,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp b/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp
index b2405aaa3..8ce844fdc 100644
--- a/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/user/admin_user_edit.jsp
@@ -43,7 +43,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -407,13 +406,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp
index 953fa6a87..e4807aaac 100644
--- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth.jsp
@@ -43,7 +43,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -94,9 +93,7 @@
                                     </c:if>
                                 </c:if>
                             </div>
-                            <!-- /.card-body -->
                         </div>
-                        <!-- /.card -->
                     </c:if>
                 </div>
             </div>
diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp
index 8c98e91a8..ef82aca78 100644
--- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_details.jsp
@@ -105,13 +105,10 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp
index 2f38e4609..6b8da40b2 100644
--- a/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webauth/admin_webauth_edit.jsp
@@ -45,7 +45,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -130,13 +129,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp
index 0d632fbdb..9c704c612 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig.jsp
@@ -35,7 +35,6 @@
                         <div class="card-header">
                             <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                         </div>
-                        <!-- /.card-header -->
                         <div class="card-body">
                             <%-- Message --%>
                             <div>
@@ -133,9 +132,7 @@
                                 </c:if>
                             </c:if>
                         </div>
-                        <!-- /.card-body -->
                     </div>
-                    <!-- /.card -->
                 </div>
             </div>
         </section>
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
index 92b434e18..4a375004b 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_details.jsp
@@ -46,7 +46,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message --%>
                                 <div>
@@ -165,7 +164,6 @@
                                     </tbody>
                                 </table>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                                 <c:if test="${editable}"><la:link styleClass="btn btn-success"
@@ -174,9 +172,7 @@
                                     <la:message key="labels.web_crawling_button_create_job"/>
                                 </la:link></c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
index 7f88b7e19..40b28d417 100644
--- a/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webconfig/admin_webconfig_edit.jsp
@@ -46,7 +46,6 @@
                             <div class="card-header">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/header.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div class="form-group row">
                                     <la:info id="msg" message="true">
@@ -233,13 +232,10 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <jsp:include page="/WEB-INF/view/common/admin/crud/buttons.jsp"></jsp:include>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp
index c8ba8f58c..dc35943cc 100644
--- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard.jsp
@@ -43,7 +43,6 @@
                                     <la:message key="labels.wizard_start_title"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                     <%-- Message: BEGIN --%>
                                 <div>
@@ -57,7 +56,6 @@
                                     <la:message key="labels.wizard_start_desc"/>
                                 </p>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <c:if test="${editable}">
                                     <button type="submit" class="btn btn-primary"
@@ -68,9 +66,7 @@
                                     </button>
                                 </c:if>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp
index 7ed033fad..aa10242ef 100644
--- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_config.jsp
@@ -45,7 +45,6 @@
                                     <la:message key="labels.wizard_crawling_setting_title"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -89,7 +88,6 @@
                                     </div>
                                 </div>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-outline-secondary" name="index"
                                         value="<la:message key="labels.wizard_button_cancel"/>">
@@ -108,9 +106,7 @@
                                     <la:message key="labels.wizard_button_register_next"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp
index b53639fa5..8425a90c5 100644
--- a/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/wizard/admin_wizard_start.jsp
@@ -46,7 +46,6 @@
                                     <la:message key="labels.wizard_start_crawler_title"/>
                                 </h3>
                             </div>
-                            <!-- /.card-header -->
                             <div class="card-body">
                                 <div>
                                     <la:info id="msg" message="true">
@@ -58,7 +57,6 @@
                                     <la:message key="labels.wizard_start_crawling_desc"/>
                                 </p>
                             </div>
-                            <!-- /.card-body -->
                             <div class="card-footer">
                                 <button type="submit" class="btn btn-success"
                                         name="startCrawling"
@@ -72,9 +70,7 @@
                                     <la:message key="labels.wizard_button_finish"/>
                                 </button>
                             </div>
-                            <!-- /.card-footer -->
                         </div>
-                        <!-- /.card -->
                     </div>
                 </div>
             </la:form>
diff --git a/src/main/webapp/WEB-INF/view/advance.jsp b/src/main/webapp/WEB-INF/view/advance.jsp
index 92a4e7429..e7c473cb7 100644
--- a/src/main/webapp/WEB-INF/view/advance.jsp
+++ b/src/main/webapp/WEB-INF/view/advance.jsp
@@ -98,7 +98,6 @@
 					<input class="form-control" type="text" id="as_q" name="as.q" value="${f:h(fe:join(as.q))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -109,7 +108,6 @@
 					<input class="form-control" type="text" id="as_epq" name="as.epq" value="${f:h(fe:join(as.epq))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -120,7 +118,6 @@
 					<input class="form-control" type="text" id="as_oq" name="as.oq" value="${f:h(fe:join(as.oq))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -131,7 +128,6 @@
 					<input class="form-control" type="text" id="as_nq" name="as.nq" value="${f:h(fe:join(as.nq))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -152,7 +148,6 @@
 					</la:select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -210,7 +205,6 @@
 					</la:select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -225,7 +219,6 @@
 					</la:select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<c:if test="${displayLabelTypeItems}">
@@ -241,7 +234,6 @@
 						</la:select>
 					</div>
 					<div class="col-lg-4 d-none d-lg-flex align-items-center">
-						<!-- TODO -->
 					</div>
 				</div>
 			</c:if>
@@ -267,7 +259,6 @@
 					</select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -295,7 +286,6 @@
 					</select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -314,7 +304,6 @@
 					</select>
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 			<div class="form-group row">
@@ -325,7 +314,6 @@
 					<input class="form-control" type="text" id="as_sitesearch" name="as.sitesearch" value="${f:h(fe:join(as.sitesearch))}">
 				</div>
 				<div class="col-lg-4 d-none d-lg-flex align-items-center">
-					<!-- TODO -->
 				</div>
 			</div>
 
diff --git a/src/main/webapp/WEB-INF/view/common/admin/footer.jsp b/src/main/webapp/WEB-INF/view/common/admin/footer.jsp
index 5aa348d75..1ccfc7230 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/footer.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/footer.jsp
@@ -1,8 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
-<!-- Main Footer -->
 <footer class="main-footer">
-	<!-- To the right -->
 	<div class="float-right d-none d-sm-inline-block"></div>
-	<!-- Default to the left -->
 	<la:message key="labels.footer.copyright" />
 </footer>
diff --git a/src/main/webapp/WEB-INF/view/common/admin/header.jsp b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
index 3a12d9dae..e5249dffb 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/header.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
@@ -1,7 +1,5 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
-<!-- Navbar -->
 <nav class="main-header navbar navbar-expand navbar-dark navbar-secondary">
-	<!-- Left navbar links -->
 	<ul class="navbar-nav">
 		<li class="nav-item">
 			<a class="nav-link" data-widget="pushmenu" href="#">
@@ -11,8 +9,6 @@
 			</a>
 		</li>
 	</ul>
-
-	<!-- Right navbar links -->
 	<ul class="navbar-nav ml-auto">
 		<c:if test="${eoled}">
 		<li class="nav-item" data-toggle="tooltip" data-placement="left" title="<la:message
@@ -42,4 +38,3 @@
 				class="fa fa-sign-out-alt"></em></a></li>
 	</ul>
 </nav>
-<!-- /.navbar -->
diff --git a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
index 2c7fd1816..5fa6958c8 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
@@ -1,20 +1,12 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
-
-<!-- Left side column. contains the logo and sidebar -->
 <aside class="main-sidebar sidebar-dark-primary">
-
-	<!-- Brand Logo -->
 	<la:link href="/admin/" styleClass="brand-link text-center">
 		<span class="brand-text">
 		<img src="${fe:url('/images/logo-head.png')}"
 			 alt="<la:message key="labels.header_brand_name" />" />
 		</span>
 	</la:link>
-
-	<!-- sidebar -->
 	<div class="sidebar">
-
-		<!-- SEARCH FORM -->
 		<c:if test="${fe:permission('admin-searchlist-view')}">
 			<form action="<%=request.getContextPath()%>/admin/searchlist/search" method="GET" class="form-inline mt-2 sidebar-search">
 				<div class="input-group">
@@ -29,8 +21,6 @@
 				</div>
 			</form>
 		</c:if>
-
-		<!-- Sidebar Menu -->
 		<nav class="mt-2">
 
 		<ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu">
@@ -386,7 +376,5 @@
 			</c:if>
 		</ul>
 		</nav>
-		<!-- /.sidebar-menu -->
 	</div>
-	<!-- /.sidebar -->
 </aside>
diff --git a/src/main/webapp/WEB-INF/view/login/index.jsp b/src/main/webapp/WEB-INF/view/login/index.jsp
index 9ace76f49..f99878d1e 100644
--- a/src/main/webapp/WEB-INF/view/login/index.jsp
+++ b/src/main/webapp/WEB-INF/view/login/index.jsp
@@ -22,7 +22,6 @@
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
-		<!-- /.login-logo -->
 		<div class="notification">${notification}</div>
 		<div class="card">
 			<div class="card-body login-card-body">
@@ -71,11 +70,8 @@
 					</div>
 				</la:form>
 			</div>
-			<!-- /.login-card-body -->
 		</div>
-		<!-- /.card -->
 	</div>
-	<!-- /.login-box -->
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript" src="${fe:url('/js/admin/popper.min.js')}"></script>
 	<script type="text/javascript"
diff --git a/src/main/webapp/WEB-INF/view/profile/index.jsp b/src/main/webapp/WEB-INF/view/profile/index.jsp
index 9b774890a..0ef74a800 100644
--- a/src/main/webapp/WEB-INF/view/profile/index.jsp
+++ b/src/main/webapp/WEB-INF/view/profile/index.jsp
@@ -22,7 +22,6 @@
 					alt="<la:message key="labels.header_brand_name" />" />
 			</la:link>
 		</div>
-		<!-- /.login-logo -->
 		<div class="card">
 			<div class="card-body login-card-body">
 				<p class="login-box-msg">
@@ -81,11 +80,8 @@
 					</div>
 				</la:form>
 			</div>
-			<!-- /.login-card-body -->
 		</div>
-		<!-- /.card -->
 	</div>
-	<!-- /.login-box -->
 	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script src="${fe:url('/js/admin/popper.min.js')}" type="text/javascript"></script>
 	<script type="text/javascript"