diff --git a/app/assets/stylesheets/common/responsive.scss b/app/assets/stylesheets/common/responsive.scss
index 966582676..b5def7123 100644
--- a/app/assets/stylesheets/common/responsive.scss
+++ b/app/assets/stylesheets/common/responsive.scss
@@ -44,15 +44,19 @@
     }
   }
 
+  /* Make the quick search box in the navbar full width. */
+  header#top menu form input {
+    width: auto;
+  }
+
   h1 {
     display: none;
   }
 
-  input[type=text], input[type=submit] {
-    font-size: 18pt;
-    border-color: default;
-    border-style: solid;
-    border-width: .1rem;
+  form {
+    input[type=text], input[type=submit], select {
+      font-size: 1.5em;
+    }
   }
 
   div#page section#content {
@@ -129,14 +133,6 @@
     }
   }
 
-  nav {
-    background: none;
-    float: right;
-    font-size: 1.125em;
-    width: 100%;
-    margin-bottom: 1em;
-  }
-  
   #nav {
     display: none;
   }
diff --git a/app/assets/stylesheets/common/simple_form.scss b/app/assets/stylesheets/common/simple_form.scss
index 81b2616c4..0efa07c42 100644
--- a/app/assets/stylesheets/common/simple_form.scss
+++ b/app/assets/stylesheets/common/simple_form.scss
@@ -13,7 +13,7 @@ form.simple_form {
     margin-bottom: 1em;
 
     input[type=text], input[type=file], input[type=password], input[type=email] {
-      width: 20em;
+      max-width: 20em;
     }
 
     span.hint {
@@ -61,6 +61,7 @@ form.inline-form {
     label, input {
       display: table-cell;
       padding-right: 1em;
+      white-space: nowrap;
     }
   }
 }
diff --git a/app/views/layouts/_main_links.html.erb b/app/views/layouts/_main_links.html.erb
index b5606d77d..ab80980e1 100644
--- a/app/views/layouts/_main_links.html.erb
+++ b/app/views/layouts/_main_links.html.erb
@@ -19,5 +19,5 @@
   <% if CurrentUser.is_moderator? %>
     <%= nav_link_to("Dashboard", moderator_dashboard_path) %>
   <% end %>
-  <%= nav_link_to("More &raquo;".html_safe, site_map_path, :id => "site-map-link") %>
+  <%= nav_link_to("More&nbsp;&raquo;".html_safe, site_map_path, :id => "site-map-link") %>
 </menu>