diff --git a/src/main/webapp/WEB-INF/view/common/admin/header.jsp b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
index 9bec9cd36..a3939528d 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/header.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/header.jsp
@@ -1,6 +1,6 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <!-- Navbar -->
-<nav class="main-header navbar navbar-expand navbar-white navbar-light">
+<nav class="main-header navbar navbar-expand navbar-dark navbar-secondary">
 	<!-- Left navbar links -->
 	<ul class="navbar-nav">
 		<li class="nav-item">
diff --git a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
index 30ddebdac..2c7fd1816 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/sidebar.jsp
@@ -38,7 +38,7 @@
 			<c:if test="${fe:permission('admin-dashboard-view')}">
 				<li class="nav-item">
 					<a class="nav-link <c:if test="${param.menuCategoryType=='dashboard'}">active</c:if>"
-					   href="${fe:url("/admin/dashboard/")}">
+					   href="${fe:url('/admin/dashboard/')}">
 						<em class="nav-icon fa fa-tachometer-alt"></em>
 						<p><la:message key="labels.menu_dashboard_config" /></p>
 					</a>
@@ -57,7 +57,7 @@
 				<ul class="nav nav-treeview">
 					<c:if test="${fe:permission('admin-wizard-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/wizard/")}" class="nav-link <c:if test="${param.menuType=='wizard'}">active</c:if>">
+						<a href="${fe:url('/admin/wizard/')}" class="nav-link <c:if test="${param.menuType=='wizard'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_wizard" /></p>
 						</a>
@@ -65,7 +65,7 @@
 					</c:if>
 					<c:if test="${fe:permission('admin-general-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/general/")}" class="nav-link <c:if test="${param.menuType=='general'}">active</c:if>">
+						<a href="${fe:url('/admin/general/')}" class="nav-link <c:if test="${param.menuType=='general'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_crawl_config" /></p>
 						</a>
@@ -73,21 +73,21 @@
 					</c:if>
 					<c:if test="${fe:permission('admin-scheduler-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/scheduler/")}" class="nav-link <c:if test="${param.menuType=='scheduler'}">active</c:if>">
+						<a href="${fe:url('/admin/scheduler/')}" class="nav-link <c:if test="${param.menuType=='scheduler'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_scheduler_config" /></p>
 						</a></li></c:if>
 						
 					<c:if test="${fe:permission('admin-design-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/design/")}" class="nav-link <c:if test="${param.menuType=='design'}">active</c:if>">
+						<a href="${fe:url('/admin/design/')}" class="nav-link <c:if test="${param.menuType=='design'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_design" /></p>
 						</a></li></c:if>
 						
 					<c:if test="${fe:permission('admin-dict-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/dict/")}" class="nav-link <c:if test="${param.menuType=='dict'}">active</c:if>">
+						<a href="${fe:url('/admin/dict/')}" class="nav-link <c:if test="${param.menuType=='dict'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_dict" /></p>
 						</a>
@@ -95,7 +95,7 @@
 					</c:if>
 					<c:if test="${fe:permission('admin-accesstoken-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/accesstoken/")}"
+						<a href="${fe:url('/admin/accesstoken/')}"
 						   class="nav-link <c:if test="${param.menuType=='accessToken'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_access_token" /></p>
@@ -104,7 +104,7 @@
 					</c:if>
 					<c:if test="${fe:permission('admin-plugin-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/plugin/")}" class="nav-link <c:if test="${param.menuType=='plugin'}">active</c:if>">
+						<a href="${fe:url('/admin/plugin/')}" class="nav-link <c:if test="${param.menuType=='plugin'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_plugin" /></p>
 						</a>
@@ -112,7 +112,7 @@
 					</c:if>
 					<c:if test="${fe:permission('admin-storage-view') and storageEnabled.booleanValue()}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/storage/")}" class="nav-link <c:if test="${param.menuType=='storage'}">active</c:if>">
+						<a href="${fe:url('/admin/storage/')}" class="nav-link <c:if test="${param.menuType=='storage'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_storage" /></p>
 						</a>
@@ -133,14 +133,14 @@
 				<ul class="nav nav-treeview">
 					<c:if test="${fe:permission('admin-webconfig-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/webconfig/")}" class="nav-link <c:if test="${param.menuType=='webConfig'}">active</c:if>">
