diff --git a/app/pods/components/bridge-finder/component.js b/app/pods/components/bridge-finder/component.js
index d5b10f1..8812119 100644
--- a/app/pods/components/bridge-finder/component.js
+++ b/app/pods/components/bridge-finder/component.js
@@ -76,7 +76,7 @@ export default Em.Component.extend({
 
           if (status === 'success' && result.length === 1) {
             this.set('bridgeIp', result[0].internalipaddress);
-            localStorage.setItem('huegasm.bridgeIp', result[0].internalipaddress);
+            this.get('storage').set('huegasm.bridgeIp', result[0].internalipaddress);
             bridgeFindStatus = 'success';
           } else if (result.length > 1) {
             var multipleBridgeIps = this.get('multipleBridgeIps');
@@ -121,7 +121,7 @@ export default Em.Component.extend({
         if (status === 'success') {
           if (!result[0].error) {
             self.set('bridgeUsername', result[0].success.username);
-            localStorage.setItem('huegasm.bridgeUsername', result[0].success.username);
+            this.get('storage').set('huegasm.bridgeUsername', result[0].success.username);
             clearInterval(self.get('bridgePingIntervalHandle'));
             self.set('bridgePingIntervalHandle', null);
           }
diff --git a/app/pods/components/groups-list/component.js b/app/pods/components/groups-list/component.js
index b1bf6de..e8707c5 100644
--- a/app/pods/components/groups-list/component.js
+++ b/app/pods/components/groups-list/component.js
@@ -59,7 +59,7 @@ export default Em.Component.extend({
       }
     });
 
-    localStorage.setItem('huegasm.selectedGroup', groupIdSelection);
+    this.get('storage').set('huegasm.selectedGroup', groupIdSelection);
 
     if(!Em.isNone(groupIdSelection) && !Em.isEmpty(lights)){
       this.set('activeLights', lights);
@@ -67,7 +67,7 @@ export default Em.Component.extend({
   }.observes('groupIdSelection', 'groupsArrData'),
 
   didInsertElement(){
-    var selectGroup = '0', storageItem = localStorage.getItem('huegasm.selectedGroup');
+    var selectGroup = '0', storageItem = this.get('storage').get('huegasm.selectedGroup');
 
     if(storageItem){
       selectGroup = storageItem;
diff --git a/app/pods/components/hue-controls/component.js b/app/pods/components/hue-controls/component.js
index c322b5a..861179c 100644
--- a/app/pods/components/hue-controls/component.js
+++ b/app/pods/components/hue-controls/component.js
@@ -18,15 +18,16 @@ export default Em.Component.extend({
     changeTab(tabName){
       var index = this.get('tabList').indexOf(tabName);
       this.set('selectedTab', index);
-      localStorage.setItem('huegasm.selectedTab', index);
+      this.get('storage').set('huegasm.selectedTab', index);
     },
     clearBridge() {
-      delete localStorage['huegasm.bridgeUsername'];
-      delete localStorage['huegasm.bridgeIp'];
+      var storage = this.get('storage');
+      storage.remove('huegasm.bridgeUsername');
+      storage.remove('huegasm.bridgeIp');
       location.reload();
     },
     clearAllSettings() {
-      localStorage.clear();
+      this.get('storage').clear();
       location.reload();
     }
   },
@@ -60,8 +61,8 @@ export default Em.Component.extend({
       this.set('lightsDataIntervalHandle', setInterval(this.updateLightData.bind(this), 1000));
     }
 
-    if (localStorage.getItem('huegasm.selectedTab')) {
-      this.set('selectedTab', Number(localStorage.getItem('huegasm.selectedTab')));
+    if (this.get('storage').get('huegasm.selectedTab')) {
+      this.set('selectedTab', Number(this.get('storage').get('huegasm.selectedTab')));
     }
   },
 
diff --git a/app/pods/components/hue-controls/template.hbs b/app/pods/components/hue-controls/template.hbs
index 2f1fad0..773b488 100644
--- a/app/pods/components/hue-controls/template.hbs
+++ b/app/pods/components/hue-controls/template.hbs
@@ -11,7 +11,7 @@
         <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}}
+        {{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed storage=storage}}
       </div>
 
       <div class="settingsItem">
diff --git a/app/pods/components/huegasm-app/component.js b/app/pods/components/huegasm-app/component.js
index 507b666..926abf6 100644
--- a/app/pods/components/huegasm-app/component.js
+++ b/app/pods/components/huegasm-app/component.js
@@ -43,7 +43,7 @@ export default Em.Component.extend({
   init(){
     this._super();
 
-    var storage = new window.Locally.Store();
+    var storage = new window.Locally.Store({ compress: true });
     this.set('storage', storage);
 
     ['bridgeIp', 'bridgeUsername', 'dimmerOn'].forEach((item) => {
diff --git a/app/pods/components/huegasm-app/template.hbs b/app/pods/components/huegasm-app/template.hbs
index 8096468..bf78af3 100644
--- a/app/pods/components/huegasm-app/template.hbs
+++ b/app/pods/components/huegasm-app/template.hbs
@@ -2,7 +2,7 @@
   {{hue-controls bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial dimmerOn=dimmerOn storage=storage}}
 {{else}}
   {{#if ready}}
-    {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
+    {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial storage=storage}}
   {{else}}
     <div class="readyBlock">
       <div class="title">Huegasm</div>
diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js
index d2ee64a..f71bf41 100644
--- a/app/pods/components/music-tab/component.js
+++ b/app/pods/components/music-tab/component.js
@@ -146,6 +146,8 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
 
           this.send('removeAudio', playQueuePointer);
 
+          debugger;
+          
           if(event.target.error.code === 2){
             this.get('notify').alert({html: this.get('failedToDecodeFileHtml')(song.fileName)});
           } else {
@@ -442,7 +444,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, {
     songBeatPreferences[title] = {threshold: this.get('threshold'), interval: this.get('interval'), frequency: this.get('frequency') };
 
     this.set('usingBeatPreferences', true);
-    this.get('storage').set('huegasm.songBeatPreferences', songBeatPreferences, { compress: true });
+    this.get('storage').set('huegasm.songBeatPreferences', songBeatPreferences);
   },
 
   loadSongBeatPreferences() {
diff --git a/app/pods/components/music-tab/mixins/helpers.js b/app/pods/components/music-tab/mixins/helpers.js
index bae2dac..9c58b80 100644
--- a/app/pods/components/music-tab/mixins/helpers.js
+++ b/app/pods/components/music-tab/mixins/helpers.js
@@ -290,7 +290,7 @@ export default Em.Mixin.create({
 
   onOptionChange: function(self, option){
     option = option.replace('.[]', '');
-    this.get('storage').set('huegasm.' + option, this.get(option), { compress: true });
+    this.get('storage').set('huegasm.' + option, this.get(option));
   }.observes('randomTransition', 'onBeatBriAndColor', 'playQueue.[]', 'playQueuePointer'),
 
   onRepeatChange: function () {
diff --git a/app/pods/components/music-tab/mixins/visualizer.js b/app/pods/components/music-tab/mixins/visualizer.js
index 29a6670..1b66d6d 100644
--- a/app/pods/components/music-tab/mixins/visualizer.js
+++ b/app/pods/components/music-tab/mixins/visualizer.js
@@ -1,7 +1,7 @@
 import Em from 'ember';
 
 export default Em.Mixin.create({
-  currentVisName: 'Wave',
+  currentVisName: 'None',
 
   visNames: ['None', 'Bars', 'Wave'],
 
@@ -35,7 +35,7 @@ export default Em.Mixin.create({
       ctx.clearRect(0, 0, w, h);
 
       if (currentVisName === 'Wave') {
-        let width = 2,
+        let width = 1,
           count = 1024,
           gradient = ctx.createLinearGradient(0, 0, 0, 300);
 
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 05b9885..f7349ad 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -68,7 +68,7 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
   span md-icon {
     position: relative;
     bottom: 5px;
-    right: 10px;
+    right: 5px;
   }
 }
 
@@ -158,7 +158,7 @@ md-progress-linear {
   background: white;
   box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, 0.3);
   width: 175px;
-  left: -115px;
+  left: -85px;
   top: 20px;
   border: none;
   color: black;
@@ -269,7 +269,7 @@ md-slider.md-default-theme .md-thumb:after {
   border-radius: 0 0 5px 5px;
   width: 300px;
   top: 20px;
-  left: -240px;
+  left: -210px;
   position: absolute;
   background-color: white;
   max-height: 400px;