diff --git a/src/main/webapp/WEB-INF/orig/view/error/header.jsp b/src/main/webapp/WEB-INF/orig/view/error/header.jsp
index fe768d0fe..01674e32e 100755
--- a/src/main/webapp/WEB-INF/orig/view/error/header.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/header.jsp
@@ -1,32 +1,73 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <la:form action="/search" method="get" styleId="searchForm"
-	styleClass="searchResultForm">
-${fe:facetForm()}${fe:geoForm()}
+		 role="search">
+	${fe:facetForm()}${fe:geoForm()}
 	<nav class="navbar navbar-dark bg-inverse navbar-fixed-top">
 		<la:link styleClass="navbar-brand" href="/">
 			<img src="${f:url('/images/logo-head.png')}"
-				alt="<la:message key="labels.header_brand_name" />" />
+				 alt="<la:message key="labels.header_brand_name" />" />
 		</la:link>
 		<div
-			class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8 pull-right"
-			role="search">
+				class="search-box navbar-form col-lg-5 col-md-6 col-sm-6 col-xs-8"
+				role="search">
 			<div class="input-group">
 				<la:text property="q" maxlength="1000" styleId="query"
-					styleClass="form-control" autocomplete="off" />
+						 styleClass="form-control" autocomplete="off" />
 				<span class="input-group-btn">
 					<button type="submit" name="search" id="searchButton"
-						class="btn btn-primary">
+							class="btn btn-primary">
 						<i class="fa fa-search"></i>
 					</button>
 					<button type="button" class="btn btn-default"
-						data-toggle="control-options" data-target="#searchOptions"
-						id="searchOptionsButton">
+							data-toggle="control-options" data-target="#searchOptions"
+							id="searchOptionsButton">
 						<i class="fa fa-cog"></i> <span class="sr-only"><la:message
-								key="labels.header_form_option_btn" /></span>
+							key="labels.header_form_option_btn" /></span>
 					</button>
 				</span>
 			</div>
 		</div>
+		<ul class="nav navbar-nav hidden-xs-down pull-right">
+			<c:choose>
+				<c:when test="${!empty username && username != 'guest'}">
+					<li class="nav-item">
+						<div class="dropdown">
+							<a class="nav-link dropdown-toggle" data-toggle="dropdown"
+							   href="#" role="button" aria-haspopup="true"
+							   aria-expanded="false"> <i class="fa fa-user"></i>
+								<span>${username}</span>
+							</a>
+							<div class="dropdown-menu" aria-labelledby="userMenu">
+								<la:link href="/profile" styleClass="dropdown-item">
+									<la:message key="labels.profile" />
+								</la:link>
+								<c:if test="${adminUser == true}">
+									<la:link href="/admin" styleClass="dropdown-item">
+										<la:message key="labels.administration" />
+									</la:link>
+								</c:if>
+								<la:link href="/logout" styleClass="dropdown-item">
+									<la:message key="labels.logout" />
+								</la:link>
+							</div>
+						</div>
+					</li>
+				</c:when>
+				<c:when test="${ pageLoginLink }">
+					<li class="nav-item"><la:link href="/login"
+												  styleClass="nav-link  " role="button" aria-haspopup="true"
+												  aria-expanded="false">
+						<i class="fa fa-sign-in"></i>
+						<span><la:message key="labels.login" /></span>
+					</la:link></li>
+				</c:when>
+			</c:choose>
+			<li class="nav-item"><la:link href="/help" styleClass="nav-link" role="help" aria-haspopup="true"
+										  aria-expanded="false">
+				<i class="fa fa-question-circle"></i>
+				<span><la:message key="labels.index_help" /></span>
+			</la:link></li>
+		</ul>
 	</nav>
 	<div id="searchOptions" class="control-options">
 		<div class="container">
@@ -37,7 +78,7 @@ ${fe:facetForm()}${fe:geoForm()}
 				<fieldset class="form-group">
 					<label for="contentNum"><la:message key="labels.index_num" /></label>
 					<la:select property="num" styleId="numSearchOption"
-						styleClass="form-control">
+							   styleClass="form-control">
 						<option value="">
 							<la:message key="labels.search_result_select_num" />
 						</option>
@@ -53,7 +94,7 @@ ${fe:facetForm()}${fe:geoForm()}
 					<label for="contentSort"><la:message
 							key="labels.index_sort" /></label>
 					<la:select property="sort" styleId="sortSearchOption"
-						styleClass="form-control">
+							   styleClass="form-control">
 						<option value="">
 							<la:message key="labels.search_result_select_sort" />
 						</option>
@@ -100,11 +141,11 @@ ${fe:facetForm()}${fe:geoForm()}
 					<label for="contentLang"><la:message
 							key="labels.index_lang" /></label>
 					<la:select property="lang" styleId="langSearchOption"
-						multiple="true" styleClass="form-control">
+							   multiple="true" styleClass="form-control">
 						<c:forEach var="item" items="${langItems}">
 							<la:option value="${f:u(item.value)}">
