diff --git a/app/pods/components/hue-controls/template.hbs b/app/pods/components/hue-controls/template.hbs
index 2dfc236..730b3e0 100644
--- a/app/pods/components/hue-controls/template.hbs
+++ b/app/pods/components/hue-controls/template.hbs
@@ -1,6 +1,6 @@
 {{#if ready}}
   <div class="row navigation">
-    <div class="col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-2">
+    <div class="col-sm-4 col-sm-offset-4 col-xs-8">
       {{#each tabData as |tab|}}
         <span class="navigationItem cursorPointer {{if tab.selected "active"}} text-uppercase" {{action "changeTab" tab.name}}>{{tab.name}}</span>
       {{/each}}
diff --git a/app/pods/components/huegasm-app/component.js b/app/pods/components/huegasm-app/component.js
index db9d6da..6376b4a 100644
--- a/app/pods/components/huegasm-app/component.js
+++ b/app/pods/components/huegasm-app/component.js
@@ -50,7 +50,7 @@ export default Em.Component.extend({
       this.set('dimmerOn', storage.get('huegasm.dimmerOn'));
     }
 
-    if(!Em.isNone(storage.get('huegasm.bridgeIp')) && !Em.isNone(storage.get('huegasm.bridgeUsername'))) {
+    if(!Em.isEmpty(storage.get('huegasm.bridgeIp')) && !Em.isEmpty(storage.get('huegasm.bridgeUsername'))) {
       this.setProperties({
         bridgeIp: storage.get('huegasm.bridgeIp'),
         bridgeUsername: storage.get('huegasm.bridgeUsername')
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index a4a0360..a401712 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -19,7 +19,7 @@
                   -->{{/if}}<!--
           --><span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" id="volumeMutedTooltip"
                    data-title={{volumeMutedTooltipTxt}} {{action "volumeMutedChanged"}}>{{paper-icon icon=volumeIcon class=volumeMutedClass}}</span><!--
-                  -->{{range-slider start=volume min=0 max=100 slide="volumeChanged" id="volumeBar"}}
+                  -->{{range-slider start=volume min=0 max=100 slide="volumeChanged" id="volumeBar" class="hidden-xs"}}
 
         <div id="playerTimeControls">{{timeElapsedTxt}} / {{timeTotalTxt}}</div>
       {{/if}}
@@ -27,7 +27,8 @@
       <span class="pull-right">
         {{#if scUrl}}
           <a href="#" data-toggle="tooltip" data-placement="top" class="soundCloudLink bootstrapTooltip" data-title="Listen on SoundCloud" {{action "gotoSCURL" scUrl}}>
-            <img src="assets/images/sc-white.png" />
+            <img src="assets/images/sc-white.png" class="hidden-xs" />
+              <img src="assets/images/sc-white-sm.png" class="visible-xs-inline" />
           </a>
         {{/if}}
         <span class="dropup">
diff --git a/app/styles/app.scss b/app/styles/app.scss
index b900679..f17d385 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -81,7 +81,6 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
 }
 
 .settingsItem {
-  margin-left: 10px;
   position: relative;
   display: inline-block;
   transition: 0.1s all ease-in-out;
@@ -93,6 +92,10 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
   }
 }
 
+.settingsItem:nth-of-type(2){
+  margin-left: 10px;
+}
+
 md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-slider[disabled=disabled] {
   cursor: not-allowed;
 }
diff --git a/public/assets/images/sc-white-sm.png b/public/assets/images/sc-white-sm.png
new file mode 100644
index 0000000..4c009dc
Binary files /dev/null and b/public/assets/images/sc-white-sm.png differ