diff --git a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java
index c339197dc..7729deab0 100644
--- a/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java
+++ b/src/main/java/org/codelibs/fess/es/exentity/FileAuthentication.java
@@ -1,6 +1,8 @@
 package org.codelibs.fess.es.exentity;
 
 import org.codelibs.fess.es.bsentity.BsFileAuthentication;
+import org.codelibs.fess.service.FileConfigService;
+import org.codelibs.fess.util.ComponentUtil;
 
 /**
  * @author FreeGen
@@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsFileAuthentication;
 public class FileAuthentication extends BsFileAuthentication {
 
     private static final long serialVersionUID = 1L;
+    private FileConfig fileConfig;
 
     @Override
     public String getId() {
@@ -26,4 +29,12 @@ public class FileAuthentication extends BsFileAuthentication {
     public void setVersionNo(Long version) {
         asDocMeta().version(version);
     }
+
+    public FileConfig getFileConfig() {
+        if (fileConfig == null) {
+            final FileConfigService fileConfigService = ComponentUtil.getComponent(FileConfigService.class);
+            fileConfig = fileConfigService.getFileConfig(getFileConfigId());
+        }
+        return fileConfig;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java b/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java
index 00c33bd5b..d6dd50492 100644
--- a/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java
+++ b/src/main/java/org/codelibs/fess/es/exentity/RequestHeader.java
@@ -1,6 +1,8 @@
 package org.codelibs.fess.es.exentity;
 
 import org.codelibs.fess.es.bsentity.BsRequestHeader;
+import org.codelibs.fess.service.WebConfigService;
+import org.codelibs.fess.util.ComponentUtil;
 
 /**
  * @author FreeGen
@@ -8,6 +10,7 @@ import org.codelibs.fess.es.bsentity.BsRequestHeader;
 public class RequestHeader extends BsRequestHeader {
 
     private static final long serialVersionUID = 1L;
+    private WebConfig webConfig;
 
     @Override
     public String getId() {
@@ -30,4 +33,12 @@ public class RequestHeader extends BsRequestHeader {
     public org.codelibs.robot.client.http.RequestHeader getS2RobotRequestHeader() {
         return new org.codelibs.robot.client.http.RequestHeader(getName(), getValue());
     }
+
+    public WebConfig getWebConfig() {
+        if (webConfig == null) {
+            final WebConfigService webConfigService = ComponentUtil.getComponent(WebConfigService.class);
+            webConfig = webConfigService.getWebConfig(getWebConfigId());
+        }
+        return webConfig;
+    }
 }
diff --git a/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java b/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java
index f2730d4e2..99b46fe43 100644
--- a/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java
+++ b/src/main/java/org/codelibs/fess/web/admin/FileAuthenticationForm.java
@@ -67,7 +67,7 @@ public class FileAuthenticationForm implements Serializable {
     public String parameters;
 
     @Required(target = "confirmfromcreate,create,confirmfromupdate,update,delete")
-    @LongType
+    @Maxbytelength(maxbytelength = 1000)
     public String fileConfigId;
 
     @Required(target = "confirmfromupdate,update,delete")
diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp
index 10eee1f0a..b99b269a3 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/confirm.jsp
@@ -1,134 +1,172 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.file_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.file_authentication_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.file_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.file_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.file_authentication_hostname" /></th>
-							<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_port" /></th>
-							<td>${f:h(port)}<html:hidden property="port" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_scheme" /></th>
-							<td><c:forEach var="item" items="${protocolSchemeItems}">
-									<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="protocolScheme" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_username" /></th>
-							<td>${f:h(username)}<html:hidden property="username" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_password" /></th>
-							<td><c:if test="${password!=''}">******</c:if> <html:hidden
-									property="password" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_parameters" /></th>
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(parameters))}<html:hidden
-									property="parameters" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_file_crawling_config" /></th>
-							<td><c:forEach var="item" items="${fileConfigItems}">
-									<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="fileConfigId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.file_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.file_authentication_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.file_authentication_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.file_authentication_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.file_authentication_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+			<section class="content">
 
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.file_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.file_authentication_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.file_authentication_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.file_authentication_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.file_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
 
-	</tiles:put>
-</tiles:insert>
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.file_authentication_hostname" /></th>
+												<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.file_authentication_port" /></th>
+												<td>${f:h(port)}<html:hidden property="port" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_scheme" /></th>
+													<td><c:forEach var="item" items="${protocolSchemeItems}">
+															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="protocolScheme" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_username" /></th>
+													<td>${f:h(username)}<html:hidden property="username" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_password" /></th>
+													<td><c:if test="${password!=''}">******</c:if>
+															<html:hidden property="password" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_parameters" /></th>
+													<td>${f:br(f:h(parameters))}<html:hidden property="parameters" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.file_authentication_file_crawling_config" /></th>
+													<td><c:forEach var="item" items="${fileConfigItems}">
+															<c:if test="${fileConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="fileConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.file_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.file_authentication_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.file_authentication_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.file_authentication_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.file_authentication_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp
index 93f1fcf56..dc1dd5d00 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/edit.jsp
@@ -1,125 +1,151 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.file_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.file_authentication_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.file_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.file_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.file_authentication_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.file_authentication_hostname" /></th>
-							<td><html:text property="hostname" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_port" /></th>
-							<td><html:text property="port" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_scheme" /></th>
-							<td><html:select property="protocolScheme">
-									<c:forEach var="item" items="${protocolSchemeItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_username" /></th>
-							<td><html:text property="username" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.file_authentication_password" /></th>
-							<td><html:password property="password" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_parameters" /></th>
-							<td><html:textarea property="parameters" style="width:98%;"
-									rows="5" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.file_authentication_file_crawling_config" /></th>
-							<td><html:select property="fileConfigId">
-									<c:forEach var="item" items="${fileConfigItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.file_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.file_authentication_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.file_authentication_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+			<section class="content">
 
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
 
-	</tiles:put>
-</tiles:insert>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.file_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.file_authentication_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.file_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="hostname"><bean:message key="labels.file_authentication_hostname" /></label>
+										<html:text property="hostname" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="port"><bean:message key="labels.file_authentication_port" /></label>
+										<html:text property="port" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="protocolScheme"><bean:message key="labels.file_authentication_scheme" /></label>
+										<html:select property="protocolScheme" styleClass="form-control">
+												<c:forEach var="item" items="${protocolSchemeItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="username"><bean:message key="labels.file_authentication_username" /></label>
+										<html:text property="username" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="password"><bean:message key="labels.file_authentication_password" /></label>
+										<html:password property="password" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="parameters"><bean:message key="labels.file_authentication_parameters" /></label>
+										<html:textarea property="parameters" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="fileConfigId"><bean:message key="labels.file_authentication_file_crawling_config" /></label>
+										<html:select property="fileConfigId" styleClass="form-control">
+												<c:forEach var="item" items="${fileConfigItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.file_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.file_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.file_authentication_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp
index 33d182373..58cf19f69 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/error.jsp
@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.file_authentication_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.file_authentication_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/fileAuthentication/">
+							<bean:message key="labels.file_authentication_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.file_authentication_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp
index 1397f04b7..bb03f3b14 100644
--- a/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/fileAuthentication/index.jsp
@@ -1,130 +1,143 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.file_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="fileAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.file_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="fileAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.file_authentication_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<c:if test="${displayCreateLink}">
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.file_authentication_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.file_authentication_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.file_authentication_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.file_authentication_link_list" />
 						</s:link></li>
-				</ul>
-				</c:if>
-				<c:if test="${!displayCreateLink}">
-					<s:link href="../fileConfig/index" styleClass="btn primary">
-						<bean:message key="labels.file_authentication_create_file_config" />
-					</s:link>
-				</c:if>
-			</div>
-			<c:if test="${displayCreateLink && fileAuthenticationPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${displayCreateLink && fileAuthenticationPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 200px;"><bean:message
-									key="labels.file_authentication_list_hostname" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.file_authentication_list_file_crawling_config" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${fileAuthenticationItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td><c:if test="${data.hostname==null||data.hostname==''}">
-										<bean:message key="labels.file_authentication_any" />
-									</c:if>${f:h(data.hostname)}:<c:if test="${data.port==-1}">
-										<bean:message key="labels.file_authentication_any" />
-									</c:if> <c:if test="${data.port!=-1}">${f:h(data.port)}</c:if></td>
-								<td>${f:h(data.fileConfig.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.file_authentication_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.file_authentication_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.file_authentication_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${fileAuthenticationPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${fileAuthenticationPager.currentPageNumber - 1}">
-										<bean:message key="labels.file_authentication_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!fileAuthenticationPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.file_authentication_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${fileAuthenticationPager.pageNumberList}">
-								<li
-									<c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${fileAuthenticationPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${fileAuthenticationPager.currentPageNumber + 1}">
-										<bean:message key="labels.file_authentication_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!fileAuthenticationPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.file_authentication_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(fileAuthenticationPager.currentPageNumber)}"
-								arg1="${f:h(fileAuthenticationPager.allPageCount)}"
-								arg2="${f:h(fileAuthenticationPager.allRecordCount)}" /></span>
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<c:if test="${!displayCreateLink}">
+							<s:link href="../fileConfig/index" styleClass="btn btn-primary">
+								<bean:message key="labels.file_authentication_create_file_config" />
+							</s:link>
+						</c:if>
+						<c:if test="${displayCreateLink}">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<bean:message key="labels.file_authentication_link_list" />
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="createpage">
+												<bean:message key="labels.file_authentication_link_create_new" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- List --%>
+									<c:if test="${fileAuthenticationPager.allRecordCount == 0}">
+										<p class="alert-message warning">
+											<bean:message key="labels.list_could_not_find_crud_table" />
+										</p>
+									</c:if>
+									<c:if test="${fileAuthenticationPager.allRecordCount > 0}">
+										<table class="table table-bordered table-striped">
+											<thead>
+												<tr>
+													<th><bean:message key="labels.file_authentication_list_hostname" /></th>
+													<th><bean:message key="labels.file_authentication_list_file_crawling_config" /></th>
+												</tr>
+											</thead>
+											<tbody>
+												<c:forEach var="data" varStatus="s" items="${fileAuthenticationItems}">
+													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+														<td><c:if test="${data.hostname==null||data.hostname==''}">
+																<bean:message key="labels.file_authentication_any" />
+															</c:if>
+															${f:h(data.hostname)}:
+															<c:if test="${data.port==-1}">
+																<bean:message key="labels.file_authentication_any" />
+															</c:if> <c:if test="${data.port!=-1}">
+																${f:h(data.port)}
+															</c:if>
+														</td>
+														<td>${f:h(data.fileConfig.name)}</td>
+													</tr>
+												</c:forEach>
+											</tbody>
+										</table>
+									</c:if>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<%-- Paging Info --%>
+									<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(fileAuthenticationPager.currentPageNumber)}"
+											arg1="${f:h(fileAuthenticationPager.allPageCount)}" arg2="${f:h(fileAuthenticationPager.allRecordCount)}"
+										/></span>
+
+									<%-- Paging Navigation --%>
+									<ul class="pagination pagination-sm no-margin pull-right">
+										<c:if test="${fileAuthenticationPager.existPrePage}">
+											<li class="prev"><s:link href="list/${fileAuthenticationPager.currentPageNumber - 1}">
+													<bean:message key="labels.file_authentication_link_prev_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!fileAuthenticationPager.existPrePage}">
+											<li class="prev disabled"><a href="#"><bean:message key="labels.file_authentication_link_prev_page" /></a></li>
+										</c:if>
+										<c:forEach var="p" varStatus="s" items="${fileAuthenticationPager.pageNumberList}">
+											<li <c:if test="${p == fileAuthenticationPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+											</li>
+										</c:forEach>
+										<c:if test="${fileAuthenticationPager.existNextPage}">
+											<li class="next"><s:link href="list/${fileAuthenticationPager.currentPageNumber + 1}">
+													<bean:message key="labels.file_authentication_link_next_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!fileAuthenticationPager.existNextPage}">
+											<li class="next disabled"><a href="#"><bean:message key="labels.file_authentication_link_next_page" /></a></li>
+										</c:if>
+									</ul>
+
+								</div>
+							</div>
+						</c:if>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp
index 23c97f59d..d11b3c6d4 100644
--- a/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/confirm.jsp
@@ -1,112 +1,153 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.request_header_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.request_header_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.request_header_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.request_header_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.request_header_name" /></th>
-							<td>${f:h(name)}<html:hidden property="name" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.request_header_value" /></th>
-							<td>${f:h(value)}<html:hidden property="value" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.request_header_web_crawling_config" /></th>
-							<td><c:forEach var="item" items="${webConfigItems}">
-									<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="webConfigId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.request_header_button_create"/>" />
-									<input type="submit"class="btn small" name="editagain"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.request_header_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.request_header_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.request_header_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.request_header_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.request_header_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.request_header_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.request_header_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.request_header_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.request_header_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.request_header_name" /></th>
+												<td>${f:h(name)}<html:hidden property="name" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.request_header_value" /></th>
+												<td>${f:h(value)}<html:hidden property="value" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.request_header_web_crawling_config" /></th>
+													<td><c:forEach var="item" items="${webConfigItems}">
+															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="webConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.request_header_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.request_header_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.request_header_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.request_header_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.request_header_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp
index be7d96eff..b09e90174 100644
--- a/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/edit.jsp
@@ -1,102 +1,131 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.request_header_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.request_header_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.request_header_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.request_header_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.request_header_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.request_header_name" /></th>
-							<td><html:text property="name" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.request_header_value" /></th>
-							<td><html:text property="value" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.request_header_web_crawling_config" /></th>
-							<td><html:select property="webConfigId">
-									<c:forEach var="item" items="${webConfigItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.request_header_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.request_header_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.request_header_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.request_header_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.request_header_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.request_header_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="name"><bean:message key="labels.request_header_name" /></label>
+										<html:text property="name" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="value"><bean:message key="labels.request_header_value" /></label>
+										<html:text property="value" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="webConfigId"><bean:message key="labels.request_header_web_crawling_config" /></label>
+										<html:select property="webConfigId" styleClass="form-control">
+												<c:forEach var="item" items="${webConfigItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.request_header_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.request_header_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.request_header_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp
index 6ef26ff8a..26d64f7bb 100644
--- a/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/error.jsp
@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.request_header_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.request_header_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/requestHeader/">
+							<bean:message key="labels.request_header_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.request_header_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp b/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp
index 1f3523840..03a1d2838 100644
--- a/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/requestHeader/index.jsp
@@ -1,124 +1,134 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.request_header_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="requestHeader" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.request_header_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="requestHeader" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.request_header_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<c:if test="${displayCreateLink}">
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.request_header_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.request_header_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.request_header_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.request_header_link_list" />
 						</s:link></li>
-				</ul>
-				</c:if>
-				<c:if test="${!displayCreateLink}">
-					<s:link href="../webConfig/index" styleClass="btn primary">
-						<bean:message key="labels.request_header_create_web_config" />
-					</s:link>
-				</c:if>
-			</div>
-			<c:if test="${displayCreateLink && requestHeaderPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${requestHeaderPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 200px;"><bean:message
-									key="labels.request_header_list_name" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.request_header_list_web_crawling_config" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s" items="${requestHeaderItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td>${f:h(data.name)}</td>
-								<td>${f:h(data.webConfig.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.request_header_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.request_header_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.request_header_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${requestHeaderPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${requestHeaderPager.currentPageNumber - 1}">
-										<bean:message key="labels.request_header_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!requestHeaderPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.request_header_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${requestHeaderPager.pageNumberList}">
-								<li
-									<c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${requestHeaderPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${requestHeaderPager.currentPageNumber + 1}">
-										<bean:message key="labels.request_header_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!requestHeaderPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.request_header_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(requestHeaderPager.currentPageNumber)}"
-								arg1="${f:h(requestHeaderPager.allPageCount)}"
-								arg2="${f:h(requestHeaderPager.allRecordCount)}" /></span>
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<c:if test="${!displayCreateLink}">
+							<s:link href="../webConfig/index" styleClass="btn btn-primary">
+								<bean:message key="labels.request_header_create_web_config" />
+							</s:link>
+						</c:if>
+						<c:if test="${displayCreateLink}">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<bean:message key="labels.request_header_link_list" />
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="createpage">
+												<bean:message key="labels.request_header_link_create_new" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- List --%>
+									<c:if test="${requestHeaderPager.allRecordCount == 0}">
+										<p class="alert-message warning">
+											<bean:message key="labels.list_could_not_find_crud_table" />
+										</p>
+									</c:if>
+									<c:if test="${requestHeaderPager.allRecordCount > 0}">
+										<table class="table table-bordered table-striped">
+											<thead>
+												<tr>
+													<th><bean:message key="labels.request_header_list_name" /></th>
+													<th><bean:message key="labels.request_header_list_web_crawling_config" /></th>
+												</tr>
+											</thead>
+											<tbody>
+													<c:forEach var="data" varStatus="s" items="${requestHeaderItems}">
+															<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+																	<td>${f:h(data.name)}</td>
+																	<td>${f:h(data.webConfig.name)}</td>
+															</tr>
+													</c:forEach>
+											</tbody>
+										</table>
+									</c:if>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<%-- Paging Info --%>
+									<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(requestHeaderPager.currentPageNumber)}"
+											arg1="${f:h(requestHeaderPager.allPageCount)}" arg2="${f:h(requestHeaderPager.allRecordCount)}"
+										/></span>
+
+									<%-- Paging Navigation --%>
+									<ul class="pagination pagination-sm no-margin pull-right">
+										<c:if test="${requestHeaderPager.existPrePage}">
+											<li class="prev"><s:link href="list/${requestHeaderPager.currentPageNumber - 1}">
+													<bean:message key="labels.request_header_link_prev_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!requestHeaderPager.existPrePage}">
+											<li class="prev disabled"><a href="#"><bean:message key="labels.request_header_link_prev_page" /></a></li>
+										</c:if>
+										<c:forEach var="p" varStatus="s" items="${requestHeaderPager.pageNumberList}">
+											<li <c:if test="${p == requestHeaderPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+											</li>
+										</c:forEach>
+										<c:if test="${requestHeaderPager.existNextPage}">
+											<li class="next"><s:link href="list/${requestHeaderPager.currentPageNumber + 1}">
+													<bean:message key="labels.request_header_link_next_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!requestHeaderPager.existNextPage}">
+											<li class="next disabled"><a href="#"><bean:message key="labels.request_header_link_next_page" /></a></li>
+										</c:if>
+									</ul>
+
+								</div>
+							</div>
+						</c:if>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
-		</div>
-		<%-- List: END --%>
 
-	</tiles:put>
-</tiles:insert>
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp
index 11e5823dc..f31401fb6 100644
--- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/confirm.jsp
@@ -1,136 +1,176 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.web_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.web_authentication_title_confirm" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.web_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.web_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Confirm Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.web_authentication_hostname" /></th>
-							<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_port" /></th>
-							<td>${f:h(port)}<html:hidden property="port" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_realm" /></th>
-							<td>${f:h(authRealm)}<html:hidden property="authRealm" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_scheme" /></th>
-							<td><c:forEach var="item" items="${protocolSchemeItems}">
-									<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="protocolScheme" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_username" /></th>
-							<td>${f:h(username)}<html:hidden property="username" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_password" /></th>
-							<td><c:if test="${password!=''}">******</c:if> <html:hidden
-									property="password" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_parameters" /></th>
-							<td style="width: 345px; word-break: break-all;">${f:br(f:h(parameters))}<html:hidden
-									property="parameters" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.web_authentication_web_crawling_config" /></th>
-							<td><c:forEach var="item" items="${webConfigItems}">
-									<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
-								</c:forEach> <html:hidden property="webConfigId" /></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="create"
-										value="<bean:message key="labels.web_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="update"
-										value="<bean:message key="labels.web_authentication_button_update"/>" />
-									<input type="submit" class="btn small" name="editagain"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 3}">
-									<input type="submit" class="btn small" name="delete"
-										value="<bean:message key="labels.web_authentication_button_delete"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 4}">
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-									<input type="submit" class="btn small" name="editfromconfirm"
-										value="<bean:message key="labels.web_authentication_button_edit"/>" />
-									<input type="submit" class="btn small" name="deletefromconfirm"
-										value="<bean:message key="labels.web_authentication_button_delete"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Confirm Form: BEGIN --%>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2 || crudMode==3 || crudMode==4}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.web_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.web_authentication_link_update" />
+										</c:if>
+										<c:if test="${crudMode == 3}">
+											<bean:message key="labels.web_authentication_link_delete" />
+										</c:if>
+										<c:if test="${crudMode == 4}">
+											<bean:message key="labels.web_authentication_link_confirm" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.web_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<table class="table table-bordered">
+										<tbody>
+											<tr>
+												<th class="col-xs-2"><bean:message key="labels.web_authentication_hostname" /></th>
+												<td>${f:h(hostname)}<html:hidden property="hostname" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.web_authentication_port" /></th>
+												<td>${f:h(port)}<html:hidden property="port" /></td>
+											</tr>
+											<tr>
+												<th><bean:message key="labels.web_authentication_realm" /></th>
+												<td>${f:h(authRealm)}<html:hidden property="authRealm" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_scheme" /></th>
+													<td><c:forEach var="item" items="${protocolSchemeItems}">
+															<c:if test="${protocolScheme==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="protocolScheme" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_username" /></th>
+													<td>${f:h(username)}<html:hidden property="username" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_password" /></th>
+													<td><c:if test="${password!=''}">******</c:if>
+															<html:hidden property="password" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_parameters" /></th>
+													<td>${f:br(f:h(parameters))}<html:hidden property="parameters" /></td>
+											</tr>
+											<tr>
+													<th><bean:message key="labels.web_authentication_web_crawling_config" /></th>
+													<td><c:forEach var="item" items="${webConfigItems}">
+															<c:if test="${webConfigId==item.value}">${f:h(item.label)}</c:if>
+													</c:forEach> <html:hidden property="webConfigId" /></td>
+											</tr>
+										</tbody>
+									</table>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="create"
+											value="<bean:message key="labels.web_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="editagain" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="update"
+											value="<bean:message key="labels.web_authentication_button_update"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 3}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="delete"
+											value="<bean:message key="labels.web_authentication_button_delete"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 4}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn" name="editfromconfirm"
+											value="<bean:message key="labels.web_authentication_button_edit"/>"
+										/>
+										<input type="submit" class="btn" name="deletefromconfirm"
+											value="<bean:message key="labels.web_authentication_button_delete"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp
index b7aa6aeb2..23722f25b 100644
--- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/edit.jsp
@@ -1,127 +1,155 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.web_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.web_authentication_title_details" />
-		</h3>
+		<div class="content-wrapper">
 
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
-
-			<div>
-				<ul class="pills">
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.web_authentication_title_details" />
+				</h1>
+				<ol class="breadcrumb">
 					<li><s:link href="index">
 							<bean:message key="labels.web_authentication_link_list" />
 						</s:link></li>
 					<c:if test="${crudMode == 1}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_create" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_create" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 2}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_update" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_update" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 3}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_delete" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_delete" /></a></li>
 					</c:if>
 					<c:if test="${crudMode == 4}">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_confirm" /></a></li>
+						<li class="active"><a href="#"><bean:message key="labels.web_authentication_link_confirm" /></a></li>
 					</c:if>
-				</ul>
-			</div>
+				</ol>
+			</section>
 
-		<%-- Edit Form: BEGIN --%>
-		<s:form>
-			<html:hidden property="crudMode" />
-			<div>
-				<c:if test="${crudMode==2}">
-					<html:hidden property="id" />
-					<html:hidden property="versionNo" />
-				</c:if>
-				<html:hidden property="createdBy" />
-				<html:hidden property="createdTime" />
-				<table class="bordered-table zebra-striped" style="width: 500px;">
-					<tbody>
-						<tr>
-							<th style="width: 150px;"><bean:message
-									key="labels.web_authentication_hostname" /></th>
-							<td><html:text property="hostname" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_port" /></th>
-							<td><html:text property="port" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_realm" /></th>
-							<td><html:text property="authRealm" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_scheme" /></th>
-							<td><html:select property="protocolScheme">
-									<c:forEach var="item" items="${protocolSchemeItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_username" /></th>
-							<td><html:text property="username" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_password" /></th>
-							<td><html:password property="password" style="width:98%;" /></td>
-						</tr>
-						<tr>
-							<th><bean:message key="labels.web_authentication_parameters" /></th>
-							<td><html:textarea property="parameters" style="width:98%;"
-									rows="5" /></td>
-						</tr>
-						<tr>
-							<th><bean:message
-									key="labels.web_authentication_web_crawling_config" /></th>
-							<td><html:select property="webConfigId">
-									<c:forEach var="item" items="${webConfigItems}">
-										<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
-									</c:forEach>
-								</html:select></td>
-						</tr>
-					</tbody>
-					<tfoot>
-						<tr>
-							<td colspan="2"><c:if test="${crudMode == 1}">
-									<input type="submit" class="btn small" name="confirmfromcreate"
-										value="<bean:message key="labels.web_authentication_button_create"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if> <c:if test="${crudMode == 2}">
-									<input type="submit" class="btn small" name="confirmfromupdate"
-										value="<bean:message key="labels.web_authentication_button_confirm"/>" />
-									<input type="submit" class="btn small" name="back"
-										value="<bean:message key="labels.web_authentication_button_back"/>" />
-								</c:if></td>
-						</tr>
-					</tfoot>
-				</table>
-			</div>
-		</s:form>
-		<%-- Edit Form: BEGIN --%>
+			<section class="content">
 
-	</tiles:put>
-</tiles:insert>
+				<%-- Form --%>
+				<s:form>
+					<html:hidden property="crudMode" />
+					<c:if test="${crudMode==2}">
+						<html:hidden property="id" />
+						<html:hidden property="versionNo" />
+					</c:if>
+					<html:hidden property="createdBy" />
+					<html:hidden property="createdTime" />
+
+					<div class="row">
+						<div class="col-md-12">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<c:if test="${crudMode == 1}">
+											<bean:message key="labels.web_authentication_link_create" />
+										</c:if>
+										<c:if test="${crudMode == 2}">
+											<bean:message key="labels.web_authentication_link_update" />
+										</c:if>
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="index">
+												<bean:message key="labels.web_authentication_link_list" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- Form Fields --%>
+									<div class="form-group">
+										<label for="hostname"><bean:message key="labels.web_authentication_hostname" /></label>
+										<html:text property="hostname" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="port"><bean:message key="labels.web_authentication_port" /></label>
+										<html:text property="port" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="authRealm"><bean:message key="labels.web_authentication_realm" /></label>
+										<html:text property="authRealm" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="protocolScheme"><bean:message key="labels.web_authentication_scheme" /></label>
+										<html:select property="protocolScheme" styleClass="form-control">
+												<c:forEach var="item" items="${protocolSchemeItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+									<div class="form-group">
+										<label for="username"><bean:message key="labels.web_authentication_username" /></label>
+										<html:text property="username" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="password"><bean:message key="labels.web_authentication_password" /></label>
+										<html:password property="password" styleClass="form-control" />
+									</div>
+									<div class="form-group">
+										<label for="parameters"><bean:message key="labels.web_authentication_parameters" /></label>
+										<html:textarea property="parameters" styleClass="form-control" rows="5" />
+									</div>
+									<div class="form-group">
+										<label for="webConfigId"><bean:message key="labels.web_authentication_web_crawling_config" /></label>
+										<html:select property="webConfigId" styleClass="form-control">
+												<c:forEach var="item" items="${webConfigItems}">
+														<html:option value="${f:u(item.value)}">${f:h(item.label)}</html:option>
+												</c:forEach>
+										</html:select>
+									</div>
+								</div>
+
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<c:if test="${crudMode == 1}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromcreate"
+											value="<bean:message key="labels.web_authentication_button_create"/>"
+										/>
+									</c:if>
+									<c:if test="${crudMode == 2}">
+										<input type="submit" class="btn" name="back" value="<bean:message key="labels.web_authentication_button_back"/>" />
+										<input type="submit" class="btn btn-primary" name="confirmfromupdate"
+											value="<bean:message key="labels.web_authentication_button_confirm"/>"
+										/>
+									</c:if>
+								</div>
+							</div>
+						</div>
+					</div>
+				</s:form>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp
index e08600966..8a7857317 100644
--- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/error.jsp
@@ -1,17 +1,50 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp" flush="true">
-	<tiles:put name="title"><bean:message key="labels.web_authentication_configuration" /></tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-<div id="main">
-<html:errors/>
-<br>
-<s:link href="index"><bean:message key="labels.web_authentication_button_back"/></s:link>
-</div>
+		<div class="content-wrapper">
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.wizard_start_title" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="/admin/webAuthentication/">
+							<bean:message key="labels.web_authentication_link_list" />
+						</s:link></li>
+				</ol>
+			</section>
 
-	</tiles:put>
-</tiles:insert>
+			<section class="content">
+
+				<div class="callout callout-danger lead">
+					<h4>Error</h4>
+					<p>
+						<html:errors />
+					</p>
+					<p>
+						<s:link href="index">
+							<bean:message key="labels.web_authentication_button_back" />
+						</s:link>
+					</p>
+				</div>
+
+			</section>
+		</div>
+
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>
diff --git a/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp b/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp
index 7328cba2f..68cf7aa7d 100644
--- a/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp
+++ b/src/main/webapp/WEB-INF/view/admin/webAuthentication/index.jsp
@@ -1,129 +1,143 @@
-<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><tiles:insert template="/WEB-INF/view/common/admin/layout.jsp"
-	flush="true">
-	<tiles:put name="title">
-		<bean:message key="labels.web_authentication_configuration" />
-	</tiles:put>
-	<tiles:put name="header" value="/WEB-INF/view/common/admin/header.jsp" />
-	<tiles:put name="footer" value="/WEB-INF/view/common/admin/footer.jsp" />
-	<tiles:put name="menu" value="/WEB-INF/view/common/admin/menu.jsp" />
-	<tiles:put name="menuType" value="webAuthentication" />
-	<tiles:put name="headerScript" type="string"></tiles:put>
-	<tiles:put name="body" type="string">
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%><!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<title>Fess | <bean:message key="labels.web_authentication_configuration" /></title>
+<jsp:include page="/WEB-INF/view/common/admin2/head.jsp"></jsp:include>
+</head>
+<body class="skin-blue sidebar-mini">
+	<div class="wrapper">
+		<jsp:include page="/WEB-INF/view/common/admin2/header.jsp"></jsp:include>
+		<jsp:include page="/WEB-INF/view/common/admin2/sidebar.jsp">
+			<jsp:param name="menuCategoryType" value="crawl" />
+			<jsp:param name="menuType" value="webAuthentication" />
+		</jsp:include>
 
-		<h3>
-			<bean:message key="labels.web_authentication_title_details" />
-		</h3>
-		<%-- Message: BEGIN --%>
-		<div>
-			<html:messages id="msg" message="true">
-				<div class="alert-message info"><bean:write name="msg" ignore="true" /></div>
-			</html:messages>
-			<html:errors />
-		</div>
-		<%-- Message: END --%>
+		<div class="content-wrapper">
 
-		<%-- List: BEGIN --%>
-		<div class="list-table">
-			<div>
-				<c:if test="${displayCreateLink}">
-				<ul class="pills">
-					<li class="active"><a href="#"><bean:message
-								key="labels.web_authentication_link_list" /></a></li>
-					<li><s:link href="createpage">
-							<bean:message key="labels.web_authentication_link_create_new" />
+			<%-- Content Header --%>
+			<section class="content-header">
+				<h1>
+					<bean:message key="labels.web_authentication_configuration" />
+				</h1>
+				<ol class="breadcrumb">
+					<li class="active"><s:link href="index">
+							<bean:message key="labels.web_authentication_link_list" />
 						</s:link></li>
-				</ul>
-				</c:if>
-				<c:if test="${!displayCreateLink}">
-					<s:link href="../webConfig/index" styleClass="btn primary">
-						<bean:message key="labels.web_authentication_create_web_config" />
-					</s:link>
-				</c:if>
-			</div>
-			<c:if test="${displayCreateLink && webAuthenticationPager.allRecordCount == 0}">
-				<p class="alert-message warning">
-					<bean:message key="labels.list_could_not_find_crud_table" />
-				</p>
-			</c:if>
-			<c:if test="${displayCreateLink && webAuthenticationPager.allRecordCount > 0}">
-				<table class="bordered-table zebra-striped">
-					<thead>
-						<tr>
-							<th style="text-align: center; width: 250px;"><bean:message
-									key="labels.web_authentication_list_hostname" /></th>
-							<th style="text-align: center;"><bean:message
-									key="labels.web_authentication_list_web_crawling_config" /></th>
-							<th style="text-align: center; width: 150px;">&nbsp;</th>
-						</tr>
-					</thead>
-					<tbody>
-						<c:forEach var="data" varStatus="s"
-							items="${webAuthenticationItems}">
-							<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}">
-								<td><c:if test="${data.hostname==null||data.hostname==''}">
-										<bean:message key="labels.web_authentication_any" />
-									</c:if>${f:h(data.hostname)}:<c:if test="${data.port==-1}">
-										<bean:message key="labels.web_authentication_any" />
-									</c:if> <c:if test="${data.port!=-1}">${f:h(data.port)}</c:if></td>
-								<td>${f:h(data.webConfig.name)}</td>
-								<td style="text-align: center;"><s:link
-										href="confirmpage/4/${f:u(data.id)}">
-										<bean:message key="labels.web_authentication_link_details" />
-									</s:link> <s:link href="editpage/2/${f:u(data.id)}">
-										<bean:message key="labels.web_authentication_link_edit" />
-									</s:link> <s:link href="deletepage/3/${f:u(data.id)}">
-										<bean:message key="labels.web_authentication_link_delete" />
-									</s:link></td>
-							</tr>
-						</c:forEach>
-					</tbody>
-				</table>
-				<%-- Page Navigation: BEGIN --%>
-				<div class="row center">
-					<div class="pagination">
-						<ul>
-							<c:if test="${webAuthenticationPager.existPrePage}">
-								<li class="prev"><s:link
-										href="list/${webAuthenticationPager.currentPageNumber - 1}">
-										<bean:message key="labels.web_authentication_link_prev_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!webAuthenticationPager.existPrePage}">
-								<li class="prev disabled"><a href="#"><bean:message
-											key="labels.web_authentication_link_prev_page" /></a></li>
-							</c:if>
-							<c:forEach var="p" varStatus="s"
-								items="${webAuthenticationPager.pageNumberList}">
-								<li
-									<c:if test="${p == webAuthenticationPager.currentPageNumber}">class="active"</c:if>>
-									<s:link href="list/${p}">${p}</s:link>
-								</li>
-							</c:forEach>
-							<c:if test="${webAuthenticationPager.existNextPage}">
-								<li class="next"><s:link
-										href="list/${webAuthenticationPager.currentPageNumber + 1}">
-										<bean:message key="labels.web_authentication_link_next_page" />
-									</s:link></li>
-							</c:if>
-							<c:if test="${!webAuthenticationPager.existNextPage}">
-								<li class="next disabled"><a href="#"><bean:message
-											key="labels.web_authentication_link_next_page" /></a></li>
-							</c:if>
-						</ul>
-					</div>
+				</ol>
+			</section>
 
-					<div>
-						<span><bean:message key="labels.pagination_page_guide_msg"
-								arg0="${f:h(webAuthenticationPager.currentPageNumber)}"
-								arg1="${f:h(webAuthenticationPager.allPageCount)}"
-								arg2="${f:h(webAuthenticationPager.allRecordCount)}" /></span>
+			<section class="content">
+
+				<div class="row">
+					<div class="col-md-12">
+						<c:if test="${!displayCreateLink}">
+							<s:link href="../webConfig/index" styleClass="btn btn-primary">
+								<bean:message key="labels.web_authentication_create_web_config" />
+							</s:link>
+						</c:if>
+						<c:if test="${displayCreateLink}">
+							<div class="box">
+								<%-- Box Header --%>
+								<div class="box-header with-border">
+									<h3 class="box-title">
+										<bean:message key="labels.web_authentication_link_list" />
+									</h3>
+									<div class="box-tools pull-right">
+										<span class="label label-default"><s:link href="createpage">
+												<bean:message key="labels.web_authentication_link_create_new" />
+											</s:link></span>
+									</div>
+								</div>
+								<%-- Box Body --%>
+								<div class="box-body">
+									<%-- Message --%>
+									<div>
+										<html:messages id="msg" message="true">
+											<div class="alert-message info">
+												<bean:write name="msg" ignore="true" />
+											</div>
+										</html:messages>
+										<html:errors />
+									</div>
+
+									<%-- List --%>
+									<c:if test="${webAuthenticationPager.allRecordCount == 0}">
+										<p class="alert-message warning">
+											<bean:message key="labels.list_could_not_find_crud_table" />
+										</p>
+									</c:if>
+									<c:if test="${webAuthenticationPager.allRecordCount > 0}">
+										<table class="table table-bordered table-striped">
+											<thead>
+												<tr>
+													<th><bean:message key="labels.web_authentication_list_hostname" /></th>
+													<th><bean:message key="labels.web_authentication_list_web_crawling_config" /></th>
+												</tr>
+											</thead>
+											<tbody>
+												<c:forEach var="data" varStatus="s" items="${webAuthenticationItems}">
+													<tr class="${s.index % 2 == 0 ? 'row1' : 'row2'}" data-href="confirmpage/4/${f:u(data.id)}">
+														<td><c:if test="${data.hostname==null||data.hostname==''}">
+																<bean:message key="labels.web_authentication_any" />
+															</c:if>
+															${f:h(data.hostname)}:
+															<c:if test="${data.port==-1}">
+																<bean:message key="labels.web_authentication_any" />
+															</c:if> <c:if test="${data.port!=-1}">
+																${f:h(data.port)}
+															</c:if>
+														</td>
+														<td>${f:h(data.webConfig.name)}</td>
+													</tr>
+												</c:forEach>
+											</tbody>
+										</table>
+									</c:if>
+
+								</div>
+								<%-- Box Footer --%>
+								<div class="box-footer">
+									<%-- Paging Info --%>
+									<span><bean:message key="labels.pagination_page_guide_msg" arg0="${f:h(webAuthenticationPager.currentPageNumber)}"
+											arg1="${f:h(webAuthenticationPager.allPageCount)}" arg2="${f:h(webAuthenticationPager.allRecordCount)}"
+										/></span>
+
+									<%-- Paging Navigation --%>
+									<ul class="pagination pagination-sm no-margin pull-right">
+										<c:if test="${webAuthenticationPager.existPrePage}">
+											<li class="prev"><s:link href="list/${webAuthenticationPager.currentPageNumber - 1}">
+													<bean:message key="labels.web_authentication_link_prev_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!webAuthenticationPager.existPrePage}">
+											<li class="prev disabled"><a href="#"><bean:message key="labels.web_authentication_link_prev_page" /></a></li>
+										</c:if>
+										<c:forEach var="p" varStatus="s" items="${webAuthenticationPager.pageNumberList}">
+											<li <c:if test="${p == webAuthenticationPager.currentPageNumber}">class="active"</c:if>><s:link href="list/${p}">${p}</s:link>
+											</li>
+										</c:forEach>
+										<c:if test="${webAuthenticationPager.existNextPage}">
+											<li class="next"><s:link href="list/${webAuthenticationPager.currentPageNumber + 1}">
+													<bean:message key="labels.web_authentication_link_next_page" />
+												</s:link></li>
+										</c:if>
+										<c:if test="${!webAuthenticationPager.existNextPage}">
+											<li class="next disabled"><a href="#"><bean:message key="labels.web_authentication_link_next_page" /></a></li>
+										</c:if>
+									</ul>
+
+								</div>
+							</div>
+						</c:if>
 					</div>
 				</div>
-				<%-- Page Navigation: END --%>
-			</c:if>
+
+			</section>
 		</div>
-		<%-- List: END --%>
 
-
-	</tiles:put>
-</tiles:insert>
+		<jsp:include page="/WEB-INF/view/common/admin2/footer.jsp"></jsp:include>
+	</div>
+	<jsp:include page="/WEB-INF/view/common/admin2/foot.jsp"></jsp:include>
+</body>
+</html>