-				    ${f:h(item.label)}
-				</la:option>
+								${f:h(item.label)}
+							</la:option>
 						</c:forEach>
 					</la:select>
 				</fieldset>
@@ -113,11 +154,11 @@ ${fe:facetForm()}${fe:geoForm()}
 						<label for="contentLabelType"><la:message
 								key="labels.index_label" /></label>
 						<la:select property="fields.label" styleId="labelTypeSearchOption"
-							multiple="true" styleClass="form-control">
+								   multiple="true" styleClass="form-control">
 							<c:forEach var="item" items="${labelTypeItems}">
 								<la:option value="${f:u(item.value)}">
-					${f:h(item.label)}
-				    </la:option>
+									${f:h(item.label)}
+								</la:option>
 							</c:forEach>
 						</la:select>
 					</fieldset>
@@ -132,8 +173,8 @@ ${fe:facetForm()}${fe:geoForm()}
 					<la:message key="labels.search" />
 				</button>
 				<button class="btn btn-secondary pull-right"
-					data-toggle="control-options" data-target="#searchOptions"
-					id="searchOptionsCloseButton">
+						data-toggle="control-options" data-target="#searchOptions"
+						id="searchOptionsCloseButton">
 					<i class="fa fa-angle-double-right"></i>
 					<la:message key="labels.search_options_close" />
 				</button>
diff --git a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
index b1e720f10..72e86cc4f 100644
--- a/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/error/redirect.jsp
@@ -13,15 +13,14 @@ if("systemError".equals(type)) {
 		response.sendError(statusCode);
 	}
 } else if("logOut".equals(type)) {
-	redirectPage.append("/login/index?type=logout");
+	redirectPage.append("/login/?type=logout&code=" + statusCode);
 	response.sendRedirect(redirectPage.toString());
 } else if("badRequest".equals(type)) {
 	redirectPage.append("/error/badrequest");
 	response.sendRedirect(redirectPage.toString());
-} else {
+} else if(!"badAuth".equals(type)) {
 	redirectPage.append("/error/notfound?url=");
 	redirectPage.append(java.net.URLEncoder.encode(requestUri , "UTF-8"));
 	response.sendRedirect(redirectPage.toString());
 }
- %>
-
+ %>Bad Authentication.
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/orig/view/index.jsp b/src/main/webapp/WEB-INF/orig/view/index.jsp
index 0c157a1ed..4c794540c 100644
--- a/src/main/webapp/WEB-INF/orig/view/index.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/index.jsp
@@ -4,7 +4,7 @@
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="x-ua-compatible" content="ie=edge">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <title><la:message key="labels.search_title" /></title>
 <c:if test="${osddLink}">
 	<link rel="search" type="application/opensearchdescription+xml"
diff --git a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
index 9a9fb5c5b..58b3ca914 100644
--- a/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
+++ b/src/main/webapp/WEB-INF/orig/view/searchResults.jsp
@@ -128,6 +128,7 @@
 				<ul class="list-group m-b">
 					<li class="list-group-item text-uppercase"><la:message
 							key="${facetQueryView.title}" /></li>
+					<c:set var="facetFound" value="F"/>
 					<c:forEach var="queryEntry" items="${facetQueryView.queryMap}">
 						<c:if test="${facetResponse.queryCountMap[queryEntry.value] != 0}">
 							<li class="list-group-item p-l-md"><la:link
@@ -135,8 +136,12 @@
 									<la:message key="${queryEntry.key}" />
 									<span class="label label-default label-pill pull-right">${f:h(facetResponse.queryCountMap[queryEntry.value])}</span>
 								</la:link></li>
+							<c:set var="facetFound" value="T"/>
 						</c:if>
 					</c:forEach>
+					<c:if test="${facetFound == 'F'}">
+						<li class="list-group-item p-l-md"><la:message key="labels.facet_is_not_found" /></li>
+					</c:if>
 				</ul>
 			</c:forEach>
 			<c:if test="${!empty ex_q}">
diff --git a/src/main/webapp/WEB-INF/view/common/admin/head.jsp b/src/main/webapp/WEB-INF/view/common/admin/head.jsp
index 03deb52fd..04d8c61a9 100644
--- a/src/main/webapp/WEB-INF/view/common/admin/head.jsp
+++ b/src/main/webapp/WEB-INF/view/common/admin/head.jsp
@@ -1,6 +1,6 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-<meta http-equiv="x-ua-compatible" content="ie=edge">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <link href="${f:url('/css/admin/bootstrap.min.css')}" rel="stylesheet" type="text/css" />
 <link href="${f:url('/css/admin/font-awesome.min.css')}" rel="stylesheet" type="text/css" />
 <link href="${f:url('/css/admin/AdminLTE.min.css')}" rel="stylesheet" type="text/css" />
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index 0c157a1ed..4c794540c 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -4,7 +4,7 @@
 <head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="x-ua-compatible" content="ie=edge">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
 <title><la:message key="labels.search_title" /></title>
 <c:if test="${osddLink}">
 	<link rel="search" type="application/opensearchdescription+xml"