diff --git a/app/common/directives/app-header.html b/app/common/directives/app-header.html
index 3f760f4..9388bb6 100644
--- a/app/common/directives/app-header.html
+++ b/app/common/directives/app-header.html
@@ -25,11 +25,10 @@
 				<span>Refresh</span>
 				<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52.18 51.91">
 					<path class="cls-1" d="M38,20.77H52v-14H48.3v6.07A26,26,0,1,0,48.7,38H44.32a22.14,22.14,0,1,1,1.8-20.92H38v3.67Z" transform="translate(0.16 0.14)"/>
-				</svg>
 			</button>
 		</div>
 	</div>
 </div>
 
 <!-- multi-server recent dropdown -->
-<div ng-include="" src="'multi-server/controllers/multi-server-recent-controller.html'"></div>
+<div ng-include="" src="'multi-server/controllers/multi-server-recent-controller.html'"></div>
\ No newline at end of file
diff --git a/app/common/directives/app-navigation.html b/app/common/directives/app-navigation.html
index 3be698b..4e75a0d 100644
--- a/app/common/directives/app-navigation.html
+++ b/app/common/directives/app-navigation.html
@@ -10,7 +10,7 @@
 					Server overview</span></a>
 		</li>
 		<li>
-			<span class="btn-health nav__btn" ng-class="{opened: firstLevel == 'server-health'}" ng-click="change('server-health')" tabindex="2">
+			<button class="btn-health" ng-class="{opened: firstLevel == 'server-health'}" ng-click="change('server-health')" tabindex="2">
 				<span>
 					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
 						<polyline class="st0" points="32,12.9 32,16 8,16 8,8 27,8 "/>
@@ -26,10 +26,10 @@
 					</svg>
 					Server health
 				</span>
-			</span>
+			</button>
 		</li>
 		<li>
-			<span class="btn-control nav__btn" ng-class="{opened: firstLevel == 'server-control'}" ng-click="change('server-control')" tabindex="3">
+			<button class="btn-control" ng-class="{opened: firstLevel == 'server-control'}" ng-click="change('server-control')" tabindex="3">
 				<span>
 					<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
 						<line class="st0" x1="8" y1="12" x2="32" y2="12"/>
@@ -41,10 +41,10 @@
 					</svg>
 					Server control
 				</span>
-			</span>
+			</button>
 		</li>
 		<li>
-			<span class="btn-config nav__btn" ng-class="{opened: firstLevel == 'configuration'}" ng-click="change('configuration')" tabindex="4">
+			<button class="btn-config" ng-class="{opened: firstLevel == 'configuration'}" ng-click="change('configuration')" tabindex="4">
 			<span>
 				<svg version="1.1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" viewBox="0 0 40 40" style="enable-background:new 0 0 40 40;" xml:space="preserve" class="nav-icon">
 					<path d="M31.5,20c0-0.6-0.1-1.2-0.2-1.8L35,15l-3.1-5.1l-4.4,1.4c-1.1-0.9-2.3-1.6-3.6-2.1L23,5h-6l-1,4.2c-1.3,0.5-2.5,1.2-3.6,2.1
@@ -56,13 +56,13 @@
 						l1.4,2.3L30,16.7l-0.8,0.7l0.2,1.1c0.1,0.6,0.1,1,0.1,1.5s0,0.9-0.1,1.5l-0.2,1.1l0.8,0.7L32.4,25.4z"/>
 					<path d="M20,15c-2.8,0-5,2.2-5,5s2.2,5,5,5s5-2.2,5-5S22.8,15,20,15z M20,23c-1.7,0-3-1.3-3-3c0-1.7,1.3-3,3-3c1.7,0,3,1.3,3,3C23,21.7,21.7,23,20,23z"/>
 				</svg>
-				Server Configuration</span></span>
+				Server Configuration</span></button>
 		</li>
 		<li>
-			<span class="btn-users nav__btn" ng-class="{opened: firstLevel == 'users'}" ng-click="change('users')" tabindex="5">
+			<button class="btn-users" ng-class="{opened: firstLevel == 'users'}" ng-click="change('users')" tabindex="5">
 				<span><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" class="nav-icon"><path d="M16 21c5.523 0 10-4.477 10-10S21.523 1 16 1 6 5.477 6 11s4.477 10 10 10zm0-18c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zM24 23H8a4 4 0 0 0-4 4v4h24v-4a4 4 0 0 0-4-4z"/></svg></span>
 				<span>Users</span>
