diff --git a/src/main/webapp/WEB-INF/view/help.jsp b/src/main/webapp/WEB-INF/view/help.jsp
index 4e4c6940a..de7fc7b74 100644
--- a/src/main/webapp/WEB-INF/view/help.jsp
+++ b/src/main/webapp/WEB-INF/view/help.jsp
@@ -1,11 +1,10 @@
 <%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8"%>
 <!DOCTYPE html>
 <html>
-<head>
+<head profile="http://a9.com/-/spec/opensearch/1.1/">
 <meta charset="utf-8">
-<meta http-equiv="content-style-type" content="text/css" />
-<meta http-equiv="content-script-type" content="text/javascript" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="x-ua-compatible" content="ie=edge">
 <title><la:message key="labels.search_title" /></title>
 <link href="${f:url('/css/style-base.css')}" rel="stylesheet"
 	type="text/css" />
@@ -17,7 +16,7 @@
 	<jsp:include page="header.jsp" />
 	<div class="container">
 		<div class="row">
-			<div class="span10">
+			<div class="col-md-12">
 
 				<jsp:include page="${helpPage}" />
 
@@ -28,7 +27,7 @@
 		</p>
 		<jsp:include page="footer.jsp" />
 	</div>
-	<input type="hidden" id="contextPath" value="<%=request.getContextPath()%>" />
+	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
diff --git a/src/main/webapp/WEB-INF/view/index.jsp b/src/main/webapp/WEB-INF/view/index.jsp
index 5a907b512..8f2289bdc 100644
--- a/src/main/webapp/WEB-INF/view/index.jsp
+++ b/src/main/webapp/WEB-INF/view/index.jsp
@@ -218,8 +218,7 @@
 		</div>
 		<jsp:include page="footer.jsp" />
 	</div>
-	<input type="hidden" id="contextPath"
-		value="<%=request.getContextPath()%>" />
+	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
diff --git a/src/main/webapp/WEB-INF/view/login/index.jsp b/src/main/webapp/WEB-INF/view/login/index.jsp
index 8d1d55397..680071cb5 100644
--- a/src/main/webapp/WEB-INF/view/login/index.jsp
+++ b/src/main/webapp/WEB-INF/view/login/index.jsp
@@ -86,8 +86,7 @@
 
 	<jsp:include page="footer.jsp" />
 
-	<input type="hidden" id="contextPath"
-		value="<%=request.getContextPath()%>" />
+	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
diff --git a/src/main/webapp/WEB-INF/view/login/logout.jsp b/src/main/webapp/WEB-INF/view/login/logout.jsp
index 759f2751a..c007b32bf 100644
--- a/src/main/webapp/WEB-INF/view/login/logout.jsp
+++ b/src/main/webapp/WEB-INF/view/login/logout.jsp
@@ -15,7 +15,7 @@
 	<div class="container">
 		<div class="content">
 			<div class="center row">
-				<div class="span16">
+				<div class="col-md-12">
 					<h2>
 						<la:message key="labels.logout" />
 					</h2>
diff --git a/src/main/webapp/WEB-INF/view/search.jsp b/src/main/webapp/WEB-INF/view/search.jsp
index 3b5e17aa5..a2e545f4f 100644
--- a/src/main/webapp/WEB-INF/view/search.jsp
+++ b/src/main/webapp/WEB-INF/view/search.jsp
@@ -111,8 +111,7 @@
 		</c:choose>
 		<jsp:include page="footer.jsp" />
 	</div>
-	<input type="hidden" id="contextPath"
-		value="<%=request.getContextPath()%>" />
+	<input type="hidden" id="contextPath" value="${contextPath}" />
 	<script type="text/javascript"
 		src="${f:url('/js/jquery-2.1.4.min.js')}"></script>
 	<script type="text/javascript" src="${f:url('/js/bootstrap.js')}"></script>
diff --git a/src/main/webapp/js/help.js b/src/main/webapp/js/help.js
index 04356c40f..fac2f1518 100644
--- a/src/main/webapp/js/help.js
+++ b/src/main/webapp/js/help.js
@@ -10,6 +10,14 @@ $(function(){
 		return true;
 	});
 
+    $("[data-toggle='control-options']").click(function(e) {
+        e.preventDefault();
+        var target = $(this).attr('data-target') || $(this).attr('href');
+        if (target) {
+            $(target).toggleClass("active");
+        }
+    });
+
 	$('#searchOptionsClearButton').on('click', function(e) {
 		$('#labelTypeSearchOption').prop('selectedIndex', -1);
 		$('#langSearchOption').prop('selectedIndex', 0);
