diff --git a/app/components/controls/music-control.js b/app/components/controls/music-control.js
index a19046a..6081742 100644
--- a/app/components/controls/music-control.js
+++ b/app/components/controls/music-control.js
@@ -3,7 +3,7 @@ import Em from 'ember';
 export default Em.Component.extend({
   dancer: null,
 
-  classNames: ['container-fluid'],
+  classNames: ['container-fluid', 'innerControlFrame'],
 
   beatOptions: {
     threshold: {
@@ -285,7 +285,7 @@ export default Em.Component.extend({
   init: function () {
     this._super();
 
-    var dancer = new Dancer(),
+    var dancer = window.dancer || new Dancer(),
       self = this,
       threshold = this.get('threshold'),
       decay = this.get('decay'),
@@ -334,6 +334,7 @@ export default Em.Component.extend({
       self.set('timeTotal', dancer.audio.duration);
     });
 
+    window.dancer = dancer;
     this.setProperties({
       dancer: dancer,
       kick: kick
@@ -387,5 +388,12 @@ export default Em.Component.extend({
     });
 
     Em.$('[data-toggle="tooltip"]').tooltip();
+  },
+
+  // component clean up
+  destroy: function(){
+    //this.get('dancer').audioAdapter.context.close();
+    this.get('dancer').unbind('loaded');
+    this._super();
   }
 });
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 5787461..01ca690 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -10,6 +10,10 @@ $playListBackgroundColor: #1E1E1E;
 $playerDefaultIconColor: #BBBBBB;
 
 // BRIDGE FINDER
+.footerFixed {
+  position: static !important;
+}
+
 .footer {
   position: absolute;
   bottom: 0;
@@ -171,7 +175,7 @@ md-toolbar {
 }
 
 .innerControlFrame {
-  height: 100vh;
+  height: 80vh;
 }
 
 // GROUP CONTROL
@@ -274,6 +278,8 @@ md-toolbar {
 #playlist {
   height: $playerHeight;
   background-color: $playListBackgroundColor;
+  padding-left: 0.625em;
+  padding-right: 0.625em;
 }
 
 #playerArea * .noUi-origin {
diff --git a/app/templates/components/bridge-controls.hbs b/app/templates/components/bridge-controls.hbs
index bb92c88..db8c9e1 100644
--- a/app/templates/components/bridge-controls.hbs
+++ b/app/templates/components/bridge-controls.hbs
@@ -1,5 +1,4 @@
 {{#if ready}}
-
   {{#paper-nav-container class="ember-app"}}
 
     {{#paper-sidenav class="md-sidenav-left md-whiteframe-z2" flex-layout="column" flex=true locked-open="lg"}}
@@ -25,7 +24,7 @@
         {{#liquid-if musicTabSelected class="tabSwitch"}}
           {{controls/music-control apiURL=apiURL lightsData=lightsData  activeLights=activeLights}}
         {{/liquid-if}}
-        {{huegasm-footer}}
+        {{huegasm-footer classNames="footerFixed"}}
     {{/paper-content}}
   {{/paper-nav-container}}
 {{/if}}
\ No newline at end of file
diff --git a/app/templates/components/controls/music-control.hbs b/app/templates/components/controls/music-control.hbs
index 2febf9d..4b7d7e0 100644
--- a/app/templates/components/controls/music-control.hbs
+++ b/app/templates/components/controls/music-control.hbs
@@ -6,13 +6,13 @@
 
           {{#if nextPrevEnabled}}
               <span data-toggle="tooltip" data-placement="top" title="Previous"
-                    id="prevTooltip" {{action "previous"}}>{{paper-icon icon="skip-previous" class="playerControllIcon"}} </span>{{/if}}<!--
+                    id="prevTooltip" {{action "previous"}}>{{paper-icon icon="skip-previous" class="playerControllIcon"}}</span>{{/if}}<!--
                     --><span data-toggle="tooltip" data-placement="top"
                              title={{playingTooltipTxt}} id="playingTooltip" {{action "play"}}>{{paper-icon icon=playingIcon class="playerControllIcon"}}</span><!--
-                  -->{{#if nextPrevEnabled}}
-            <span data-toggle="tooltip" data-placement="top"
-                  title="Next song"  {{action "next"}}>{{paper-icon icon="skip-next" action="" class="playerControllIcon"}}</span>
-        {{/if}}<!--
+                  -->{{#if nextPrevEnabled}}<!--
+                --><span data-toggle="tooltip" data-placement="top"
+                  title="Next song"  {{action "next"}}>{{paper-icon icon="skip-next" action="" class="playerControllIcon"}}</span><!--
+                  -->{{/if}}<!--
           --><span data-toggle="tooltip" data-placement="top"
                    title={{volumeMutedTooltipTxt}} id="volumeMutedTooltip" {{action "volumeMutedChanged"}}>{{paper-icon icon=volumeClass  class="playerControllIcon volumeButton"}}</span><!--
                   -->{{range-slider start=volume min=0 max=100 slide="volumeChanged" id="volumeBar"}}