diff --git a/src/scss/layout/_content.scss b/src/scss/layout/_content.scss
index 5c690c6..3d80960 100644
--- a/src/scss/layout/_content.scss
+++ b/src/scss/layout/_content.scss
@@ -1,10 +1,11 @@
 // Content layout styles
 
 .content__container {
-  padding-top: 3.75em;
   margin-left: $nav__toplvlWidth;
+  padding: 1em .1em;
   @include fastTransition-all;
-  @include mediaQuery(medium){
+  @include mediaQuery(x-small){
     margin-left: $nav__toplvlWidth + $nav__seclvlWidth;
+    padding: 1rem 2rem;
   }
 }
diff --git a/src/scss/layout/_header.scss b/src/scss/layout/_header.scss
index b86fcd7..f0431ca 100644
--- a/src/scss/layout/_header.scss
+++ b/src/scss/layout/_header.scss
@@ -1,15 +1,15 @@
-
-$logoHeight: 40px;
+$logoHeight: 30px;
 $logoMaxHeight: 100px;
 $logoMaxWidth: 125px;
 
 #header__wrapper {
   position: fixed;
-  top:0;
+  top: 0;
   left: 0;
-  right:0;
+  right: 0;
   z-index: 100;
 }
+
 .app__version {
   margin-left: 1em;
   display: none;
@@ -20,32 +20,111 @@
     transform: translateY(-50%);
   }
 }
+
 header {
   position: relative;
-  background: $lightbg__primary;
+  background: #000;
   color: $white;
-  padding: .8em;
+  overflow: hidden;
+}
 
+.header__logout {
+  float: right;
+  display: inline-block;
+  color: $white;
+  font-size: .9em;
+  text-decoration: none;
+  padding: 1em;
+  &:visited {
+    color: $white;
+  }
+}
+
+.header__functions-wrapper {
+  color: $white;
+  background: $lightbg__primary;
+  padding: 0 1.1em;
+  box-sizing: border-box;
+  display: block;
+  position: relative;
+  overflow: hidden;
+  min-height: 5em;
   .logo__wrapper {
-    display: inline-block;
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
   }
 
   #header__logo {
     vertical-align: middle;
-    margin-right: 1em;
+    margin: 1em;
     float: left;
-    height:$logoHeight; //required for <SVG> logos - can remove if using img
+    height: $logoHeight; //required for <SVG> logos - can remove if using img
     max-height: $logoMaxHeight;
     max-width: $logoMaxWidth;
     width: auto;
   }
 
-}
-
-.header__functions-wrapper {
-  color: $white;
-  background: green;
-  padding: 1em 1.1em;
-  box-sizing: border-box;
-  display: block;
-}
+  .header__functions {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background: $darkbg__primary;
+    span {
+      display: block;
+      color: $white;
+      font-size: 1em;
+      &.status-light__disabled {
+        color: $darkgrey;
+        &::before {
+          @include status-light__disabled;
+        }
+      }
+      &.status-light__good{
+        &::before {
+          @include status-light__good;
+        }
+      }
+      &.status-light__error{
+        color: $error-color;
+        &::before {
+          @include status-light__error;
+        }
+      }
+    }
+    a,  p, button {
+      display: block;
+      float: left;
+      text-decoration: none;
+      border-left: 1px solid #384456;
+      color: $lightgrey;
+      margin: 0;
+      padding: 1.250em 1.688em;
+      height: 100%;
+      font-size: 0.875em;
+      line-height: 1.3;
+      > span {font-size: 1rem;
+        font-weight: bold;}
+    }
+  }
+  .header__functions {
+    .header__refresh {
+      color: $lightgrey;
+      line-height: 1.6;
+    }
+  }
+  .header__server-power,
+  .header__page-refresh{
+    &:hover {
+      background: rgba(60,109,240,.4);
+    }
+  }
+  .header__page-refresh {
+    img {
+      stroke: $white;
+      height: 22px;
+      width: 24px;
+    }
+  }
+}// end header__functions-wrapper
diff --git a/src/scss/layout/_navigation.scss b/src/scss/layout/_navigation.scss
index 0b07e5f..7a2d33c 100644
--- a/src/scss/layout/_navigation.scss
+++ b/src/scss/layout/_navigation.scss
@@ -39,10 +39,12 @@
     a {
       margin-bottom: 5px;
     }
-    p {
-      margin: 0;
+    span {
+      margin: 1em 0 0 0;
+      display: block;
       font-size: .9em;
-      line-height: 1.2rem;
+      font-weight: normal;
+      line-height: 1rem;
     }
 
     .nav__icon-help__outer {
@@ -87,27 +89,29 @@
   left: -$nav__toplvlWidth;
   width: $nav__seclvlWidth;
   z-index: 97;
-  display: none;
   padding: 0;
   margin: 0;
+  display: none;
   list-style-type: none;
   transition: left .5s ease;
   @include mediaQuery(medium) {
     left: $nav__toplvlWidth;
   }
-  &.btn-dashboard {
+  &.btn-overview {
     display: block;
   }
   &.opened {
     left: $nav__toplvlWidth;
+    display: block;
     @include fastTransition-all;
   }
   a {
-    padding: 1.2em .6em 1.2em 1.9em;
+    padding: 1.2em .6em 1.2em 1em;
     display: block;
     color: $black;
     text-decoration: none;
     position: relative;
+    font-weight: 400;
   }
 
   li {
@@ -117,19 +121,19 @@
       font-size: 2em;
       font-weight: 700;
       top: 50%;
-      right: 2em;
+      right: .6em;
       transform: translateY(-59%);
       color: #4b5d78;
       opacity: 0;
     }
+    &.active {background: $white;}
     &.active,
     &:focus,
     &:hover {
-      background: $white;
-      a {font-weight: bold; color: #4b5d78;}
+      a {color: #4b5d78;}
       a:after {
         opacity: 1;
-        right: .5em;
+        right: .3em;
         @include fastTransition-all;
       }
     }