diff --git a/dev/scss/header/header.scss b/dev/scss/header/header.scss
index b2b9d6c..9e9f89e 100644
--- a/dev/scss/header/header.scss
+++ b/dev/scss/header/header.scss
@@ -11,7 +11,7 @@
   background-color: $light-green;
 //  @include light-noise;
   @include box-sizing-box();
-  padding: 8px;
+  padding: $base-padding;
   padding-bottom: 0;
   font-size: 10pt;
   color: $nearly-white;
@@ -76,6 +76,10 @@
       background-color: $dark-green;
       text-align: center;
       height: 100%;
+      z-index: 20;
+      > a:hover {
+	color: $nearly-white
+      }
     }
     color: $nearly-white;
     line-height: 2em;
diff --git a/dev/scss/header/searchbar.scss b/dev/scss/header/searchbar.scss
index 4fee390..37d7d69 100644
--- a/dev/scss/header/searchbar.scss
+++ b/dev/scss/header/searchbar.scss
@@ -16,10 +16,7 @@
 }
 
 header input {
-  outline: none;
-  font-size: 11pt;
-  border: $border-size solid $nearly-white;
-  padding: 2px;
+  @include input-field;
 }
 
 #searchbar {
@@ -28,52 +25,10 @@
   padding-right: $right-padding;
   button[type=submit] {
     position: absolute;
-    font-weight: normal;
-    @include choose-item;
-    padding: 0;
-    height: 100%;
-    top: 0;
     right: $right-distance;
-    width: 30px;
-    cursor:pointer;
-    > span:nth-of-type(1) {
-      @include blind;
-    }
     &::after {
-      font-family: "FontAwesome";
       content: $fa-search;
     }
-    border: {
-      width: $border-size;
-      style: solid;
-      color: $nearly-white;
-    }
-    &:hover, &:focus {
-      @include choose-hover;
-    }
-    &::-moz-focus-inner {
-      border: none;
-    }
-    &:active {
-      @include choose-active;
-    }
-
-    /**
-     * This is just for styling the last button,
-     * in case there are more than one buttons.
-     */
-    &:last-of-type {
-      @include box-sizing-box();
-      border: {
-	right-width: $border-size;
-	right-style: solid;
-	top-right-radius: $standard-border-radius;
-	bottom-right-radius: $standard-border-radius;
-      }
-    }
-  }
-  button + button {
-    right: 0;
   }
 }