diff --git a/app/pods/components/hue-controls/component.js b/app/pods/components/hue-controls/component.js
index a81649f..c322b5a 100644
--- a/app/pods/components/hue-controls/component.js
+++ b/app/pods/components/hue-controls/component.js
@@ -37,7 +37,7 @@ export default Em.Component.extend({
 
   didInsertElement(){
     // here's a weird way to automatically initialize bootstrap tooltips
-    var self = this, observer = new MutationObserver(function(mutations) {
+    var observer = new MutationObserver(function(mutations) {
       var haveTooltip = !mutations.every(function(mutation) {
         return Em.isEmpty(mutation.addedNodes) || Em.isNone(mutation.addedNodes[0].classList) || mutation.addedNodes[0].classList.contains('tooltip');
       });
diff --git a/app/pods/components/hue-controls/template.hbs b/app/pods/components/hue-controls/template.hbs
index 5741925..2f1fad0 100644
--- a/app/pods/components/hue-controls/template.hbs
+++ b/app/pods/components/hue-controls/template.hbs
@@ -1,14 +1,14 @@
 {{#if ready}}
   <div class="row navigation">
-    <div class="col-sm-5 col-sm-offset-4 col-xs-6 col-xs-offset-2">
+    <div class="col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-2">
       {{#each tabData as |tab|}}
         <span class="navigationItem cursorPointer {{if tab.selected "active"}} text-uppercase" {{action "changeTab" tab.name}}>{{tab.name}}</span>
       {{/each}}
     </div>
 
-    <div id="settings" class="col-sm-3 col-xs-4">
+    <div id="settings" class="col-xs-4">
       <div class="settingsItem">
-        <span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{paper-icon icon="group" class=dimmerOnClass}} Groups <span class="caret"></span>
+        <span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{paper-icon icon="group" class=dimmerOnClass}}Groups <span class="caret"></span>
         </span>
 
         {{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}}
@@ -16,7 +16,7 @@
 
       <div class="settingsItem">
         <span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-          {{paper-icon icon="settings" class=dimmerOnClass}} Settings <span class="caret"></span>
+          {{paper-icon icon="settings" class=dimmerOnClass}}Settings <span class="caret"></span>
         </span>
 
         <ul id="appSettings" class="dropdown-menu">
diff --git a/app/styles/app.scss b/app/styles/app.scss
index bfde498..20d624d 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -67,7 +67,7 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
   span md-icon {
     position: relative;
     bottom: 5px;
-    right: 5px;
+    right: 10px;
   }
 }
 
@@ -860,9 +860,12 @@ html.dimmerOn {
 body.dimmerOn {
   color: white;
   background: #242424;
-  .md-track, .color {
+  .md-track {
     background: white;
   }
+  .color {
+    border: 1px solid white;
+  }
   .playlistItem {
     color: #cdcdcd;
     background: #2D2D2D;