diff --git a/app/common/styles/base/buttons.scss b/app/common/styles/base/buttons.scss
index 4f79625..299c9b3 100644
--- a/app/common/styles/base/buttons.scss
+++ b/app/common/styles/base/buttons.scss
@@ -1,4 +1,4 @@
-button, .btn, .button, .submit {
+button, .button, .submit {
   font-size: 1em;
   @include fontFamilyBold;
   text-transform: none;
@@ -10,15 +10,13 @@
   &:hover {
     cursor: pointer;
   }
-}
-
-.disabled {
-  button, .button, input[type="submit"] {
+  &.disabled {
     opacity: 0.2;
     color: $btn__disabled-txt;
     &:hover {
       cursor: default;
       background: transparent;
+      text-decoration: none;
     }
   }
 }
@@ -39,7 +37,7 @@
       cursor: default;
     }
   }
-  i { // button symbol
+  i { //button symbol
     font-style: normal;
     text-transform: none;
     font-size: 1.5em;
diff --git a/app/common/styles/base/colors.scss b/app/common/styles/base/colors.scss
index 780e319..ac8e0ae 100644
--- a/app/common/styles/base/colors.scss
+++ b/app/common/styles/base/colors.scss
@@ -65,8 +65,8 @@
 
 // Threshold graphs
 $thresh-critical: $error-color;
-$thresh-warning: #ff806c;
-$thresh-normal: #8ee9d4;
+$thresh-warning: #ffb001;
+$thresh-normal: $lightgrey;
 
 //Inventory
 $active: #c6b6f5;
diff --git a/app/common/styles/base/icons.scss b/app/common/styles/base/icons.scss
index 27fe0e1..bac0be0 100644
--- a/app/common/styles/base/icons.scss
+++ b/app/common/styles/base/icons.scss
@@ -45,16 +45,16 @@
 }
 
 .icon__warning{
-  width: 30px;
-  height: 30px;
+  width: 40px;
+  height: 40px;
   background-image: url(/assets/images/icon-warning.svg);
   background-repeat: no-repeat;
   vertical-align: middle;
 }
 
 .icon__critical{
-  width: 30px;
-  height: 30px;
+  width: 40px;
+  height: 40px;
   background-image: url(/assets/images/icon-critical.svg);
   background-repeat: no-repeat;
   vertical-align: middle;
diff --git a/app/common/styles/base/mixins.scss b/app/common/styles/base/mixins.scss
index e868354..d13f2ce 100644
--- a/app/common/styles/base/mixins.scss
+++ b/app/common/styles/base/mixins.scss
@@ -85,12 +85,14 @@
   background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #b8c1c1'></polygon></svg>");
 }
 
+@mixin calcColumn-5 {
+  min-width: calc(100% * (1/5) - 5px);
+}
 
 @mixin calcColumn-4 ($offset: 0) {
   min-width: calc(100% * (1/4) - #{$offset});
 }
 
-
 @mixin calcColumn-3 {
   min-width: calc(100% * (1/3) - 5px);
 }
diff --git a/app/common/styles/components/form-elements.scss b/app/common/styles/components/form-elements.scss
index d674bbc..2ce17ee 100644
--- a/app/common/styles/components/form-elements.scss
+++ b/app/common/styles/components/form-elements.scss
@@ -3,7 +3,7 @@
   position: relative;
   padding: .5em .8em;
   margin-top: -10px;
-  border: 1px solid $darkgrey;
+  border: 1px solid $input-border;
   min-width: 70px;
   padding-right: 25px;
   font-weight: 400;
diff --git a/app/common/styles/directives/app-navigation.scss b/app/common/styles/directives/app-navigation.scss
index 496fbf7..2d818a9 100644
--- a/app/common/styles/directives/app-navigation.scss
+++ b/app/common/styles/directives/app-navigation.scss
@@ -1,11 +1,18 @@
 $nav__toplvlWidth: 125px;
 $nav__seclvlWidth: 240px;
 
+.nav__wrapper {
+  height: 100%;
+  position: fixed;
+  top: 0;
+  z-index: 100;
+}
+
 // Top level navigation
 #nav__top-level {
   background: $nav__top-level-color;
-  height: 100%;
-  position: fixed;
+  //height: 100%;
+  position: absolute;
   left: 0;
   top: 0;
   bottom: 0;
@@ -14,6 +21,7 @@
   margin: 0;
   padding: 0;
   width: $nav__toplvlWidth;
+  overflow-y: auto;
   li {
     margin: 0;
   }
@@ -113,7 +121,7 @@
   background: $nav__second-level-color;
   top: 0;
   bottom: 0;
-  left: -$nav__toplvlWidth;
+  left: -245px;
   width: $nav__seclvlWidth;
   z-index: 97;
   padding: 0;
diff --git a/app/common/styles/elements/alerts.scss b/app/common/styles/elements/alerts.scss
index 76624b1..96f0a4c 100644
--- a/app/common/styles/elements/alerts.scss
+++ b/app/common/styles/elements/alerts.scss
@@ -13,7 +13,7 @@
   .close {
     color: $lightbg__primary;
     position: absolute;
-    right: 0%;
+    right: 0;
     top: 50%;
     transform: translateY(-50%);
     font-size: 1.5em;
@@ -24,7 +24,7 @@
     justify-content: center;
     flex-direction: column;
     background: transparent;
-    border: 0px;
+    border: 0;
     margin: 0;
     &:hover {
       color: $lightbg__accent;
diff --git a/app/common/styles/elements/content-search.scss b/app/common/styles/elements/content-search.scss
index a8ae381..e93bff0 100644
--- a/app/common/styles/elements/content-search.scss
+++ b/app/common/styles/elements/content-search.scss
@@ -7,7 +7,6 @@
   float: left;
   position: relative;
   margin-right: 1em;
-  margin-top: .5em;
   margin-bottom: .5em;
 
   #content__search-input {
@@ -43,6 +42,10 @@
     margin: 0;
     font-weight: 700;
     font-size: .8em;
+    border: 0;
+    &:hover {
+      cursor: pointer;
+    }
   }
 
   .tag-filter-label {
diff --git a/app/common/styles/elements/export.scss b/app/common/styles/elements/export.scss
index ea0ab92..66847ae 100644
--- a/app/common/styles/elements/export.scss
+++ b/app/common/styles/elements/export.scss
@@ -4,10 +4,10 @@
   font-size: .9em;
   font-weight: 700;
   position: relative;
-  padding: 0 0 1em 2em;
+  padding: 0 0 0 2em;
   margin-right: .6em;
   text-decoration: none;
-  margin-top: 7px;
+  margin-top: 0;
   &:hover {
     text-decoration: underline;
   }
diff --git a/app/common/styles/elements/index.scss b/app/common/styles/elements/index.scss
index d136134..7b1d1c5 100644
--- a/app/common/styles/elements/index.scss
+++ b/app/common/styles/elements/index.scss
@@ -11,4 +11,4 @@
 @import "thresholds";
 @import "export";
 @import "modals";
-@import "quicklinks";
\ No newline at end of file
+@import "quicklinks";
diff --git a/app/common/styles/elements/thresholds.scss b/app/common/styles/elements/thresholds.scss
deleted file mode 100644
index 52230ee..0000000
--- a/app/common/styles/elements/thresholds.scss
+++ /dev/null
@@ -1,78 +0,0 @@
-// Thresholds graph
-
-$threshColorLighten: 5%;
-.threshold-chart__wrapper {
-  position: relative;
-  .threshold__label {
-    position: absolute;
-    top: 38%;
-    transform: translateY(-50%);
-    font-weight: 700;
-    &.low {
-      margin-left: 0;
-    }
-    &.high {
-      right: 5px;
-    }
-  }
-  @include mediaQuery(large) {
-    max-width: 1000px;
-  }
-}
-
-.threshold-chart {
-  position: relative;
-  line-height: 0;
-  padding: .8em 0 2em 0;
-  margin: 0 2.5em 1em 2.5em;
- //margin: 0 auto;
-  .threshold__marker {
-    position: absolute;
-    top: 13px;
-    bottom: -15px;
-    width: 4px;
-    background-color: $black;
-    @include slowTransition-all;
-    .threshold__value {
-      position: absolute;
-      bottom: 3px;
-      right: 5px;
-      margin: 0;
-      color: $black;
-      padding: 3px 6px;
-      font-weight: 400;
-      font-size: 1em;
-      white-space: nowrap;
-    }
-  }
-
-  .threshold {
-    display: inline-block;
-    background-color: $thresh-normal;
-    min-width: 10%;
-    min-height: 25px;
-    margin: 0 -3px;
-    &.thresh__normal {
-      min-width: 60%;
-    }
-  }
-
-  .threshold__marker,
-  .threshold {
-    &.thresh__low-critical {
-      background-color: $thresh-critical;
-    }
-    &.thresh__low-warn {
-      background-color: $thresh-warning;
-    }
-    &.thresh__high-warn {
-      background-color: $thresh-warning;
-    }
-    &.thresh__high-critical {
-      background-color: $thresh-critical;
-    }
-    &.thresh__normal {
-      background-color: $thresh-normal;
-    }
-  }
-}
diff --git a/app/common/styles/elements/toggle-filter.scss b/app/common/styles/elements/toggle-filter.scss
index 1a7d602..7305414 100644
--- a/app/common/styles/elements/toggle-filter.scss
+++ b/app/common/styles/elements/toggle-filter.scss
@@ -1,6 +1,12 @@
 // toggle buttons for filtering
 .toggle-filter {
-  margin-top: 12px;
+  display: inline-block;
+  @media (min-width: 1300px) {
+    margin-top: -25px;
+  }
+  .content-label {
+    margin-bottom: .4em;
+  }
   .filter-label {
     color: darken($lightgrey, 10%);
     text-transform: uppercase;
@@ -18,6 +24,7 @@
     font-weight: 700;
     border-radius: 0;
     display: inline-block;
+    border-left: 0;
     &.first,
     &.last {
       border-radius: 3px;
@@ -26,5 +33,4 @@
   .btn-primary {
     border: 2px solid $primebtn__bg;
   }
-
 }
\ No newline at end of file
diff --git a/app/common/styles/layout/content.scss b/app/common/styles/layout/content.scss
index 326d896..b1a7942 100644
--- a/app/common/styles/layout/content.scss
+++ b/app/common/styles/layout/content.scss
@@ -37,10 +37,15 @@
   margin-top: 2em;
 }
 
-.content-label {
-  color: lighten($darkgrey, 15%);
+.content-label, label {
+  color: $darkgrey;
   text-transform: uppercase;
   font-weight: 700;
   font-size: .75em;
   margin-bottom: 0;
 }
+
+.subhead {
+  border-bottom: 1px solid $medgrey;
+  padding-bottom: .5em;
+}
\ No newline at end of file