diff --git a/templates/base.html b/templates/base.html
index be2177fbb0691cc6c4bbdca3977c6791585fe614..76c17a98c271face03c4e952c2df2fb61fd5f471 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -42,8 +42,7 @@
 		<nav class="hidden-print navbar navbar-default navbar-static-top" {% if config.DEBUG %} style="background-color: red" {% endif %} >
 			<div class="container-fluid">
 				<div class="navbar-header">
-					<button type="button" class="navbar-toggle" data-toggle="collapse" 
-						 data-target=".navbar-collapse">
+					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
 						<span class="sr-only">Toggle navigation</span>
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
@@ -52,10 +51,26 @@
 					<a class="navbar-brand" href="/" style="padding: 3px;">
 						<img alt="Brand" src="{{url_for('static', filename='logo.png')}}" style="height: 44px; width: 44px" >
 					</a>
+					<ul class="nav nav-pills" style="margin-top: 5px; padding-left: 40px;">
+						{% for endpoint, caption, iconlib, gly, visible in navbar if visible %}
+							<li{% if endpoint == request.endpoint %} class="active"{% endif %}>
+								<a href="{{ url_for(endpoint) }}" style="padding: 10px 6px;">
+									{% if gly != '' %}
+										{% if iconlib == 'bootstrap' %}
+											<span aria-hidden="true" class="glyphicon glyphicon-{{ gly }}"></span> 
+										{% elif iconlib == 'fa' %}
+											<span aria-hidden="true" class="fa fa-{{ gly }}"></span> 
+										{% endif %}
+									{{ caption }}
+									{% endif %}
+								</a>
+							</li>
+						{% endfor %}
+					</ul>
 				</div>
 				<div class="collapse navbar-collapse">
 					<ul class="nav nav-pills" style="margin-top: 5px;">
-						{% for endpoint, caption, iconlib, gly, visible in navbar if visible or ismod() %}
+						{% for endpoint, caption, iconlib, gly, visible in navbar if (not visible) and ismod() %}
 							<li{% if endpoint == request.endpoint %} class="active"{% endif %}>
 								<a href="{{ url_for(endpoint) }}">
 									{% if gly != '' %}
@@ -70,7 +85,7 @@
 							</li>
 						{% endfor %}
 
-						<li class="col-xs-12 col-sm-4 pull-right">
+						<li class="col-xs-9 col-sm-4 pull-right">
 							<form action="{{ url_for('search') }}" role="search">
 								<div class="input-group" style="margin-top: 3px">
 									<input class="form-control" type="text" name="q" placeholder="Search" value="{{ searchtext }}">