diff --git a/app/admin-tab/machine/template.hbs b/app/admin-tab/machine/template.hbs
index 6c0a70760..677a616e3 100644
--- a/app/admin-tab/machine/template.hbs
+++ b/app/admin-tab/machine/template.hbs
@@ -27,7 +27,7 @@
             {{#if driver.state}}
               {{badge-state model=driver class="pull-left"}}
             {{else}}
-              <span class="state badge text-danger bg-error pull-left">
+              <span class="state badge-state text-danger bg-error pull-left">
                 <i class="icon icon-circle"></i> {{t 'machinePage.inactive'}}
               </span>
             {{/if}}
diff --git a/app/styles/components/_nav.scss b/app/styles/components/_nav.scss
index 67d967927..1601a7c43 100644
--- a/app/styles/components/_nav.scss
+++ b/app/styles/components/_nav.scss
@@ -25,6 +25,7 @@ nav {
         > a {
           color: $info;
           border-bottom: solid $nav-spacing mix($user-btn, black, 50%);
+          text-decoration: none;
         }
       }
 
diff --git a/app/styles/components/_tables.scss b/app/styles/components/_tables.scss
index 6491bb53a..0cacf209b 100644
--- a/app/styles/components/_tables.scss
+++ b/app/styles/components/_tables.scss
@@ -15,6 +15,8 @@ $group-row-height: 40px;
 //table mixins 
 @mixin bordered {
     border-bottom: $table-border-color solid 2px;
+    border-collapse: collapse;
+
     > TBODY {
 
         &:not(:last-of-type):after {
@@ -90,6 +92,7 @@ TABLE {
     > TBODY > TR > TD {
         padding: 0;
         height: 50px;
+        transition: ease-in-out all 200ms;
     }
     &.no-lines {
         * {
@@ -136,13 +139,15 @@ TABLE {
         margin: 0 3px;
     }
     &.has-sub-rows {
+        tr.row-selected TABLE > TBODY > TR > TD {
+            background: $body-bg;
+        }
         TABLE {
+
             > TBODY {
                 @include striped;
                 
-                 > .row-selected {
-                    background-color: $table-bg-selected;
-                }
+                
                 TR:last-child{
                     background: transparent;
                     &:after {