diff --git a/src/scss/base/_buttons.scss b/src/scss/base/_buttons.scss
index 3703722..27a8466 100644
--- a/src/scss/base/_buttons.scss
+++ b/src/scss/base/_buttons.scss
@@ -5,18 +5,16 @@
   border-radius: 3px;
   padding: .8rem 3.5rem;
   height: auto;
+  border: 0px;
   &:hover {
     cursor: pointer;
   }
-  &.disabled {
-    border: 2px solid $lightgrey;
-    color: $lightgrey;
-  }
 }
 
 .disabled {
   button, .button, input[type="submit"] {
     opacity: 0.2;
+    color: $btn__disabled-txt;
     &:hover {
       cursor: default;
       background: transparent;
@@ -27,6 +25,18 @@
 .btn-primary {
   color: $primebtn__text;
   background: $primebtn__bg;
+  &:hover {
+    background: rgba(60,109,240,.8);
+    @include fastTransition-all;
+  }
+  &.disabled {
+    background: $btn__disabled-bg;
+    color: $btn__disabled-txt;
+    @include fastTransition-all;
+    &:hover {
+      cursor: default;
+    }
+  }
 }
 .btn-secondary {
   color: $secbtn__text;
@@ -36,5 +46,14 @@
     background: $lightbg__accent;
     cursor: pointer;
     background: $secbtn__bg;
+    @include fastTransition-all;
+  }
+  &.disabled {
+    border: 2px solid $lightgrey;
+    background: $btn__disabled-bg;
+    @include fastTransition-all;
+    &:hover {
+      background: $btn__disabled-bg;
+    }
   }
 }
diff --git a/src/scss/base/_colors.scss b/src/scss/base/_colors.scss
index c013e08..449bfb1 100644
--- a/src/scss/base/_colors.scss
+++ b/src/scss/base/_colors.scss
@@ -1,10 +1,11 @@
 // Global
-$white: #fff;
+$white: #ffffff;
 $black: #333;
 $darkgrey: #666;
 $lightgrey: #ccc;
 $field__disabled: #F4F8F8;
-
+$btn__disabled-txt: #a6a5a6;
+$btn__disabled-bg: #d8d8d8;
 
 // Dark background
 $darkbg__grey: #E3ECEC;
@@ -26,6 +27,7 @@
 $secbtn__border: #3f71ec;
 $secbtn__text: #3f71ec;
 
+
 // Alerts
 $alert__error: rgba(230, 35, 37, 0.3);
 $alert__warning: rgba(255, 127, 0, 0.3);
diff --git a/src/scss/base/_mixins.scss b/src/scss/base/_mixins.scss
index e26c10d..a259c6b 100644
--- a/src/scss/base/_mixins.scss
+++ b/src/scss/base/_mixins.scss
@@ -9,21 +9,15 @@
     @media (min-width: 47.938em) { //767px
       @content;
     }
-  }
-
-  @else if $breakpoint == "medium" {
+  } @else if $breakpoint == "medium" {
     @media (min-width: 64.000em) { //1024px
       @content;
     }
-  }
-
-  @else if $breakpoint == "large" {
+  } @else if $breakpoint == "large" {
     @media (min-width: 85.375em) { //1366px
       @content;
     }
-  }
-
-  @else if $breakpoint == "x-large" {
+  } @else if $breakpoint == "x-large" {
     @media (min-width: 100.000em) { //1600px
       @content;
     }
@@ -32,7 +26,7 @@
 
 //Fonts mixin
 @mixin fontFamily {
-  font-family: Arial, Verdana, sans-serif;
+  font-family: Helvetica, Arial, Verdana, sans-serif;
   font-weight: 200;
 }
 
@@ -51,11 +45,35 @@
 }
 
 @mixin bgImage__arrowDown-accent {
-  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: #3c6df0'></polygon></svg>");
+  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: #3c6df0'></polygon></svg>");
 }
 
 @mixin bgImage__arrowDown-grey {
   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 status-light {
+  content: '\25CF';
+  display: inline-block;
+  font-size: 1.4em;
+  color: $status-ok;
+  margin-right: .3em;
+}
 
+@mixin status-light__good {
+  @include status-light;
+  color: $status-ok;
+
+}
+
+@mixin status-light__error {
+  @include status-light;
+  color: $error-color;
+
+}
+
+@mixin status-light__disabled {
+  @include status-light;
+  color: $darkgrey;
+
+}
diff --git a/src/scss/base/_utility.scss b/src/scss/base/_utility.scss
index 3d5a8ce..cedac11 100644
--- a/src/scss/base/_utility.scss
+++ b/src/scss/base/_utility.scss
@@ -42,6 +42,12 @@
   }
 }
 
+.fixed {
+  position:fixed;
+  top:130px;
+  z-index:200;
+}
+
 .no-margin {
   margin: 0px !important;
 }