diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index 81ad94d63..b548dc8af 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -50,13 +50,11 @@
 	    <a class="navbar-brand" href="/">
 	       <img alt="IETF Logo" src="/images/ietflogo-small-transparent.png">
 	       {% if not user.is_authenticated %}
-	       <div style="display: inline; vertical-align: top; padding-left: 1em;">
 		  {% if server_mode and server_mode == "production" %}
 		  Datatracker
 		  {% else %}
 		  <b><i>Development mode</i></b>
 		  {% endif %}
-	       </div>
 	       {% endif %}
 	    </a>
 	  </div>
@@ -70,9 +68,9 @@
               {% include "base/menu.html" with flavor="top" %}
             </ul>
 
-	    <form class="navbar-form navbar-right hidden-sm hidden-xs" action="/doc/search/" role="search">
+	    <form class="navbar-form navbar-right hidden-xs" action="/doc/search/" role="search">
 	      <div class="form-group">
-	        <input class="form-control" type="text" name="name" placeholder="Document search">
+	        <input class="form-control input-sm" type="text" name="name" placeholder="Document search">
 	        <input type="hidden" name="activedrafts" value="on">
 	        <input type="hidden" name="rfcs" value="on">
 	      </div>
diff --git a/static/css/ietf.css b/static/css/ietf.css
index f3f616e5b..ef3833a34 100644
--- a/static/css/ietf.css
+++ b/static/css/ietf.css
@@ -84,7 +84,12 @@ body { padding-top: 70px; }
 
 .navbar-brand > img {
   display: inline;
-  margin-top: -7px;
+  padding-right: 1em;
+}
+
+.navbar-brand {
+  font-size: 15px !important;
+  margin-top: -5px;
 }
 
 /* Hack to make anchor-targets take up a bit more space vertically
@@ -98,10 +103,6 @@ body { padding-top: 70px; }
   margin-top: -65px;
 }
 
-/* Style navbar buttons */
-/* .navbar-btn { color:#777; } */
-/* .navbar-btn:hover { color: #333; } */
-
 /* Make the panel title font normally large */
 .panel-title { font-size: 14px }
 
@@ -353,9 +354,9 @@ footer {
 }
 
 /* This applies to the top navbar submenu popouts*/
-/* 
+/*
 .nav.navbar-nav .dropdown-submenu ul {
-    
+
 }
 */
 /* This applies to the side menubar submenu popouts */