diff --git a/MPfm/MPfm.Android/Classes/Activities/PlaylistActivity.cs b/MPfm/MPfm.Android/Classes/Activities/PlaylistActivity.cs
index e696e587..46f64781 100644
--- a/MPfm/MPfm.Android/Classes/Activities/PlaylistActivity.cs
+++ b/MPfm/MPfm.Android/Classes/Activities/PlaylistActivity.cs
@@ -30,6 +30,7 @@
 using MPfm.MVP.Views;
 using MPfm.Sound.AudioFiles;
 using MPfm.Sound.Playlists;
+using org.sessionsapp.android;
 
 namespace MPfm.Android
 {
@@ -39,9 +40,10 @@ public class PlaylistActivity : BaseActivity, IPlaylistView
         private MobileNavigationManager _navigationManager;
         Button _btnNew;
         Button _btnShuffle;
-        ListView _listView;
+        CustomListView _listView;
         PlaylistListAdapter _listAdapter;
         Playlist _playlist;
+        string _sourceActivityType;
 
         protected override void OnCreate(Bundle bundle)
         {
@@ -58,16 +60,27 @@ protected override void OnCreate(Bundle bundle)
             _btnShuffle = FindViewById<Button>(Resource.Id.playlist_btnNew);
             _btnShuffle.Click += BtnShuffleOnClick;
             
-            _listView = FindViewById<ListView>(Resource.Id.playlist_listView);
+            _listView = FindViewById<CustomListView>(Resource.Id.playlist_listView);
             _listAdapter = new PlaylistListAdapter(this, _listView, new Playlist());
             _listView.SetAdapter(_listAdapter);
             _listView.ItemClick += ListViewOnItemClick;
             _listView.ItemLongClick += ListViewOnItemLongClick;
 
+            // Save the source activity type for later (for providing Up navigation)
+            _sourceActivityType = Intent.GetStringExtra("sourceActivity");
+
             // Since the onViewReady action could not be added to an intent, tell the NavMgr the view is ready
             ((AndroidNavigationManager)_navigationManager).SetPlaylistActivityInstance(this);
         }
 
+        public override void OnAttachedToWindow()
+        {
+            Console.WriteLine("PlaylistActivity - OnAttachedToWindow");
+            var window = this.Window;
+            window.AddFlags(WindowManagerFlags.ShowWhenLocked);
+            window.SetWindowAnimations(0);
+        }
+
         private void BtnNewOnClick(object sender, EventArgs eventArgs)
         {
             OnNewPlaylist();
@@ -130,8 +143,9 @@ public override bool OnOptionsItemSelected(IMenuItem item)
             switch (item.ItemId)
             {
                 case global::Android.Resource.Id.Home:
-                    var intent = new Intent(this, typeof (MainActivity));
-                    intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
+                    var type = Type.GetType(_sourceActivityType);
+                    var intent = new Intent(this, type);
+                    intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop); 
                     this.StartActivity(intent);
                     this.Finish();
                     return true;
diff --git a/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs b/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
index 8dbe8248..fdf52ea4 100644
--- a/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
+++ b/MPfm/MPfm.Android/Classes/Adapters/PlaylistListAdapter.cs
@@ -16,22 +16,19 @@
 // along with MPfm. If not, see <http://www.gnu.org/licenses/>.
 
 using System;
-using System.Collections.Generic;
-using Android.App;
-using Android.Graphics;
 using Android.Views;
 using Android.Views.Animations;
 using Android.Widget;
-using MPfm.Library.Objects;
 using MPfm.Sound.AudioFiles;
 using MPfm.Sound.Playlists;
+using org.sessionsapp.android;
 
 namespace MPfm.Android.Classes.Adapters
 {
-    public class PlaylistListAdapter : BaseAdapter<AudioFile>, View.IOnClickListener
+    public class PlaylistListAdapter : BaseAdapter<AudioFile>, View.IOnClickListener, View.IOnTouchListener
     {
         readonly PlaylistActivity _context;
-        readonly ListView _listView;
+        readonly CustomListView _listView;
         Playlist _playlist;
         int _nowPlayingRowPosition;
         int _editingRowPosition;
@@ -39,7 +36,7 @@ public class PlaylistListAdapter : BaseAdapter<AudioFile>, View.IOnClickListener
 
         public bool IsEditingRow { get; private set; }
 
-        public PlaylistListAdapter(PlaylistActivity context, ListView listView, Playlist playlist)
+        public PlaylistListAdapter(PlaylistActivity context, CustomListView listView, Playlist playlist)
         {
             _context = context;
             _listView = listView;
@@ -77,15 +74,24 @@ public override View GetView(int position, View convertView, ViewGroup parent)
             if (item == null)
                 return view;
 
+            view.Tag = position;
+            //view.SetOnTouchListener(this);
+
             var index = view.FindViewById<TextView>(Resource.Id.playlistCell_lblIndex);
             var title = view.FindViewById<TextView>(Resource.Id.playlistCell_lblTitle);
             var subtitle = view.FindViewById<TextView>(Resource.Id.playlistCell_lblSubtitle);
+            var imageNowPlaying = view.FindViewById<ImageView>(Resource.Id.playlistCell_imageNowPlaying);
             
             //index.Text = item.AudioFile.TrackNumber.ToString();
             index.Text = (position+1).ToString();
             title.Text = item.AudioFile.ArtistName + " / " + item.AudioFile.Title;
             subtitle.Text = item.AudioFile.Length;
 
+            if (item.AudioFile != null && item.AudioFile.Id == _nowPlayingAudioFileId)
+                imageNowPlaying.Visibility = ViewStates.Visible;
+            else
+                imageNowPlaying.Visibility = ViewStates.Gone;
+
             return view;
         }
 
@@ -207,5 +213,29 @@ public void OnClick(View v)
                     break;
             }
         }
+
+        public bool OnTouch(View v, MotionEvent e)
+        {
+            //Console.WriteLine("PlaylistListAdapter - OnTouch - action: {0} buttonState: {1} downTime: {2} eventTime: {3} x: {4} y: {5}", e.Action, e.ButtonState, e.DownTime, e.EventTime, e.GetX(), e.GetY());
+
+            //float x = e.GetX();
+            //float y = e.GetY();
+
+            //// Keep cancel on top because the flag can contain both move and cancel.
+            //if (e.Action.HasFlag(MotionEventActions.Cancel))
+            //{
+            //    Console.WriteLine("PlaylistListAdapter - OnTouch - Cancel - (x,y): ({0},{1})", x, y);
+            //    _listView.IsScrollable = true;
+            //}
+            //else if (e.Action.HasFlag(MotionEventActions.Move))
+            //{
+            //    Console.WriteLine("PlaylistListAdapter - OnTouch - Move - (x,y): ({0},{1})", x, y);
+            //    _listView.IsScrollable = false;
+            //}
+
+            ////Console.WriteLine("PlaylistListAdapter - OnTouch - Current cell - height: {0} - position: {1}", v.Height, (int)v.Tag);
+
+            return true;
+        }        
     }
 }
