diff --git a/app/assets/javascripts/.music_player.js.swo b/app/assets/javascripts/.music_player.js.swo
index 0c298efffb640fc2337f7b56d73c4b0909f1b01f..a1c8aa8500088941548c92fbbd3ffa219f5ba17d 100644
Binary files a/app/assets/javascripts/.music_player.js.swo and b/app/assets/javascripts/.music_player.js.swo differ
diff --git a/app/assets/javascripts/music_player.js b/app/assets/javascripts/music_player.js
index 161d7d03b4dde823c832307a52a58e7c58c19dd6..63d0ab5ecd87d3352e6f810f4647bbb8559c7def 100644
--- a/app/assets/javascripts/music_player.js
+++ b/app/assets/javascripts/music_player.js
@@ -1,6 +1,8 @@
 var music_info;
 var player;
-var player_display = false;
+var player_expand = false;
+var player_min;
+var player_max;
 
 $( ".clickable_links" ).each(function() {
   if ($(this).data().player == "youtube" ) {
@@ -25,8 +27,13 @@ function youtube_player() {
   player_destroy();
   player_button();
   next_button();
+
+  var player_height;
+  if (player_expand) { player_height = 390; }
+  else { player_height = 30; }
+
   player = new YT.Player('player_block', {
-    height: '390',
+    height: player_height,
     width: '640',
     videoId: music_info.data().url,
     events: {
@@ -35,10 +42,22 @@ function youtube_player() {
       'onError': player_error
     }
   });
+  
+  var white_top = $("#header").height();
+  $("#white").css({'height':white_top}).slideDown();
+  player_min = 30;
+  player_max = 390;
 }
 
 function next_music() {
   music_info = $("li[data-id=\'"+music_info.data().id+"\']").next();
+  if (music_info.length == 0) {
+
+     window.location.href = $(".next a").attr('href');
+
+     //setTimeout($(".clickable_links").first().trigger("click"),2000);
+     //console.log($(".clickable_links").first());
+  }
   if (music_info.data().player == "youtube" ) {
     youtube_player();
   }
@@ -106,8 +125,13 @@ function soundcloud_player() {
   player_destroy();
   player_button();
   next_button();
+
+  var player_height;
+  if (player_expand) { player_height = 120; }
+  else { player_height = 20; }
+
   var music_url = "https://www.soundcloud.com/"+music_info.data().url;
-  SC.oEmbed(music_url, { auto_play: true , maxheight: 120, maxwidth: 1000 }, function(oEmbed, error) {
+  SC.oEmbed(music_url, { auto_play: true , maxheight: player_height, maxwidth: 1000 }, function(oEmbed, error) {
     if (error) { 
       next_music();
     }
@@ -117,27 +141,36 @@ function soundcloud_player() {
       setTimeout(soundcloud_listener, 2000 );
     }
   });
+  
+  var white_top = $("#header").height();
+  $("#white").css({'height':white_top}).slideDown();
+  player_min = 20;
+  player_max = 120;
 }
 
 function player_button(){
-  if (player_display) {
-    $(".menu").prepend("<span><a id=\"player\">Player [Hide]</a></span>");
+  if (player_expand) {
+    $(".menu").prepend("<span><a id=\"player\">Player [Reduce]</a></span>");
   }
   else {
-    $(".menu").prepend("<span><a id=\"player\">Player [Show]</a></span>");
+    $(".menu").prepend("<span><a id=\"player\">Player [Expand]</a></span>");
   }
 
-  $("#player").on( 'click', function(){ 
-    if ( player_display ) {
-      $("#player_position").css("display", "none");
-      $("#player").html("Player [Show]");
-      player_display = false;
+  $("#player").on( 'click', function(){
+    if ( player_expand ) {
+      $("iframe").attr('height', player_min);
+      $("#player").html("Player [Expand]");
+      player_expand = false;
+
     }
     else {
-      $("#player_position").css("display", "block");
-      $("#player").html("Player [Hide]");
-      player_display = true;
-    }
+      $("iframe").attr('height', player_max);
+      $("#player_position").slideDown();
+      $("#player").html("Player [Reduce]");
+      player_expand = true;
+    }  
+    var white_top = $("#header").height();
+    $("#white").css({'height':white_top}).slideDown();
   });
 }
 
diff --git a/app/assets/stylesheets/.music_index.css.swp b/app/assets/stylesheets/.music_index.css.swp
index 0fb5045a9f2ae050c1d03772a132e72caf7d677f..ba4e1e690d16628d0ff3ab8693514058f9f78121 100644
Binary files a/app/assets/stylesheets/.music_index.css.swp and b/app/assets/stylesheets/.music_index.css.swp differ
diff --git a/app/assets/stylesheets/music_index.css b/app/assets/stylesheets/music_index.css
index ecc5763a187b160d476f90e8f2a4aeab953a8ad4..e2ec1d384204308445cc44b52012e7238289ec95 100644
--- a/app/assets/stylesheets/music_index.css
+++ b/app/assets/stylesheets/music_index.css
@@ -68,19 +68,18 @@ ul
 }
 
 .menu {
-  margin: auto;
+  margin: 5px auto;
   text-align: center;
   background-color: rgba(0, 110, 140, 1);
 }
 #white{
-  height: 73px;
+  height: 63px;
 }
 
 #header{
   position:fixed;
   width: 100%;
   background-color: white;
-  padding: 10px 0;
   margin: 0; 
   top: 0;
 }
@@ -103,7 +102,7 @@ body, html, head{
 }
 
 #player_position{
-  display: none;
+  margin-bottom: 5px;    
 }
 
 .music_id
diff --git a/app/views/layouts/.application.html.erb.swp b/app/views/layouts/.application.html.erb.swp
deleted file mode 100644
index be86fcde058000883890e6b2866bfe0a62704611..0000000000000000000000000000000000000000
Binary files a/app/views/layouts/.application.html.erb.swp and /dev/null differ
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 10b5eac256ea6c2f6f48170bd2b7003e19e4fea7..2d23ae963a823e372d140198a66edd150ed320ae 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -16,8 +16,8 @@
     <span><a href="/tags">Tags</a></span> 
     </li>
   </ul>
-    <div id="player_position"><div id="player_block"></div></div>
-  </div>
+  <div id="player_position"><div id="player_block"></div></div>
+</div>
 <%= yield %>
 
 </body>