+						<a href="${fe:url('/admin/webconfig/')}" class="nav-link <c:if test="${param.menuType=='webConfig'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_web" /></p>
 						</a></li></c:if>
 						
 					<c:if test="${fe:permission('admin-fileconfig-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/fileconfig/")}"
+						<a href="${fe:url('/admin/fileconfig/')}"
 						   class="nav-link <c:if test="${param.menuType=='fileConfig'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_file_system" /></p>
@@ -148,7 +148,7 @@
 						
 					<c:if test="${fe:permission('admin-dataconfig-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/dataconfig/")}"
+						<a href="${fe:url('/admin/dataconfig/')}"
 						   class="nav-link <c:if test="${param.menuType=='dataConfig'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_data_store" /></p>
@@ -156,21 +156,21 @@
 						
 					<c:if test="${fe:permission('admin-labeltype-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/labeltype/")}" class="nav-link <c:if test="${param.menuType=='labelType'}">active</c:if>">
+						<a href="${fe:url('/admin/labeltype/')}" class="nav-link <c:if test="${param.menuType=='labelType'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_label_type" /></p>
 						</a></li></c:if>
 						
 					<c:if test="${fe:permission('admin-keymatch-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/keymatch/")}" class="nav-link <c:if test="${param.menuType=='keyMatch'}">active</c:if>">
+						<a href="${fe:url('/admin/keymatch/')}" class="nav-link <c:if test="${param.menuType=='keyMatch'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_key_match" /></p>
 						</a></li></c:if>
 						
 					<c:if test="${fe:permission('admin-boostdoc-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/boostdoc/")}"
+						<a href="${fe:url('/admin/boostdoc/')}"
 						   class="nav-link <c:if test="${param.menuType=='boostDocumentRule'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_boost_document_rule" /></p>
@@ -178,7 +178,7 @@
 						
 					<c:if test="${fe:permission('admin-relatedcontent-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/relatedcontent/")}"
+						<a href="${fe:url('/admin/relatedcontent/')}"
 						   class="nav-link <c:if test="${param.menuType=='relatedContent'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_related_content" /></p>
@@ -186,7 +186,7 @@
 						
 					<c:if test="${fe:permission('admin-relatedquery-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/relatedquery/")}"
+						<a href="${fe:url('/admin/relatedquery/')}"
 						   class="nav-link <c:if test="${param.menuType=='relatedQuery'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_related_query" /></p>
@@ -194,14 +194,14 @@
 						
 					<c:if test="${fe:permission('admin-pathmap-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/pathmap/")}" class="nav-link <c:if test="${param.menuType=='pathMapping'}">active</c:if>">
+						<a href="${fe:url('/admin/pathmap/')}" class="nav-link <c:if test="${param.menuType=='pathMapping'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_path_mapping" /></p>
 						</a></li></c:if>
 						
 					<c:if test="${fe:permission('admin-webauth-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/webauth/")}"
+						<a href="${fe:url('/admin/webauth/')}"
 						   class="nav-link <c:if test="${param.menuType=='webAuthentication'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_web_authentication" /></p>
@@ -209,7 +209,7 @@
 						
 					<c:if test="${fe:permission('admin-fileauth-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/fileauth/")}"
+						<a href="${fe:url('/admin/fileauth/')}"
 						   class="nav-link <c:if test="${param.menuType=='fileAuthentication'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_file_authentication" /></p>
@@ -217,7 +217,7 @@
 						
 					<c:if test="${fe:permission('admin-reqheader-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/reqheader/")}"
+						<a href="${fe:url('/admin/reqheader/')}"
 						   class="nav-link <c:if test="${param.menuType=='requestHeader'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_request_header" /></p>
@@ -225,7 +225,7 @@
 						
 					<c:if test="${fe:permission('admin-duplicatehost-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/duplicatehost/")}"
+						<a href="${fe:url('/admin/duplicatehost/')}"
 						   class="nav-link <c:if test="${param.menuType=='duplicateHost'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_duplicate_host" /></p>
@@ -245,21 +245,21 @@
 				<ul class="nav nav-treeview">
 					<c:if test="${fe:permission('admin-user-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/user/")}" class="nav-link <c:if test="${param.menuType=='user'}">active</c:if>">
