diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs
index a401712..6b94935 100644
--- a/app/pods/components/music-tab/template.hbs
+++ b/app/pods/components/music-tab/template.hbs
@@ -63,7 +63,7 @@
       <li><a href="#" {{action "toggleIsShowingAddSoundCloudModal"}}>SoundCloud</a></li>
     </ul>
 
-    {{#if playQueueNotEmpty}}
+    {{#if (and usingLocalAudio playQueueNotEmpty)}}
         <div id="extraOptionsMenu" class="hidden-xs">
             <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
             <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
@@ -72,11 +72,14 @@
     {{/if}}
   {{/if}}
 
+  {{#if usingMicSupported}}
+    <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="usingMicAudioTooltip" data-title={{usingMicAudioTooltipTxt}} {{action "useMicAudio"}}>{{paper-icon icon=micIcon class=usingMicAudioClass}}</span>
+  {{/if}}
+
+  {{#if usingLocalAudio}}
     <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
     <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
     <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip visible-xs-inline" data-title="Clear playlist" {{action "clearPlaylist"}}>{{paper-icon icon="clear-all" class="playerControllIcon"}}</span>
-  {{#if usingMicSupported}}
-    <span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="usingMicAudioTooltip" data-title={{usingMicAudioTooltipTxt}} {{action "useMicAudio"}}>{{paper-icon icon=micIcon class=usingMicAudioClass}}</span>
   {{/if}}
 </div>
 
diff --git a/app/styles/app.scss b/app/styles/app.scss
index 06676a8..3df17af 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -137,7 +137,7 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli
 
 .bridgeFinder, .readyBlock {
   text-align: center;
-  padding-top: 20px;
+  padding-top: 10px;
 }
 
 // preloading image
@@ -147,7 +147,7 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli
 }
 
 .title {
-  font-size: 30px;
+  font-size: 34px;
   margin-bottom: 30px;
 }
 
@@ -645,6 +645,12 @@ md-switch.md-default-theme.md-checked .md-thumb {
       opacity: 1 !important;
     }
   }
+  .settingsItem:nth-of-type(2){
+    margin-left: 0;
+  }
+  #seekSlider {
+    margin-bottom: 15px;
+  }
 }
 
 #seekSlider:hover {