diff --git a/app/pods/components/music-tab/mixins/music-tab.js b/app/pods/components/music-tab/mixins/music-tab.js
index 3dce95c..f65e28f 100644
--- a/app/pods/components/music-tab/mixins/music-tab.js
+++ b/app/pods/components/music-tab/mixins/music-tab.js
@@ -134,9 +134,9 @@ export default Em.Mixin.create({
   randomTransition: true,
   randomTransitionLabel: function() {
     if(this.get('randomTransition')){
-      return 'Random Transition';
+      return 'Random';
     } else {
-      return 'Sequential Transition';
+      return 'Sequential';
     }
   }.property('randomTransition'),
 
@@ -252,7 +252,11 @@ export default Em.Mixin.create({
       opacity = 0.8;
     }
 
-    this.$('#dimmer').fadeTo(400, opacity);
+    this.$('#dimmer').fadeTo(400, opacity, function() {
+      if(opacity === 0) {
+        $(this).hide();
+      }
+    });
   }.observes('dimmerOn'),
 
   onSpeakerViewedChange: function(){
diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index 67a6cc3..143651d 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -124,23 +124,22 @@
     </div>
 
     <div id="beatOptionButtonGroup" class="row">
-      <div class="beatOption col-xs-6">
+      <div class="beatOption col-xs-3">
+        {{#paper-button raised=true warn=true action="defaultControls"}}Default{{/paper-button}}
+      </div>
+      <div class="beatOption col-xs-4">
         {{#paper-switch checked=randomTransition disabled=trial}}<span data-toggle="tooltip"
                                                                        data-placement="bottom auto"
                                                                        data-title="The transition order of lights on beat"
                                                                        class="optionDescription bootstrapTooltip">{{randomTransitionLabel}}</span>{{/paper-switch}}
       </div>
-      <div class="beatOption col-xs-6">
+      <div class="beatOption col-xs-5">
         {{#paper-switch checked=onBeatBriAndColor disabled=trial}}<span data-toggle="tooltip"
                                                                         data-placement="bottom auto"
                                                                         data-title="The properties of the lights to change on beat"
                                                                         class="optionDescription bootstrapTooltip"> {{onBeatBriAndColorLabel}}</span>{{/paper-switch}}
       </div>
     </div>
-
-    <div id="playerButtonGroup" class="row">
-      {{#paper-button raised=true warn=true action="defaultControls"}}Default{{/paper-button}}
-    </div>
   </div>
 
   <div id="beatContainer" class="col-sm-5 col-xs-12">
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 4bde652..2aaac3f 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -7,7 +7,7 @@ $playerBackColor: #F12B24;
 $playerHeight: 400px;
 $playerDefaultIconColor: #BBBBBB;
 $footerHeight: 40px;
-$playerBottomHeight: 380px;
+$playerBottomHeight: 340px;
 
 // BRIDGE FINDER
 html {
@@ -707,6 +707,9 @@ md-switch.md-default-theme.md-checked .md-thumb {
   .optionDescription {
     font-size: 13px;
   }
+  button {
+    margin-top: 0;
+  }
 }
 
 #playerBottom {
@@ -714,7 +717,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
   border: 1px solid black;
   width: 100%;
   background: white;
-  height: $playerBottomHeight;
 }
 
 #beatContainer {
@@ -722,10 +724,9 @@ md-switch.md-default-theme.md-checked .md-thumb {
   padding: 0;
   height: $playerBottomHeight;
   md-switch {
-    bottom: 0;
+    top: 0;
     position: absolute;
     margin-left: 0;
-    z-index: 3;
     margin-bottom: 10px;
   }
 }