+						<a href="${fe:url('/admin/user/')}" class="nav-link <c:if test="${param.menuType=='user'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_user" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-role-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/role/")}" class="nav-link <c:if test="${param.menuType=='role'}">active</c:if>">
+						<a href="${fe:url('/admin/role/')}" class="nav-link <c:if test="${param.menuType=='role'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_role" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-group-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/group/")}" class="nav-link <c:if test="${param.menuType=='group'}">active</c:if>">
+						<a href="${fe:url('/admin/group/')}" class="nav-link <c:if test="${param.menuType=='group'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_group" /></p>
 						</a></li></c:if>
@@ -279,14 +279,14 @@
 				<ul class="nav nav-treeview">
 					<c:if test="${fe:permission('admin-suggest-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/suggest/")}" class="nav-link <c:if test="${param.menuType=='suggestWord'}">active</c:if>">
+						<a href="${fe:url('/admin/suggest/')}" class="nav-link <c:if test="${param.menuType=='suggestWord'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_suggest_word" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-elevateword-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/elevateword/")}"
+						<a href="${fe:url('/admin/elevateword/')}"
 						   class="nav-link <c:if test="${param.menuType=='elevateWord'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_elevate_word" /></p>
@@ -294,7 +294,7 @@
 
 					<c:if test="${fe:permission('admin-badword-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/badword/")}" class="nav-link <c:if test="${param.menuType=='badWord'}">active</c:if>">
+						<a href="${fe:url('/admin/badword/')}" class="nav-link <c:if test="${param.menuType=='badWord'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_bad_word" /></p>
 						</a></li></c:if>
@@ -313,7 +313,7 @@
 				<ul class="nav nav-treeview">
 					<c:if test="${fe:permission('admin-systeminfo-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/systeminfo/")}"
+						<a href="${fe:url('/admin/systeminfo/')}"
 						   class="nav-link <c:if test="${param.menuType=='systemInfo'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_system_info" /></p>
@@ -321,21 +321,21 @@
 
 					<c:if test="${fe:permission('admin-searchlog-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/searchlog/")}" class="nav-link <c:if test="${param.menuType=='searchLog'}">active</c:if>">
+						<a href="${fe:url('/admin/searchlog/')}" class="nav-link <c:if test="${param.menuType=='searchLog'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_searchLog" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-joblog-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/joblog/")}" class="nav-link <c:if test="${param.menuType=='jobLog'}">active</c:if>">
+						<a href="${fe:url('/admin/joblog/')}" class="nav-link <c:if test="${param.menuType=='jobLog'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_jobLog" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-crawlinginfo-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/crawlinginfo/")}"
+						<a href="${fe:url('/admin/crawlinginfo/')}"
 						   class="nav-link <c:if test="${param.menuType=='crawlingInfo'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_crawling_info" /></p>
@@ -343,14 +343,14 @@
 
 					<c:if test="${fe:permission('admin-log-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/log/")}" class="nav-link <c:if test="${param.menuType=='log'}">active</c:if>">
+						<a href="${fe:url('/admin/log/')}" class="nav-link <c:if test="${param.menuType=='log'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_log" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-failureurl-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/failureurl/")}"
+						<a href="${fe:url('/admin/failureurl/')}"
 						   class="nav-link <c:if test="${param.menuType=='failureUrl'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_failure_url" /></p>
@@ -358,7 +358,7 @@
 
 					<c:if test="${fe:permission('admin-searchlist-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/searchlist/")}"
+						<a href="${fe:url('/admin/searchlist/')}"
 						   class="nav-link <c:if test="${param.menuType=='searchList'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_search_list" /></p>
@@ -366,14 +366,14 @@
 
 					<c:if test="${fe:permission('admin-backup-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/backup/")}" class="nav-link <c:if test="${param.menuType=='backup'}">active</c:if>">
+						<a href="${fe:url('/admin/backup/')}" class="nav-link <c:if test="${param.menuType=='backup'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_backup" /></p>
 						</a></li></c:if>
 
 					<c:if test="${fe:permission('admin-maintenance-view')}">
 					<li class="nav-item">
-						<a href="${fe:url("/admin/maintenance/")}"
+						<a href="${fe:url('/admin/maintenance/')}"
 						   class="nav-link <c:if test="${param.menuType=='maintenance'}">active</c:if>">
 							<em class='fa fa-genderless nav-icon'></em>
 							<p><la:message key="labels.menu_maintenance" /></p>