diff --git a/MPfm/MPfm.Android/Classes/Controls/CustomListView.cs b/MPfm/MPfm.Android/Classes/Controls/CustomListView.cs
new file mode 100644
index 00000000..77c3cb68
--- /dev/null
+++ b/MPfm/MPfm.Android/Classes/Controls/CustomListView.cs
@@ -0,0 +1,154 @@
+// Copyright © 2011-2013 Yanick Castonguay
+//
+// This file is part of MPfm.
+//
+// MPfm is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// MPfm is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with MPfm. If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+using Android.Content;
+using Android.Graphics;
+using Android.Runtime;
+using Android.Util;
+using Android.Views;
+using Android.Widget;
+
+namespace org.sessionsapp.android
+{
+    /// <summary>
+    /// This custom list view is based on the Android list view but adds a few things such as the IsScrollable property and the ability to change row order
+    /// (because Google is clearly too lazy to do anything like that).
+    /// </summary>
+    public class CustomListView : ListView
+    {
+        public bool CanItemsBeMoved { get; set; }
+        public bool IsScrollable { get; set; }
+        public bool IsMovingItem { get; private set; }
+
+        protected CustomListView(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+        {
+            Initialize();
+        }
+
+        public CustomListView(Context context) : base(context)
+        {
+            Initialize();
+        }
+
+        public CustomListView(Context context, IAttributeSet attrs) : base(context, attrs)
+        {
+            Initialize();
+        }
+
+        public CustomListView(Context context, IAttributeSet attrs, int defStyle) : base(context, attrs, defStyle)
+        {
+            Initialize();
+        }
+
+        private void Initialize()
+        {
+            IsScrollable = true;
+            CanItemsBeMoved = true;
+            IsMovingItem = false;
+        }
+
+        public override bool DispatchTouchEvent(MotionEvent e)
+        {
+            //Console.WriteLine("CustomListView - DispatchTouchEvent - action: {0} buttonState: {1} downTime: {2} eventTime: {3} x,y: ({4},{5}) width: {6} density: {7} canItemsBeMoved: {8} isMovingItem: {9} isScrollable: {10}", e.Action, e.ButtonState, e.DownTime, e.EventTime, e.GetX(), e.GetY(), Width, Resources.DisplayMetrics.Density, CanItemsBeMoved, IsMovingItem, IsScrollable);
+            Console.WriteLine("CustomListView - DispatchTouchEvent - action: {0} x,y: ({1},{2})", e.Action, e.GetX(), e.GetY());
+
+            float density = Resources.DisplayMetrics.Density;
+            float x = e.GetX();
+            float y = e.GetY();
+
+            if (CanItemsBeMoved && !IsMovingItem && x >= Width - 48 * density)
+            {
+                // The user is trying to move an item using the right hand 'button'.
+                Console.WriteLine("CustomListView - DispatchTouchEvent - Starting to move item...");
+                View viewItemMove = GetChildAtPosition(x, y);
+                if (viewItemMove != null)
+                {
+                    IsMovingItem = true;
+                    IsScrollable = false;
+                    int tag = -1;
+                    if (viewItemMove.Tag != null)
+                        tag = (int)viewItemMove.Tag;
+
+                    Console.WriteLine("CustomListView - DispatchTouchEvent - Found moving item! tag: {0}", tag);
+                }
+                else
+                {
+                    Console.WriteLine("CustomListView - DispatchTouchEvent - Did NOT find moving item :-(");
+                }                
+            }
+
+            // Keep cancel on top because the flag can contain both move and cancel.
+            // if (e.Action.HasFlag(MotionEventActions.Cancel)) // This was cancel when using OnTouchListener on a child view
+            if(e.Action.HasFlag(MotionEventActions.Up))
+            {
+                //Console.WriteLine("CustomListView - DispatchTouchEvent - Up - (x,y): ({0},{1})", x, y);
+                Console.WriteLine("CustomListView - DispatchTouchEvent - CANCELLING MOVE...");
+                IsMovingItem = false;
+                IsScrollable = true;
+            }
+            else if (e.Action.HasFlag(MotionEventActions.Move))
+            {
+                // Block scroll
+                if(!IsScrollable)
+                    return true;
+            }
+
+            // Try to find the item over the finger
+            View view = GetChildAtPosition(x, y);
+            if (view != null)
+            {
+                int tag = -1;
+                if (view.Tag != null)
+                    tag = (int)view.Tag;
+
+                Console.WriteLine("CustomListView - DispatchTouchEvent - Found finger over view! tag: {0}", tag);
+            }
+            else
+            {
+                Console.WriteLine("CustomListView - DispatchTouchEvent - Did NOT find finger over view :-(");
+            }
+
+            return base.DispatchTouchEvent(e);
+        }
+
+        private View GetChildAtPosition(float x, float y)
+        {
+            View returnView = null;
+            int lastIndex = LastVisiblePosition - FirstVisiblePosition;
+            for (int a = 0; a < lastIndex; a++)
+            {
+                View view = GetChildAt(a);
+                if (view != null)
+                {
+                    Rect rect = new Rect();
+                    view.GetHitRect(rect);
+                    bool isOverItem = y >= rect.Top && y <= rect.Bottom;
+                    //Console.WriteLine("CustomListView - GetChildAtPosition - Finding rects - position: {0} hitRect(x,y): ({1},{2})", a, rect.Left, rect.Top);
+                    if (isOverItem)
+                    {
+                        Console.WriteLine("CustomListView - GetChildAtPosition - FOUND CHILD - position: {0} hitRect(x,y): ({1},{2})", a, rect.Left, rect.Top);
+                        returnView = view;
+                        break;
+                    }
+                }
+            }
+
+            return returnView;
+        }
+    }
+}
\ No newline at end of file
diff --git a/MPfm/MPfm.Android/Classes/Navigation/AndroidNavigationManager.cs b/MPfm/MPfm.Android/Classes/Navigation/AndroidNavigationManager.cs
index f9289d74..625c6a46 100644
--- a/MPfm/MPfm.Android/Classes/Navigation/AndroidNavigationManager.cs
+++ b/MPfm/MPfm.Android/Classes/Navigation/AndroidNavigationManager.cs
@@ -244,9 +244,15 @@ protected override void CreateMarkerDetailsViewInternal(IBaseView sourceView, Ac
             StartActivity(activity, typeof(MarkerDetailsActivity));
         }
 
+        protected override void CreatePlaylistViewInternal(IBaseView sourceView, Action<IBaseView> onViewReady)
+        {
+            _onPlaylistViewReady = onViewReady;
+            var activity = GetActivityFromView(sourceView);
+            StartActivity(activity, typeof(PlaylistActivity));
+        }
+
         protected override void CreateSyncViewInternal(Action<IBaseView> onViewReady)
         {
-            // TODO: Add source view
             _onSyncViewReady = onViewReady;
             var intent = new Intent(MainActivity, typeof(SyncActivity));
             MainActivity.StartActivity(intent);
@@ -273,13 +279,6 @@ protected override void CreateSyncDownloadViewInternal(Action<IBaseView> onViewR
             MainActivity.StartActivity(intent);
         }
 
-        protected override void CreatePlaylistViewInternal(Action<IBaseView> onViewReady)
-        {
-            _onPlaylistViewReady = onViewReady;
-            var intent = new Intent(MainActivity, typeof(PlaylistActivity));
-            MainActivity.StartActivity(intent);
-        }
-
         public void SetAboutActivityInstance(AboutActivity activity)
         {
             if (_onAboutViewReady != null)
diff --git a/MPfm/MPfm.Android/Classes/Services/NotificationService.cs b/MPfm/MPfm.Android/Classes/Services/NotificationService.cs
index 8a3312e4..e7df5f34 100644
--- a/MPfm/MPfm.Android/Classes/Services/NotificationService.cs
+++ b/MPfm/MPfm.Android/Classes/Services/NotificationService.cs
@@ -92,7 +92,6 @@ public override StartCommandResult OnStartCommand(Intent intent, StartCommandFla
                 var notificationManager = (NotificationManager)ApplicationContext.GetSystemService(NotificationService);
                 notificationManager.Cancel(1);   
                 StopSelf();
-
             }
 
             return StartCommandResult.NotSticky;
@@ -149,27 +148,22 @@ private Notification CreateNotificationView()
                 .SetSmallIcon(Resource.Drawable.Icon)
                 .Build();
 
-            // Use the big notification style for Android 4.1+; use the standard notification style for Android 4.0.3
+            // Use the big notification style for Android 4.1+;
             //#if __ANDROID_16__
             if (((int) global::Android.OS.Build.VERSION.SdkInt) >= 16)
             {
-                Console.WriteLine("NotificationService - Android 4.1+ detected; using Big View style for notification");
+                Console.WriteLine("NotificationService - Android 4.1+ detected; adding Big View style for notification");
                 RemoteViews viewBigNotificationPlayer = new RemoteViews(ApplicationContext.PackageName, Resource.Layout.BigNotificationPlayer);
-                viewBigNotificationPlayer.SetTextViewText(Resource.Id.bigNotificationPlayer_lblArtistName, "Hello World!");
                 notification.BigContentView = viewBigNotificationPlayer;
             }
-            //#else
-            else 
-            {
-                Console.WriteLine("NotificationService - Android 4.0.3+ (<4.1) detected; using standard style for notification");
-                RemoteViews viewNotificationPlayer = new RemoteViews(ApplicationContext.PackageName, Resource.Layout.NotificationPlayer);
-                viewNotificationPlayer.SetTextViewText(Resource.Id.notificationPlayer_lblTitle, "Hello World!");
-                notification.ContentView = viewNotificationPlayer;
-            }
-            //#endif        
+
+            Console.WriteLine("NotificationService - Android 4.0.3+ detected; adding standard style for notification");
+            RemoteViews viewNotificationPlayer = new RemoteViews(ApplicationContext.PackageName, Resource.Layout.NotificationPlayer);
+            notification.ContentView = viewNotificationPlayer;
 
             _notification = notification;
 
+            // Create intents for buttons
             Intent intentPlayPause = new Intent(this, typeof(NotificationService));
             intentPlayPause.SetAction(SessionsWidgetActions.SessionsWidgetPlayPause.ToString());
             PendingIntent pendingIntentPlayPause = PendingIntent.GetService(this, 0, intentPlayPause, PendingIntentFlags.UpdateCurrent);
diff --git a/MPfm/MPfm.Android/MPfm.Android.csproj b/MPfm/MPfm.Android/MPfm.Android.csproj
index 8407cefb..f0d7f994 100644
--- a/MPfm/MPfm.Android/MPfm.Android.csproj
+++ b/MPfm/MPfm.Android/MPfm.Android.csproj
@@ -88,6 +88,7 @@
     <Compile Include="Classes\Cache\BitmapWorkerTask.cs" />
     <Compile Include="Classes\Cache\AsyncBitmapDrawable.cs" />
     <Compile Include="Classes\Clients\MyWebViewClient.cs" />
+    <Compile Include="Classes\Controls\CustomListView.cs" />
     <Compile Include="Classes\Controls\SquareImageView.cs" />
     <Compile Include="Classes\Controls\EqualizerPresetGraphView.cs" />
     <Compile Include="Classes\Controls\OutputMeterView.cs" />
@@ -499,6 +500,10 @@
     <AndroidResource Include="Resources\Anim\flipper_changetab_in.xml">
       <SubType>Designer</SubType>
     </AndroidResource>
+    <AndroidResource Include="Resources\drawable-hdpi\icon_move.png" />
+    <AndroidResource Include="Resources\drawable-mdpi\icon_move.png" />
+    <AndroidResource Include="Resources\drawable-xhdpi\icon_move.png" />
+    <AndroidResource Include="Resources\drawable-xxhdpi\icon_move.png" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Lib\armeabi\" />
diff --git a/MPfm/MPfm.Android/Resources/Layout/BigNotificationPlayer.axml b/MPfm/MPfm.Android/Resources/Layout/BigNotificationPlayer.axml
index e6c36eb6..0f5d3ade 100644
--- a/MPfm/MPfm.Android/Resources/Layout/BigNotificationPlayer.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/BigNotificationPlayer.axml
@@ -2,7 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/bigNotificationPlayer"
   android:layout_width="fill_parent"
-  android:layout_height="fill_parent"
+  android:layout_height="100dp"
   android:background="@color/background">
   <ImageButton
     android:id="@+id/bigNotificationPlayer_btnClose"
diff --git a/MPfm/MPfm.Android/Resources/Layout/Playlist.axml b/MPfm/MPfm.Android/Resources/Layout/Playlist.axml
index 096bac59..5cd22ed6 100644
--- a/MPfm/MPfm.Android/Resources/Layout/Playlist.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/Playlist.axml
@@ -4,7 +4,7 @@
   android:layout_height="fill_parent"
   android:background="@color/background"
   android:orientation="vertical">
-  <ListView
+  <org.sessionsapp.android.CustomListView
     android:id="@+id/playlist_listView"
     android:layout_width="fill_parent"
     android:layout_height="0dp"
diff --git a/MPfm/MPfm.Android/Resources/Layout/PlaylistCell.axml b/MPfm/MPfm.Android/Resources/Layout/PlaylistCell.axml
index dcb101a5..447e7ae2 100644
--- a/MPfm/MPfm.Android/Resources/Layout/PlaylistCell.axml
+++ b/MPfm/MPfm.Android/Resources/Layout/PlaylistCell.axml
@@ -62,4 +62,10 @@
     android:visibility="gone"
     android:background="@android:color/transparent"
     android:src="@drawable/icon_speaker" />
+  <ImageView
+    android:id="@+id/playlistCell_imageMove"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:background="@android:color/transparent"
+    android:src="@drawable/icon_move" />
 </LinearLayout>
\ No newline at end of file
diff --git a/MPfm/MPfm.Android/Resources/Resource.Designer.cs b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
index 9d120b8a..371ce2c2 100644
--- a/MPfm/MPfm.Android/Resources/Resource.Designer.cs
+++ b/MPfm/MPfm.Android/Resources/Resource.Designer.cs
@@ -244,85 +244,88 @@ public partial class Drawable
 			public const int icon_linux = 2130837525;
 			
 			// aapt resource value: 0x7f020016
-			public const int icon_osx = 2130837526;
+			public const int icon_move = 2130837526;
 			
 			// aapt resource value: 0x7f020017
-			public const int icon_phone = 2130837527;
+			public const int icon_osx = 2130837527;
 			
 			// aapt resource value: 0x7f020018
-			public const int icon_play = 2130837528;
+			public const int icon_phone = 2130837528;
 			
 			// aapt resource value: 0x7f020019
-			public const int icon_speaker = 2130837529;
+			public const int icon_play = 2130837529;
 			
 			// aapt resource value: 0x7f02001a
-			public const int icon_tablet = 2130837530;
+			public const int icon_speaker = 2130837530;
 			
 			// aapt resource value: 0x7f02001b
-			public const int icon_transparent = 2130837531;
+			public const int icon_tablet = 2130837531;
 			
 			// aapt resource value: 0x7f02001c
-			public const int icon_trash = 2130837532;
+			public const int icon_transparent = 2130837532;
 			
 			// aapt resource value: 0x7f02001d
-			public const int icon_vinyl = 2130837533;
+			public const int icon_trash = 2130837533;
 			
 			// aapt resource value: 0x7f02001e
-			public const int icon_windows = 2130837534;
+			public const int icon_vinyl = 2130837534;
 			
 			// aapt resource value: 0x7f02001f
-			public const int list_selector = 2130837535;
+			public const int icon_windows = 2130837535;
 			
 			// aapt resource value: 0x7f020020
-			public const int player_close = 2130837536;
+			public const int list_selector = 2130837536;
 			
 			// aapt resource value: 0x7f020021
-			public const int player_close_on = 2130837537;
+			public const int player_close = 2130837537;
 			
 			// aapt resource value: 0x7f020022
-			public const int player_next = 2130837538;
+			public const int player_close_on = 2130837538;
 			
 			// aapt resource value: 0x7f020023
-			public const int player_next_on = 2130837539;
+			public const int player_next = 2130837539;
 			
 			// aapt resource value: 0x7f020024
-			public const int player_pause = 2130837540;
+			public const int player_next_on = 2130837540;
 			
 			// aapt resource value: 0x7f020025
-			public const int player_pause_on = 2130837541;
+			public const int player_pause = 2130837541;
 			
 			// aapt resource value: 0x7f020026
-			public const int player_play = 2130837542;
+			public const int player_pause_on = 2130837542;
 			
 			// aapt resource value: 0x7f020027
-			public const int player_play_on = 2130837543;
+			public const int player_play = 2130837543;
 			
 			// aapt resource value: 0x7f020028
-			public const int player_playlist = 2130837544;
+			public const int player_play_on = 2130837544;
 			
 			// aapt resource value: 0x7f020029
-			public const int player_playlist_on = 2130837545;
+			public const int player_playlist = 2130837545;
 			
 			// aapt resource value: 0x7f02002a
-			public const int player_previous = 2130837546;
+			public const int player_playlist_on = 2130837546;
 			
 			// aapt resource value: 0x7f02002b
-			public const int player_previous_on = 2130837547;
+			public const int player_previous = 2130837547;
 			
 			// aapt resource value: 0x7f02002c
-			public const int player_repeat = 2130837548;
+			public const int player_previous_on = 2130837548;
 			
 			// aapt resource value: 0x7f02002d
-			public const int player_repeat_on = 2130837549;
+			public const int player_repeat = 2130837549;
 			
 			// aapt resource value: 0x7f02002e
-			public const int player_shuffle = 2130837550;
+			public const int player_repeat_on = 2130837550;
 			
 			// aapt resource value: 0x7f02002f
-			public const int player_shuffle_on = 2130837551;
+			public const int player_shuffle = 2130837551;
 			
 			// aapt resource value: 0x7f020030
-			public const int Splash = 2130837552;
+			public const int player_shuffle_on = 2130837552;
+			
+			// aapt resource value: 0x7f020031
+			public const int Splash = 2130837553;
 			
 			static Drawable()
 			{
@@ -394,8 +397,8 @@ public partial class Id
 			// aapt resource value: 0x7f0c0013
 			public const int equalizerPresetCell_lblName = 2131492883;
 			
-			// aapt resource value: 0x7f0c00ee
-			public const int equalizerPresetDetailsMenu_item_save = 2131493102;
+			// aapt resource value: 0x7f0c00ef
+			public const int equalizerPresetDetailsMenu_item_save = 2131493103;
 			
 			// aapt resource value: 0x7f0c001c
 			public const int equalizerPresetDetails_btnDelete = 2131492892;
@@ -430,8 +433,8 @@ public partial class Id
 			// aapt resource value: 0x7f0c001e
 			public const int equalizerPresetFaderCell_seekBar = 2131492894;
 			
-			// aapt resource value: 0x7f0c00ef
-			public const int equalizerPresetsMenu_item_add = 2131493103;
+			// aapt resource value: 0x7f0c00f0
+			public const int equalizerPresetsMenu_item_add = 2131493104;
 			
 			// aapt resource value: 0x7f0c0026
 			public const int equalizerPresets_btnBypass = 2131492902;
@@ -469,23 +472,23 @@ public partial class Id
 			// aapt resource value: 0x7f0c0028
 			public const int fragment_generalSettings_mainLayout = 2131492904;
 			
+			// aapt resource value: 0x7f0c00e4
+			public const int fragment_updateLibrary_button = 2131493092;
+			
 			// aapt resource value: 0x7f0c00e3
-			public const int fragment_updateLibrary_button = 2131493091;
+			public const int fragment_updateLibrary_lblSubtitle = 2131493091;
 			
 			// aapt resource value: 0x7f0c00e2
-			public const int fragment_updateLibrary_lblSubtitle = 2131493090;
+			public const int fragment_updateLibrary_lblTitle = 2131493090;
 			
-			// aapt resource value: 0x7f0c00e1
-			public const int fragment_updateLibrary_lblTitle = 2131493089;
+			// aapt resource value: 0x7f0c00df
+			public const int fragment_updateLibrary_mainLayout = 2131493087;
 			
-			// aapt resource value: 0x7f0c00de
-			public const int fragment_updateLibrary_mainLayout = 2131493086;
+			// aapt resource value: 0x7f0c00e1
+			public const int fragment_updateLibrary_progressBar = 2131493089;
 			
 			// aapt resource value: 0x7f0c00e0
-			public const int fragment_updateLibrary_progressBar = 2131493088;
-			
-			// aapt resource value: 0x7f0c00df
-			public const int fragment_updateLibrary_relativeLayout = 2131493087;
+			public const int fragment_updateLibrary_relativeLayout = 2131493088;
 			
 			// aapt resource value: 0x7f0c002a
 			public const int genericcell_image = 2131492906;
@@ -760,8 +763,8 @@ public partial class Id
 			// aapt resource value: 0x7f0c0081
 			public const int pitchShifting_seekBar = 2131492993;
 			
-			// aapt resource value: 0x7f0c00f0
-			public const int playerMenu_item_effects = 2131493104;
+			// aapt resource value: 0x7f0c00f1
+			public const int playerMenu_item_effects = 2131493105;
 			
 			// aapt resource value: 0x7f0c0096
 			public const int playerMetadata_lblAlbumTitle = 2131493014;
@@ -823,6 +826,9 @@ public partial class Id
 			// aapt resource value: 0x7f0c009f
 			public const int playlistCell_imageDelete = 2131493023;
 			
+			// aapt resource value: 0x7f0c00a1
+			public const int playlistCell_imageMove = 2131493025;
+			
 			// aapt resource value: 0x7f0c00a0
 			public const int playlistCell_imageNowPlaying = 2131493024;
 			
@@ -847,221 +853,221 @@ public partial class Id
 			// aapt resource value: 0x7f0c0098
 			public const int playlist_listView = 2131493016;
 			
-			// aapt resource value: 0x7f0c00a1
-			public const int preferences_mainLayout = 2131493025;
-			
 			// aapt resource value: 0x7f0c00a2
-			public const int preferences_pager = 2131493026;
+			public const int preferences_mainLayout = 2131493026;
 			
 			// aapt resource value: 0x7f0c00a3
-			public const int preferences_pager_title_strip = 2131493027;
+			public const int preferences_pager = 2131493027;
 			
 			// aapt resource value: 0x7f0c00a4
-			public const int splash_layout = 2131493028;
+			public const int preferences_pager_title_strip = 2131493028;
 			
 			// aapt resource value: 0x7f0c00a5
-			public const int splash_text = 2131493029;
+			public const int splash_layout = 2131493029;
+			
+			// aapt resource value: 0x7f0c00a6
+			public const int splash_text = 2131493030;
+			
+			// aapt resource value: 0x7f0c00b2
+			public const int syncDownload_lblCompleted = 2131493042;
 			
 			// aapt resource value: 0x7f0c00b1
-			public const int syncDownload_lblCompleted = 2131493041;
+			public const int syncDownload_lblCompletedValue = 2131493041;
 			
-			// aapt resource value: 0x7f0c00b0
-			public const int syncDownload_lblCompletedValue = 2131493040;
+			// aapt resource value: 0x7f0c00b8
+			public const int syncDownload_lblCurrentFileProgress = 2131493048;
 			
 			// aapt resource value: 0x7f0c00b7
-			public const int syncDownload_lblCurrentFileProgress = 2131493047;
+			public const int syncDownload_lblCurrentFileProgressValue = 2131493047;
 			
-			// aapt resource value: 0x7f0c00b6
-			public const int syncDownload_lblCurrentFileProgressValue = 2131493046;
+			// aapt resource value: 0x7f0c00ba
+			public const int syncDownload_lblDownloadSpeed = 2131493050;
 			
 			// aapt resource value: 0x7f0c00b9
-			public const int syncDownload_lblDownloadSpeed = 2131493049;
+			public const int syncDownload_lblDownloadSpeedValue = 2131493049;
 			
-			// aapt resource value: 0x7f0c00b8
-			public const int syncDownload_lblDownloadSpeedValue = 2131493048;
+			// aapt resource value: 0x7f0c00bc
+			public const int syncDownload_lblErrors = 2131493052;
 			
 			// aapt resource value: 0x7f0c00bb
-			public const int syncDownload_lblErrors = 2131493051;
+			public const int syncDownload_lblErrorsValue = 2131493051;
 			
-			// aapt resource value: 0x7f0c00ba
-			public const int syncDownload_lblErrorsValue = 2131493050;
+			// aapt resource value: 0x7f0c00b0
+			public const int syncDownload_lblFileName = 2131493040;
 			
-			// aapt resource value: 0x7f0c00af
-			public const int syncDownload_lblFileName = 2131493039;
+			// aapt resource value: 0x7f0c00b4
+			public const int syncDownload_lblFilesDownloaded = 2131493044;
 			
 			// aapt resource value: 0x7f0c00b3
-			public const int syncDownload_lblFilesDownloaded = 2131493043;
+			public const int syncDownload_lblFilesDownloadedValue = 2131493043;
 			
-			// aapt resource value: 0x7f0c00b2
-			public const int syncDownload_lblFilesDownloadedValue = 2131493042;
+			// aapt resource value: 0x7f0c00af
+			public const int syncDownload_lblTitle = 2131493039;
 			
-			// aapt resource value: 0x7f0c00ae
-			public const int syncDownload_lblTitle = 2131493038;
+			// aapt resource value: 0x7f0c00b6
+			public const int syncDownload_lblTotalFiles = 2131493046;
 			
 			// aapt resource value: 0x7f0c00b5
-			public const int syncDownload_lblTotalFiles = 2131493045;
-			
-			// aapt resource value: 0x7f0c00b4
-			public const int syncDownload_lblTotalFilesValue = 2131493044;
-			
-			// aapt resource value: 0x7f0c00ac
-			public const int syncDownload_mainLayout = 2131493036;
+			public const int syncDownload_lblTotalFilesValue = 2131493045;
 			
 			// aapt resource value: 0x7f0c00ad
-			public const int syncDownload_progressBar = 2131493037;
+			public const int syncDownload_mainLayout = 2131493037;
 			
-			// aapt resource value: 0x7f0c00bc
-			public const int syncManualConnect_lblIPAddress = 2131493052;
-			
-			// aapt resource value: 0x7f0c00be
-			public const int syncManualConnect_lblPort = 2131493054;
+			// aapt resource value: 0x7f0c00ae
+			public const int syncDownload_progressBar = 2131493038;
 			
 			// aapt resource value: 0x7f0c00bd
-			public const int syncManualConnect_txtIPAddress = 2131493053;
+			public const int syncManualConnect_lblIPAddress = 2131493053;
 			
 			// aapt resource value: 0x7f0c00bf
-			public const int syncManualConnect_txtPort = 2131493055;
+			public const int syncManualConnect_lblPort = 2131493055;
 			
-			// aapt resource value: 0x7f0c00cb
-			public const int syncMenuCell_checkmark = 2131493067;
+			// aapt resource value: 0x7f0c00be
+			public const int syncManualConnect_txtIPAddress = 2131493054;
 			
-			// aapt resource value: 0x7f0c00c8
-			public const int syncMenuCell_image = 2131493064;
+			// aapt resource value: 0x7f0c00c0
+			public const int syncManualConnect_txtPort = 2131493056;
+			
+			// aapt resource value: 0x7f0c00cc
+			public const int syncMenuCell_checkmark = 2131493068;
 			
 			// aapt resource value: 0x7f0c00c9
-			public const int syncMenuCell_index = 2131493065;
+			public const int syncMenuCell_image = 2131493065;
 			
 			// aapt resource value: 0x7f0c00ca
-			public const int syncMenuCell_title = 2131493066;
+			public const int syncMenuCell_index = 2131493066;
 			
-			// aapt resource value: 0x7f0c00f1
-			public const int syncMenuMenu_item_sync = 2131493105;
+			// aapt resource value: 0x7f0c00cb
+			public const int syncMenuCell_title = 2131493067;
+			
+			// aapt resource value: 0x7f0c00f2
+			public const int syncMenuMenu_item_sync = 2131493106;
+			
+			// aapt resource value: 0x7f0c00c8
+			public const int syncMenu_btnSelectAll = 2131493064;
 			
 			// aapt resource value: 0x7f0c00c7
-			public const int syncMenu_btnSelectAll = 2131493063;
+			public const int syncMenu_lblFreeSpace = 2131493063;
 			
-			// aapt resource value: 0x7f0c00c6
-			public const int syncMenu_lblFreeSpace = 2131493062;
+			// aapt resource value: 0x7f0c00c3
+			public const int syncMenu_lblStatus = 2131493059;
 			
-			// aapt resource value: 0x7f0c00c2
-			public const int syncMenu_lblStatus = 2131493058;
+			// aapt resource value: 0x7f0c00c6
+			public const int syncMenu_lblTotal = 2131493062;
 			
 			// aapt resource value: 0x7f0c00c5
-			public const int syncMenu_lblTotal = 2131493061;
+			public const int syncMenu_listView = 2131493061;
+			
+			// aapt resource value: 0x7f0c00c1
+			public const int syncMenu_loadingLayout = 2131493057;
 			
 			// aapt resource value: 0x7f0c00c4
-			public const int syncMenu_listView = 2131493060;
+			public const int syncMenu_mainLayout = 2131493060;
 			
-			// aapt resource value: 0x7f0c00c0
-			public const int syncMenu_loadingLayout = 2131493056;
+			// aapt resource value: 0x7f0c00c2
+			public const int syncMenu_progressBar = 2131493058;
 			
-			// aapt resource value: 0x7f0c00c3
-			public const int syncMenu_mainLayout = 2131493059;
+			// aapt resource value: 0x7f0c00d2
+			public const int syncWebBrowser_lblCode = 2131493074;
 			
-			// aapt resource value: 0x7f0c00c1
-			public const int syncMenu_progressBar = 2131493057;
+			// aapt resource value: 0x7f0c00ce
+			public const int syncWebBrowser_lblStep1 = 2131493070;
+			
+			// aapt resource value: 0x7f0c00cf
+			public const int syncWebBrowser_lblStep1Details = 2131493071;
 			
 			// aapt resource value: 0x7f0c00d1
-			public const int syncWebBrowser_lblCode = 2131493073;
+			public const int syncWebBrowser_lblStep2 = 2131493073;
 			
-			// aapt resource value: 0x7f0c00cd
-			public const int syncWebBrowser_lblStep1 = 2131493069;
+			// aapt resource value: 0x7f0c00d0
+			public const int syncWebBrowser_lblUrl = 2131493072;
 			
-			// aapt resource value: 0x7f0c00ce
-			public const int syncWebBrowser_lblStep1Details = 2131493070;
+			// aapt resource value: 0x7f0c00cd
+			public const int syncWebBrowser_mainLayout = 2131493069;
 			
-			// aapt resource value: 0x7f0c00d0
-			public const int syncWebBrowser_lblStep2 = 2131493072;
+			// aapt resource value: 0x7f0c00ac
+			public const int sync_btnConnectManually = 2131493036;
 			
-			// aapt resource value: 0x7f0c00cf
-			public const int syncWebBrowser_lblUrl = 2131493071;
+			// aapt resource value: 0x7f0c00a8
+			public const int sync_lblIPAddress = 2131493032;
 			
-			// aapt resource value: 0x7f0c00cc
-			public const int syncWebBrowser_mainLayout = 2131493068;
+			// aapt resource value: 0x7f0c00aa
+			public const int sync_lblStatus = 2131493034;
 			
 			// aapt resource value: 0x7f0c00ab
-			public const int sync_btnConnectManually = 2131493035;
+			public const int sync_listView = 2131493035;
 			
 			// aapt resource value: 0x7f0c00a7
-			public const int sync_lblIPAddress = 2131493031;
+			public const int sync_mainLayout = 2131493031;
 			
 			// aapt resource value: 0x7f0c00a9
-			public const int sync_lblStatus = 2131493033;
+			public const int sync_progressBar = 2131493033;
 			
-			// aapt resource value: 0x7f0c00aa
-			public const int sync_listView = 2131493034;
+			// aapt resource value: 0x7f0c00dc
+			public const int timeShifting_btnDecrement = 2131493084;
 			
-			// aapt resource value: 0x7f0c00a6
-			public const int sync_mainLayout = 2131493030;
+			// aapt resource value: 0x7f0c00d6
+			public const int timeShifting_btnDetectTempo = 2131493078;
 			
-			// aapt resource value: 0x7f0c00a8
-			public const int sync_progressBar = 2131493032;
+			// aapt resource value: 0x7f0c00dd
+			public const int timeShifting_btnIncrement = 2131493085;
 			
-			// aapt resource value: 0x7f0c00db
-			public const int timeShifting_btnDecrement = 2131493083;
+			// aapt resource value: 0x7f0c00de
+			public const int timeShifting_btnReset = 2131493086;
 			
-			// aapt resource value: 0x7f0c00d5
-			public const int timeShifting_btnDetectTempo = 2131493077;
+			// aapt resource value: 0x7f0c00d7
+			public const int timeShifting_lblCurrentTempo = 2131493079;
 			
-			// aapt resource value: 0x7f0c00dc
-			public const int timeShifting_btnIncrement = 2131493084;
+			// aapt resource value: 0x7f0c00d9
+			public const int timeShifting_lblCurrentTempoValue = 2131493081;
 			
-			// aapt resource value: 0x7f0c00dd
-			public const int timeShifting_btnReset = 2131493085;
+			// aapt resource value: 0x7f0c00d4
+			public const int timeShifting_lblDetectedTempo = 2131493076;
 			
-			// aapt resource value: 0x7f0c00d6
-			public const int timeShifting_lblCurrentTempo = 2131493078;
+			// aapt resource value: 0x7f0c00d5
+			public const int timeShifting_lblDetectedTempoValue = 2131493077;
 			
 			// aapt resource value: 0x7f0c00d8
-			public const int timeShifting_lblCurrentTempoValue = 2131493080;
-			
-			// aapt resource value: 0x7f0c00d3
-			public const int timeShifting_lblDetectedTempo = 2131493075;
+			public const int timeShifting_lblReferenceTempo = 2131493080;
 			
-			// aapt resource value: 0x7f0c00d4
-			public const int timeShifting_lblDetectedTempoValue = 2131493076;
+			// aapt resource value: 0x7f0c00da
+			public const int timeShifting_lblReferenceTempoValue = 2131493082;
 			
-			// aapt resource value: 0x7f0c00d7
-			public const int timeShifting_lblReferenceTempo = 2131493079;
+			// aapt resource value: 0x7f0c00d3
+			public const int timeShifting_lblTitle = 2131493075;
 			
-			// aapt resource value: 0x7f0c00d9
-			public const int timeShifting_lblReferenceTempoValue = 2131493081;
+			// aapt resource value: 0x7f0c00db
+			public const int timeShifting_seekBar = 2131493083;
 			
-			// aapt resource value: 0x7f0c00d2
-			public const int timeShifting_lblTitle = 2131493074;
+			// aapt resource value: 0x7f0c00e5
+			public const int widgetPlayer = 2131493093;
 			
-			// aapt resource value: 0x7f0c00da
-			public const int timeShifting_seekBar = 2131493082;
+			// aapt resource value: 0x7f0c00ed
+			public const int widgetPlayerLoading = 2131493101;
 			
-			// aapt resource value: 0x7f0c00e4
-			public const int widgetPlayer = 2131493092;
+			// aapt resource value: 0x7f0c00ee
+			public const int widgetPlayerLoading_lblMessage = 2131493102;
 			
 			// aapt resource value: 0x7f0c00ec
-			public const int widgetPlayerLoading = 2131493100;
-			
-			// aapt resource value: 0x7f0c00ed
-			public const int widgetPlayerLoading_lblMessage = 2131493101;
+			public const int widgetPlayer_btnNext = 2131493100;
 			
 			// aapt resource value: 0x7f0c00eb
-			public const int widgetPlayer_btnNext = 2131493099;
+			public const int widgetPlayer_btnPlayPause = 2131493099;
 			
 			// aapt resource value: 0x7f0c00ea
-			public const int widgetPlayer_btnPlayPause = 2131493098;
+			public const int widgetPlayer_btnPrevious = 2131493098;
 			
-			// aapt resource value: 0x7f0c00e9
-			public const int widgetPlayer_btnPrevious = 2131493097;
+			// aapt resource value: 0x7f0c00e6
+			public const int widgetPlayer_imageAlbum = 2131493094;
 			
-			// aapt resource value: 0x7f0c00e5
-			public const int widgetPlayer_imageAlbum = 2131493093;
+			// aapt resource value: 0x7f0c00e8
+			public const int widgetPlayer_lblAlbumTitle = 2131493096;
 			
 			// aapt resource value: 0x7f0c00e7
-			public const int widgetPlayer_lblAlbumTitle = 2131493095;
+			public const int widgetPlayer_lblArtistName = 2131493095;
 			
-			// aapt resource value: 0x7f0c00e6
-			public const int widgetPlayer_lblArtistName = 2131493094;
-			
-			// aapt resource value: 0x7f0c00e8
-			public const int widgetPlayer_lblSongTitle = 2131493096;
+			// aapt resource value: 0x7f0c00e9
+			public const int widgetPlayer_lblSongTitle = 2131493097;
 			
 			static Id()
 			{
diff --git a/MPfm/MPfm.Android/Resources/drawable-hdpi/icon_move.png b/MPfm/MPfm.Android/Resources/drawable-hdpi/icon_move.png
new file mode 100644
index 00000000..2c8fcb01
Binary files /dev/null and b/MPfm/MPfm.Android/Resources/drawable-hdpi/icon_move.png differ
diff --git a/MPfm/MPfm.Android/Resources/drawable-mdpi/icon_move.png b/MPfm/MPfm.Android/Resources/drawable-mdpi/icon_move.png
new file mode 100644
index 00000000..289efb14
Binary files /dev/null and b/MPfm/MPfm.Android/Resources/drawable-mdpi/icon_move.png differ
diff --git a/MPfm/MPfm.Android/Resources/drawable-xhdpi/icon_move.png b/MPfm/MPfm.Android/Resources/drawable-xhdpi/icon_move.png
new file mode 100644
index 00000000..ae300115
Binary files /dev/null and b/MPfm/MPfm.Android/Resources/drawable-xhdpi/icon_move.png differ
diff --git a/MPfm/MPfm.Android/Resources/drawable-xxhdpi/icon_move.png b/MPfm/MPfm.Android/Resources/drawable-xxhdpi/icon_move.png
new file mode 100644
index 00000000..df643339
Binary files /dev/null and b/MPfm/MPfm.Android/Resources/drawable-xxhdpi/icon_move.png differ
diff --git a/MPfm/MPfm.Android/Resources/drawable/button_selector.xml b/MPfm/MPfm.Android/Resources/drawable/button_selector.xml
index 95303768..098c6f35 100644
--- a/MPfm/MPfm.Android/Resources/drawable/button_selector.xml
+++ b/MPfm/MPfm.Android/Resources/drawable/button_selector.xml
@@ -3,16 +3,30 @@
   <!-- disabled -->
   <item
     android:state_enabled="false"
-    android:state_focused="true"
-    android:drawable="@color/button_background" />
+    android:state_focused="true">
+    <shape>
+      <solid android:color="@color/button_background" />
+      <corners android:radius="4dp" />
+    </shape>
+  </item>
   <!-- pressed -->
-  <item
-    android:state_pressed="true"
-    android:drawable="@color/button_selected" />
+  <item android:state_pressed="true">
+    <shape>
+      <solid android:color="@color/button_selected" />
+      <corners android:radius="4dp" />
+    </shape>  
+  </item>
   <!-- focused -->
-  <item
-    android:state_focused="true"
-    android:drawable="@color/button_selected" />
-  <item
-    android:drawable="@color/button_background" />
+  <item android:state_focused="true">
+    <shape>
+      <solid android:color="@color/button_selected" />
+      <corners android:radius="4dp" />
+    </shape>  
+  </item>
+  <item>
+    <shape>
+      <solid android:color="@color/button_background" />
+      <corners android:radius="4dp" />
+    </shape>
+  </item>
 </selector>
\ No newline at end of file
diff --git a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
index 7bfaa5b0..6ee98590 100644
--- a/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
+++ b/MPfm/MPfm.MVP/Navigation/MobileNavigationManager.cs
@@ -730,7 +730,7 @@ public virtual void CreateAboutView()
             CreateAboutViewInternal(onViewReady);
         }
 
-        protected virtual void CreatePlaylistViewInternal(Action<IBaseView> onViewReady)
+        protected virtual void CreatePlaylistViewInternal(IBaseView sourceView, Action<IBaseView> onViewReady)
         {
             if (_playlistView == null)
                 _playlistView = Bootstrapper.GetContainer().Resolve<IPlaylistView>(new NamedParameterOverloads() { { "onViewReady", onViewReady } });
@@ -741,7 +741,7 @@ protected virtual void CreatePlaylistViewInternal(Action<IBaseView> onViewReady)
 #endif
         }
 
-        public virtual void CreatePlaylistView()
+        public virtual void CreatePlaylistView(IBaseView sourceView)
         {
             Action<IBaseView> onViewReady = (view) => 
             {
@@ -755,7 +755,7 @@ public virtual void CreatePlaylistView()
                 _playlistPresenter.BindView((IPlaylistView)view);
             };
             
-            CreatePlaylistViewInternal(onViewReady);
+            CreatePlaylistViewInternal(sourceView, onViewReady);
         }
     }
 
diff --git a/MPfm/MPfm.MVP/Presenters/PlayerMetadataPresenter.cs b/MPfm/MPfm.MVP/Presenters/PlayerMetadataPresenter.cs
index 36471bda..747149eb 100644
--- a/MPfm/MPfm.MVP/Presenters/PlayerMetadataPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/PlayerMetadataPresenter.cs
@@ -66,7 +66,7 @@ private void OnPlaylistIndexChanged(PlayerPlaylistIndexChangedMessage message)
 
         private void OpenPlaylist()
         {
-            _navigationManager.CreatePlaylistView();            
+            _navigationManager.CreatePlaylistView(View);
         }
 
         private void ToggleRepeat()
diff --git a/MPfm/MPfm.MVP/Presenters/PlayerPresenter.cs b/MPfm/MPfm.MVP/Presenters/PlayerPresenter.cs
index b8dea0c0..4930c460 100644
--- a/MPfm/MPfm.MVP/Presenters/PlayerPresenter.cs
+++ b/MPfm/MPfm.MVP/Presenters/PlayerPresenter.cs
@@ -163,7 +163,7 @@ private void OpenPlaylist()
         {
             // Only on mobile devices
             Console.WriteLine("PlayerPresenter - OpenPlaylist");
-            _mobileNavigationManager.CreatePlaylistView();
+            _mobileNavigationManager.CreatePlaylistView(View);
         }
 
 	    /// <summary>