-			</span>
+			</button>
 		</li>
 		<li class="btn-multi-server">
 			<a ng-class="{opened: firstLevel == 'multi-server'}" href="#/multi-server/overview" ng-click="change('multi-server')" tabindex="6">
diff --git a/app/common/directives/log-event.html b/app/common/directives/log-event.html
index 8311a87..350cc8d 100644
--- a/app/common/directives/log-event.html
+++ b/app/common/directives/log-event.html
@@ -29,8 +29,8 @@
                  <p class="inline event__description">{{event.Severity}}</p>
              </div>
          <div class="column small-1 large-1">
-             <span class="button accord-trigger" ng-class="{'active': event.meta}"
-                     ng-click="event.meta = ! event.meta" aria-hidden="true"></span>
+             <button class="accord-trigger" ng-class="{'active': event.meta}"
+                     ng-click="event.meta = ! event.meta"></button>
          </div>
         </div>
      <div class="row event__metadata-row" ng-class="{'active': event.meta}">
@@ -62,4 +62,4 @@
              </div>
          </div>
      </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/common/services/constants.js b/app/common/services/constants.js
index 7c4b340..2c48822 100644
--- a/app/common/services/constants.js
+++ b/app/common/services/constants.js
@@ -113,4 +113,4 @@
             };
         });
 
-})(window.angular);
+})(window.angular);
\ No newline at end of file
diff --git a/app/common/styles/base/buttons.scss b/app/common/styles/base/buttons.scss
index 3793a84..42d0f0d 100644
--- a/app/common/styles/base/buttons.scss
+++ b/app/common/styles/base/buttons.scss
@@ -114,7 +114,6 @@
     vertical-align: middle;
     display: inline-block;
     left: 11px;
-    top: 5px;
-    line-height: 1;
+    top: 0px;
   }
 }
\ No newline at end of file
diff --git a/app/common/styles/base/typography.scss b/app/common/styles/base/typography.scss
index 3135e7a..db5bdd7 100644
--- a/app/common/styles/base/typography.scss
+++ b/app/common/styles/base/typography.scss
@@ -55,4 +55,4 @@
   font-family: "Courier New", Helvetica, arial, sans-serif;
   font-weight: 700;
   margin-bottom: 0;
-}
+}
\ No newline at end of file
diff --git a/app/common/styles/directives/app-navigation.scss b/app/common/styles/directives/app-navigation.scss
index 1a028d3..997ab7c 100644
--- a/app/common/styles/directives/app-navigation.scss
+++ b/app/common/styles/directives/app-navigation.scss
@@ -51,14 +51,14 @@
   .nav-icon {
     @include navIcons;
   }
-  .button, a, .nav__btn {
+  .button, button, a {
     background: transparent;
     height: auto;
     border: 0;
     color: $white;
     fill: $white;
     width: 100%;
-    padding: 0 .8em .8em;
+    padding: 1em;
     display: block;
     text-align: center;
     margin-bottom: 0;
@@ -66,7 +66,7 @@
     border-radius: 0;
     text-decoration: none;
     border-top: 1px solid transparent;
-    border-bottom: 1px solid darken($darkgrey, 15%);
+    border-bottom: 1px solid $darkgrey;
     a {
       margin-bottom: 5px;
     }
@@ -81,9 +81,9 @@
       background: $nav__second-level-color;
       fill: $black;
       color: $medblue;
+      padding: 1em;
       border-radius: 0;
       border-bottom: 1px solid $lightgrey;
-      cursor: pointer;
       .nav__icon-help__outer {
         stroke: $black;
       }
@@ -175,4 +175,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/app/common/styles/layout/header.scss b/app/common/styles/layout/header.scss
index 1f065f0..e2d5260 100644
--- a/app/common/styles/layout/header.scss
+++ b/app/common/styles/layout/header.scss
@@ -79,6 +79,9 @@
   }
   .logo__wrapper {
     padding-top: .5em;
+    //position: absolute;
+    //top: 50%;
+    //transform: translateY(-50%);
   }
 
   .header__logo {
@@ -94,7 +97,7 @@
   .header__functions {
     position: absolute;
     top: 0;
-    right: -650px;
+    right: -680px;
     bottom: 0;
     z-index: 100;
     margin: .3em 0;
@@ -116,7 +119,7 @@
       float: left;
       text-decoration: none;
       color: $darkgrey;
-      padding: 1.25em 1.3em;
+      padding: 1.250em 1.688em;
       height: 100%;
       font-size: 0.875em;
       font-weight: 400;