diff --git a/MusicApp/MainActivity.cs b/MusicApp/MainActivity.cs
index 944fa2f..7ef5feb 100644
--- a/MusicApp/MainActivity.cs
+++ b/MusicApp/MainActivity.cs
@@ -1192,7 +1192,7 @@ namespace MusicApp
                 HideTabs();
                 HideSearch();
 
-                if(Queue.instance != null)
+                if (Queue.instance != null)
                 {
                     ViewGroup rootView = FindViewById<ViewGroup>(Android.Resource.Id.Content);
                     rootView.RemoveView(Queue.instance.recyclerFragment);
diff --git a/MusicApp/Resources/Portable Class/MusicPlayer.cs b/MusicApp/Resources/Portable Class/MusicPlayer.cs
index 22e1dde..e959aca 100644
--- a/MusicApp/Resources/Portable Class/MusicPlayer.cs	
+++ b/MusicApp/Resources/Portable Class/MusicPlayer.cs	
@@ -332,7 +332,6 @@ namespace MusicApp.Resources.Portable_Class
             while(instance == null)
                 await Task.Delay(10);
 
-            Player.instance?.RefreshPlayer();
             for (int i = clearQueue ? 1 : 0; i < filePath.Count; i++)
             {
                 GetTrackSong(filePath[i], out Song song);
diff --git a/MusicApp/Resources/Portable Class/Playlist.cs b/MusicApp/Resources/Portable Class/Playlist.cs
index b564215..d80b325 100644
--- a/MusicApp/Resources/Portable Class/Playlist.cs	
+++ b/MusicApp/Resources/Portable Class/Playlist.cs	
@@ -491,14 +491,14 @@ namespace MusicApp.Resources.Portable_Class
                 musicCursor.Close();
             }
 
-            MainActivity.instance.HideTabs();
-            MainActivity.instance.HideSearch();
-            MainActivity.instance.SupportFragmentManager.BeginTransaction().Replace(Resource.Id.contentView, Player.NewInstance()).AddToBackStack(null).Commit();
-
             Intent intent = new Intent(Android.App.Application.Context, typeof(MusicPlayer));
             intent.PutStringArrayListExtra("files", tracksPath);
             intent.SetAction("RandomPlay");
             context.StartService(intent);
+
+            MainActivity.instance.HideTabs();
+            MainActivity.instance.HideSearch();
+            MainActivity.instance.SupportFragmentManager.BeginTransaction().Replace(Resource.Id.contentView, Player.NewInstance()).AddToBackStack(null).Commit();
         }
 
         void Rename(int position, Song playlist)
diff --git a/MusicApp/Resources/Portable Class/YoutubeEngine.cs b/MusicApp/Resources/Portable Class/YoutubeEngine.cs
index 351a813..e08db35 100644
--- a/MusicApp/Resources/Portable Class/YoutubeEngine.cs	
+++ b/MusicApp/Resources/Portable Class/YoutubeEngine.cs	
@@ -813,7 +813,7 @@ namespace MusicApp.Resources.Portable_Class
 
                 nextPageToken = ytPlaylist.NextPageToken;
             }
-            MusicPlayer.queue.Clear();
+            //MusicPlayer.queue.Clear();
             Random r = new Random();
             tracks = tracks.OrderBy(x => r.Next()).ToList();
             PlayFiles(tracks.ToArray());