diff --git a/app/admin-tab/audit-logs/template.hbs b/app/admin-tab/audit-logs/template.hbs
index 4f774bbc5..791e773e0 100644
--- a/app/admin-tab/audit-logs/template.hbs
+++ b/app/admin-tab/audit-logs/template.hbs
@@ -36,7 +36,7 @@
             {{/each}}
           </ul>
         </span>
-        <button role="button" class="btn btn-sm bg-danger ml-5" {{action "clearAll"}}> {{t 'auditLogsPage.form.clearButtonText'}}</button>
+        <button role="button" class="btn btn-sm bg-error ml-5" {{action "clearAll"}}> {{t 'auditLogsPage.form.clearButtonText'}}</button>
         <button role="button" class="btn btn-sm bg-primary ml-5" {{action "search"}}> {{t 'auditLogsPage.form.searchButtonText'}}</button>
       </div>
     </div>
diff --git a/app/admin-tab/auth/azuread/template.hbs b/app/admin-tab/auth/azuread/template.hbs
index bd5f54214..491bb704c 100644
--- a/app/admin-tab/auth/azuread/template.hbs
+++ b/app/admin-tab/auth/azuread/template.hbs
@@ -19,11 +19,11 @@
     </p>
 
     {{#if confirmDisable}}
-      <button class="btn bg-danger" {{action "disable"}}>
+      <button class="btn bg-error" {{action "disable"}}>
         <i class="icon icon-alert"></i> {{t 'authPage.azuread.enabled.reallyDisable'}}
       </button>
     {{else}}
-      <button class="btn bg-danger" {{action "promptDisable"}}>
+      <button class="btn bg-error" {{action "promptDisable"}}>
         <i class="icon icon-umbrella"></i> {{t 'authPage.azuread.enabled.promptDisable'}}
       </button>
     {{/if}}
diff --git a/app/admin-tab/auth/github/template.hbs b/app/admin-tab/auth/github/template.hbs
index 488fa5b9a..80fe626a8 100644
--- a/app/admin-tab/auth/github/template.hbs
+++ b/app/admin-tab/auth/github/template.hbs
@@ -39,11 +39,11 @@
     </p>
 
     {{#if confirmDisable}}
-      <button class="btn bg-danger" {{action "disable"}}>
+      <button class="btn bg-error" {{action "disable"}}>
         <i class="icon icon-alert"></i> {{t 'authPage.github.authenticated.disableAccess.confirmDisable'}}
       </button>
     {{else}}
-      <button class="btn bg-danger" {{action "promptDisable"}}>
+      <button class="btn bg-error" {{action "promptDisable"}}>
         <i class="icon icon-umbrella"></i> {{t 'authPage.github.authenticated.disableAccess.disable'}}
       </button>
     {{/if}}
diff --git a/app/admin-tab/auth/localauth/template.hbs b/app/admin-tab/auth/localauth/template.hbs
index 74f272af9..55969c25b 100644
--- a/app/admin-tab/auth/localauth/template.hbs
+++ b/app/admin-tab/auth/localauth/template.hbs
@@ -18,11 +18,11 @@
     </p>
 
     {{#if confirmDisable}}
-      <button class="btn bg-danger" {{action "disable"}}>
+      <button class="btn bg-error" {{action "disable"}}>
         <i class="icon icon-alert"></i> {{t 'authPage.localAuth.accessEnabled.buttonText.disable'}}
       </button>
     {{else}}
-      <button class="btn bg-danger" {{action "promptDisable"}}>
+      <button class="btn bg-error" {{action "promptDisable"}}>
         <i class="icon icon-umbrella"></i> {{t 'authPage.localAuth.accessEnabled.buttonText.prompt'}}
       </button>
     {{/if}}
diff --git a/app/admin-tab/machine/template.hbs b/app/admin-tab/machine/template.hbs
index 3c3d7f5ad..59701dd25 100644
--- a/app/admin-tab/machine/template.hbs
+++ b/app/admin-tab/machine/template.hbs
@@ -24,7 +24,7 @@
             {{#if driver.state}}
               {{badge-state model=driver class="pull-left"}}
             {{else}}
-              <span class="state badge text-danger bg-danger pull-left">
+              <span class="state badge text-danger bg-error pull-left">
                 <i class="icon icon-circle"></i> {{t 'machinePage.inactive'}}
               </span>
             {{/if}}
diff --git a/app/admin-tab/processes/index/template.hbs b/app/admin-tab/processes/index/template.hbs
index ec1a9ad68..e79225e9e 100644
--- a/app/admin-tab/processes/index/template.hbs
+++ b/app/admin-tab/processes/index/template.hbs
@@ -25,7 +25,7 @@
 
           {{input value=ownResourceId class="form-control input-sm mr-5" enter='submit' placeholder=(t 'processesPage.indexPage.form.resourceId.placeholder') disabled=disableId}}
           {{input value=ownProcessName class="form-control input-sm mr-5" enter='submit' placeholder=(t 'processesPage.indexPage.form.processName.placeholder')}}
-          <button class="btn bg-primary bg-danger btn-sm inline-block" {{action 'reset'}}>{{t 'processesPage.indexPage.form.clear'}}</button>
+          <button class="btn bg-primary bg-error btn-sm inline-block" {{action 'reset'}}>{{t 'processesPage.indexPage.form.clear'}}</button>
           <button class="btn bg-primary btn-sm inline-block" {{action 'submit'}}>{{t 'processesPage.indexPage.form.search'}}</button>
         </div>
       </div>
diff --git a/app/components/columns-section/template.hbs b/app/components/columns-section/template.hbs
index 8a824a3a3..077ccdad0 100644
--- a/app/components/columns-section/template.hbs
+++ b/app/components/columns-section/template.hbs
@@ -1,6 +1,6 @@
 {{#if podCount}}
   {{#each columns as |col index|}}
-    <div class="pod-column" style={{if (eq index lastIndex) lastColumnWidthCss columnWidthCss}}>
+    <div class="pod-column col" style={{if (eq index lastIndex) lastColumnWidthCss columnWidthCss}}>
       {{#each col as |item|}}
         {{yield item}}
       {{/each}}
diff --git a/app/components/confirm-delete/template.hbs b/app/components/confirm-delete/template.hbs
index e979e15bf..4b9b1329e 100644
--- a/app/components/confirm-delete/template.hbs
+++ b/app/components/confirm-delete/template.hbs
@@ -24,6 +24,6 @@
 </div>
 
 <div class="footer-actions">
-  <button {{action "confirm"}} class="btn bg-danger">{{t 'confirmDelete.confirmAction'}}</button>
+  <button {{action "confirm"}} class="btn bg-error">{{t 'confirmDelete.confirmAction'}}</button>
   <button {{action "cancel"}} class="btn bg-transparent">{{t 'confirmDelete.cancelAction'}}</button>
 </div>
diff --git a/app/components/edit-projecttemplate/template.hbs b/app/components/edit-projecttemplate/template.hbs
index 91632d648..a00cd8133 100644
--- a/app/components/edit-projecttemplate/template.hbs
+++ b/app/components/edit-projecttemplate/template.hbs
@@ -69,7 +69,7 @@
                 <button type="button" class="btn bg-default bg-disabled" {{action "disableStack" obj true allowedKeys="meta ctrl"}}>{{t 'editProjectTemplate.stackRequired'}}</button>
               {{else if obj.enabled}}
                 <button type="button" class="btn bg-default" {{action "enableStack" obj}}>{{t 'editProjectTemplate.stackEdit'}}</button>
-                <button type="button" class="btn bg-danger" {{action "disableStack" obj}}>{{t 'generic.disable'}}</button>
+                <button type="button" class="btn bg-error" {{action "disableStack" obj}}>{{t 'generic.disable'}}</button>
               {{else if obj.supported}}
                 <button type="button" class="btn bg-primary" {{action "enableStack" obj}}>{{t 'generic.enable'}}</button>
               {{/if}}
diff --git a/app/components/modal-confirm-deactivate/template.hbs b/app/components/modal-confirm-deactivate/template.hbs
index 7557b61ad..845fb6d96 100644
--- a/app/components/modal-confirm-deactivate/template.hbs
+++ b/app/components/modal-confirm-deactivate/template.hbs
@@ -9,6 +9,6 @@
 
 
 <div class="footer-actions">
-  <button {{action "confirm"}} class="btn bg-danger">{{isService.button}}</button>
+  <button {{action "confirm"}} class="btn bg-error">{{isService.button}}</button>
   <button {{action "cancel"}} class="btn bg-transparent">{{t 'modalConfirmDeactiviate.cancel'}}</button>
 </div>
diff --git a/app/components/modal-container-stop/template.hbs b/app/components/modal-container-stop/template.hbs
index bd9e8715b..f264a2e57 100644
--- a/app/components/modal-container-stop/template.hbs
+++ b/app/components/modal-container-stop/template.hbs
@@ -25,6 +25,6 @@
 </div>
 
 <div class="footer-actions">
-  <button {{action "stop"}} class="btn bg-danger">{{t 'modalContainerStop.button'}}</button>
+  <button {{action "stop"}} class="btn bg-error">{{t 'modalContainerStop.button'}}</button>
   <button {{action "cancel"}} class="btn bg-transparent">{{t 'generic.cancel'}}</button>
 </div>
diff --git a/app/fail-whale/template.hbs b/app/fail-whale/template.hbs
index 2d3e996f0..e7cb1cea6 100644
--- a/app/fail-whale/template.hbs
+++ b/app/fail-whale/template.hbs
@@ -1,6 +1,6 @@
 <section class="fail-whale">
   <div class="error">
-    <h2 class="bg-danger">{{t 'failWhalePage.header'}}</h2>
+    <h2 class="bg-error">{{t 'failWhalePage.header'}}</h2>
     <div class="pl-20">
       <h4 class="mt-20">{{model.code}} {{#if model.status}}({{model.status}}){{/if}}</h4>
       <p>{{model.message}}</p>
diff --git a/app/mixins/cattle-transitioning-resource.js b/app/mixins/cattle-transitioning-resource.js
index 04effeb7c..d3078daf7 100644
--- a/app/mixins/cattle-transitioning-resource.js
+++ b/app/mixins/cattle-transitioning-resource.js
@@ -13,12 +13,12 @@ const defaultStateMap = {
   'deactivating':             {icon: 'icon icon-adjust',        color: 'text-info'   },
   'degraded':                 {icon: 'icon icon-alert',         color: 'text-warning'},
   'disconnected':             {icon: 'icon icon-alert',         color: 'text-warning' },
-  'error':                    {icon: 'icon icon-alert',         color: 'text-danger' },
-  'inactive':                 {icon: 'icon icon-circle',        color: 'text-danger' },
+  'error':                    {icon: 'icon icon-alert',         color: 'text-error' },
+  'inactive':                 {icon: 'icon icon-circle',        color: 'text-error' },
   'initializing':             {icon: 'icon icon-alert',         color: 'text-warning'},
-  'purged':                   {icon: 'icon icon-purged',        color: 'text-danger' },
+  'purged':                   {icon: 'icon icon-purged',        color: 'text-error' },
   'purging':                  {icon: 'icon icon-purged',        color: 'text-info'   },
-  'removed':                  {icon: 'icon icon-trash',         color: 'text-danger' },
+  'removed':                  {icon: 'icon icon-trash',         color: 'text-error' },
   'removing':                 {icon: 'icon icon-trash',         color: 'text-info'   },
   'requested':                {icon: 'icon icon-tag',           color: 'text-info'   },
   'registering':              {icon: 'icon icon-tag',           color: 'text-info'   },
@@ -28,9 +28,9 @@ const defaultStateMap = {
   'snapshotted':              {icon: 'icon icon-snapshot',      color: 'text-warning'},
   'started-once':             {icon: 'icon icon-dot-circlefill',color: 'text-success'},
   'starting':                 {icon: 'icon icon-adjust',        color: 'text-info'   },
-  'stopped':                  {icon: 'icon icon-circle',        color: 'text-danger' },
+  'stopped':                  {icon: 'icon icon-circle',        color: 'text-error' },
   'stopping':                 {icon: 'icon icon-adjust',        color: 'text-info'   },
-  'unhealthy':                {icon: 'icon icon-alert',         color: 'text-danger' },
+  'unhealthy':                {icon: 'icon icon-alert',         color: 'text-error' },
   'updating':                 {icon: 'icon icon-tag',           color: 'text-info'   },
   'updating-active':          {icon: 'icon icon-tag',           color: 'text-info'   },
   'updating-healthy':         {icon: 'icon icon-tag',           color: 'text-info'   },
@@ -41,7 +41,7 @@ const defaultStateMap = {
 };
 
 const stateColorSortMap = {
-  'danger':   1,
+  'error':   1,
   'warning':  2,
   'info':     3,
   'success':  4
@@ -232,7 +232,7 @@ export default Ember.Mixin.create({
 
   stateColor: function() {
     if ( this.get('isError') ) {
-      return 'text-danger';
+      return 'text-error';
     }
 
     var map = this.constructor.stateMap;
diff --git a/app/not-found/template.hbs b/app/not-found/template.hbs
index dbf16b738..508651ff9 100644
--- a/app/not-found/template.hbs
+++ b/app/not-found/template.hbs
@@ -1,6 +1,6 @@
 <section class="fail-whale">
   <div class="error">
-    <h2 class="bg-danger">404</h2>
+    <h2 class="bg-error">404</h2>
     <div class="pl-20 text-center">
       <p>{{t 'notFoundPage.header'}}</p>
       <div>
diff --git a/app/styles/app-light.scss b/app/styles/app-light.scss
index f6909c3f0..e65411705 100644
--- a/app/styles/app-light.scss
+++ b/app/styles/app-light.scss
@@ -54,7 +54,7 @@
 @import "app/styles/components/resource-actions";
 @import "app/styles/components/login";
 @import "app/styles/components/progress-bar";
-// @import "app/styles/components/pod";
+@import "app/styles/components/pod";
 @import "app/styles/components/github-avatar";
 @import "app/styles/components/slider";
 @import "app/styles/components/sortable";
diff --git a/app/styles/base/_rancher.scss b/app/styles/base/_rancher.scss
index 307c96704..cf4b5f8a6 100644
--- a/app/styles/base/_rancher.scss
+++ b/app/styles/base/_rancher.scss
@@ -1,3 +1,7 @@
+h1, h2, h3, h4, h5, h6 {
+  color: $secondary;
+}
+
 .dropdown-menu {
   background-color: $dropdown-bg;
   position: absolute;
@@ -64,10 +68,43 @@
 //tabs
 .tabs {
   ul.tab-header { 
-    li a {
+    li {
       background-color: $tab-bg;
       color: $tab-color;
+
+      &.active {
+      background-color: $tab-active-bg;
+      color: $tab-color;
+      }
+
+      a {
+      background-color: transparent;
       padding: 10px;
+      }
+    }
+  }
+}
+
+//tables
+table{
+  thead{
+    tr {
+      background-color: transparent;
+    }
+  }
+}
+
+//header
+#navbar {
+  .nav {
+    li {
+      a {
+        font-weight: 300;
+
+        &.active {
+          font-weight: normal;
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/app/styles/components/_modals.scss b/app/styles/components/_modals.scss
index a8af8340a..9b2880c81 100644
--- a/app/styles/components/_modals.scss
+++ b/app/styles/components/_modals.scss
@@ -9,6 +9,20 @@
     margin: 15px 10px 30px 10px;
   }
 }
-.lacsso.modal-overlay.modal-open .modal-container.modal-logs {
-    max-height: 100%;
-}
+// .lacsso.modal-overlay.modal-open .modal-container.modal-logs {
+
+// }
+
+
+.modal-overlay {
+  &.modal-open {
+    .modal-container {
+      background: $well-bg;
+      
+      &.modal-logs {
+        max-height: 100%;
+        background-color: $well-bg;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/app/styles/components/_pod.scss b/app/styles/components/_pod.scss
index 9aa36cd14..266c5f692 100644
--- a/app/styles/components/_pod.scss
+++ b/app/styles/components/_pod.scss
@@ -11,9 +11,7 @@ $subpod-detail   : $table-bg-accent;
 .pod-column {
   /* width is set dynamically */
   width          : 260px;
-  display        : inline-block;
   vertical-align : top;
-  margin         : 0 10px 10px 0;
 
   &:last-of-type {
     margin-right: 0;
@@ -21,15 +19,14 @@ $subpod-detail   : $table-bg-accent;
 }
 
 .pod {
-  background    : $accent-one;
+  background    : $well-bg;
   border        : solid transparent;
   position      : relative;
   padding       : 5px;
   margin-bottom : 10px;
-  border-radius : $border-radius-base;
 
   .pod-header {
-    font-weight    : $normal-weight;
+    // font-weight    : $normal-weight;
   }
   .pod-name {
     margin-top: 5px;
@@ -37,14 +34,13 @@ $subpod-detail   : $table-bg-accent;
 
   .pod-state {
     font-size                  : 11px;
+    font-weight                : 300;
     text-align                 : center;
     padding                    : 5px 10px;
     vertical-align             : top;
     display                    : inline-block;
-    border-bottom-left-radius  : $border-radius-base;
-    border-bottom-right-radius : $border-radius-base;
-    font-weight                : $normal-weight;
     text-transform             : uppercase;
+    line-height                : 1;
 
     SPAN {
       position : relative;
@@ -134,7 +130,7 @@ $subpod-detail   : $table-bg-accent;
 
 
     H6 {
-      margin-top: 3px;
+      margin: 3px 0;
     }
 
     .icon-chevron-down {
@@ -244,7 +240,7 @@ $subpod-detail   : $table-bg-accent;
   padding                   : 5px 5px 0 5px;
 
   H6 {
-    margin-right: 5px;
+    margin: 0 5px 0 0;
   }
 }
 
diff --git a/app/styles/layout/_header.scss b/app/styles/layout/_header.scss
index 9b6247763..01c6f8f3d 100644
--- a/app/styles/layout/_header.scss
+++ b/app/styles/layout/_header.scss
@@ -262,6 +262,7 @@ HEADER {
       position: relative;
       float: none;
       border: 0;
+      font-size: 15px;
 
       label {
         visibility: hidden;
diff --git a/app/styles/layout/_layout.scss b/app/styles/layout/_layout.scss
index 5e010a702..0f3a9ea6f 100644
--- a/app/styles/layout/_layout.scss
+++ b/app/styles/layout/_layout.scss
@@ -500,6 +500,7 @@ TABLE.graphs {
         padding          : 8px;
         line-height      : $base-line-height;
         vertical-align   : top;
+        border: none;
         border-top       : 1px solid $table-border-color;
       }
 
diff --git a/app/templates/ldap-config.hbs b/app/templates/ldap-config.hbs
index 41a131959..61e645117 100644
--- a/app/templates/ldap-config.hbs
+++ b/app/templates/ldap-config.hbs
@@ -66,11 +66,11 @@
     </p>
 
     {{#if confirmDisable}}
-      <button class="btn bg-danger" {{action "disable"}}>
+      <button class="btn bg-error" {{action "disable"}}>
         <i class="icon icon-alert"></i> {{t 'ldap.accessEnabled.disable.confirmDisable.post'}}
       </button>
     {{else}}
-      <button class="btn bg-danger" {{action "promptDisable"}}>
+      <button class="btn bg-error" {{action "promptDisable"}}>
         <i class="icon icon-umbrella"></i> {{t 'ldap.accessEnabled.disable.confirmDisable.pre'}}
       </button>
     {{/if}}
diff --git a/app/templates/shibboleth-configured.hbs b/app/templates/shibboleth-configured.hbs
index 1ab434d8a..25538fb37 100644
--- a/app/templates/shibboleth-configured.hbs
+++ b/app/templates/shibboleth-configured.hbs
@@ -28,7 +28,6 @@
       </div>
     </div>
   </div>
-
 </section>
 
 {{site-access
@@ -45,11 +44,11 @@
   </p>
 
   {{#if confirmDisable}}
-    <button class="btn bg-danger" {{action "disable"}}>
+    <button class="btn bg-error" {{action "disable"}}>
       <i class="icon icon-alert"></i> {{t 'authPage.shibboleth.enabled.disableAccess.confirmDisable'}}
     </button>
   {{else}}
-    <button class="btn bg-danger" {{action "promptDisable"}}>
+    <button class="btn bg-error" {{action "promptDisable"}}>
       <i class="icon icon-umbrella"></i> {{t 'authPage.shibboleth.enabled.disableAccess.disable'}}
     </button>
   {{/if}}