diff --git a/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java b/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
index f375c6634..e2abd241c 100644
--- a/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
+++ b/app/src/main/java/app/fedilab/android/activities/PlaylistsActivity.java
@@ -15,44 +15,36 @@
 package app.fedilab.android.activities;
 
 import android.annotation.SuppressLint;
-import android.content.DialogInterface;
-import android.content.Intent;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.AlertDialog;
+import android.support.v7.app.ActionBar;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
-import android.text.InputFilter;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
+import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import app.fedilab.android.R;
-import app.fedilab.android.asynctasks.ManageListsAsyncTask;
 import app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask;
-import app.fedilab.android.asynctasks.RetrieveFeedsAsyncTask;
 import app.fedilab.android.client.APIResponse;
 import app.fedilab.android.client.Entities.Peertube;
 import app.fedilab.android.client.Entities.Playlist;
-import app.fedilab.android.client.Entities.Status;
 import app.fedilab.android.drawers.PeertubeAdapter;
-import app.fedilab.android.drawers.StatusListAdapter;
 import app.fedilab.android.helper.Helper;
-import app.fedilab.android.interfaces.OnListActionInterface;
 import app.fedilab.android.interfaces.OnPlaylistActionInterface;
 import es.dmoral.toasty.Toasty;
 
@@ -67,7 +59,6 @@ import static app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask.action.GET
 public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionInterface {
 
 
-    private String title, listId;
     private RelativeLayout mainLoader, nextElementLoader, textviewNoAction;
     private SwipeRefreshLayout swipeRefreshLayout;
     private boolean swiped;
@@ -98,6 +89,29 @@ public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionI
             default:
                 setTheme(R.style.AppThemeDark_NoActionBar);
         }
+        if( getSupportActionBar() != null)
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        ActionBar actionBar = getSupportActionBar();
+        if( actionBar != null ) {
+            LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+            assert inflater != null;
+            @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_bar, null);
+            actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+            ImageView toolbar_close = actionBar.getCustomView().findViewById(R.id.toolbar_close);
+            TextView toolbar_title = actionBar.getCustomView().findViewById(R.id.toolbar_title);
+            toolbar_close.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    finish();
+                }
+            });
+            toolbar_title.setText(R.string.upload_video);
+            if (theme == Helper.THEME_LIGHT){
+                Toolbar toolbar = actionBar.getCustomView().findViewById(R.id.toolbar);
+                Helper.colorizeToolbar(toolbar, R.color.black, PlaylistsActivity.this);
+            }
+        }
         setContentView(R.layout.activity_playlists);
         Toolbar toolbar = findViewById(R.id.toolbar);
         if( theme == Helper.THEME_BLACK)
@@ -139,7 +153,7 @@ public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionI
         if( getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
-        setTitle(title);
+        setTitle(playlist.getDisplayName());
 
 
         lv_playlist.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -200,11 +214,6 @@ public class PlaylistsActivity extends BaseActivity implements OnPlaylistActionI
     }
 
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.main_list, menu);
-        return true;
-    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
index bbc05c0f5..e4f94abce 100644
--- a/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
+++ b/app/src/main/java/app/fedilab/android/fragments/DisplayPlaylistsFragment.java
@@ -56,6 +56,7 @@ import java.util.Map;
 
 import app.fedilab.android.R;
 import app.fedilab.android.activities.MainActivity;
+import app.fedilab.android.activities.PeertubeUploadActivity;
 import app.fedilab.android.activities.PlaylistsActivity;
 import app.fedilab.android.asynctasks.ManagePlaylistsAsyncTask;
 import app.fedilab.android.asynctasks.RetrievePeertubeChannelsAsyncTask;
@@ -373,13 +374,11 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
 
         //Populate channels
         List<Account> accounts = apiResponse.getAccounts();
-        String[] channelName = new String[accounts.size()+1];
-        String[] channelId = new String[accounts.size()+1];
-        int i = 1;
-        channelName[0] = "";
-        channelId[0] = "";
-        for (Account account : accounts) {
-            channels.put(account.getUsername(), account.getId());
+        String[] channelName = new String[accounts.size()];
+        String[] channelId= new String[accounts.size()];
+        int i = 0;
+        for(Account account: accounts){
+            channels.put(account.getUsername(),account.getId());
             channelName[i] = account.getUsername();
             channelId[i] = account.getId();
             i++;
@@ -437,5 +436,24 @@ public class DisplayPlaylistsFragment extends Fragment implements OnPlaylistActi
                 }
             }
         });
+        //Manage languages
+        set_upload_channel.setOnItemSelectedListener(new MaterialSpinner.OnItemSelectedListener<String>() {
+            @Override
+            public void onItemSelected(MaterialSpinner view, int position, long id, String item) {
+                LinkedHashMap<String, String> channelsCheck = new LinkedHashMap<>(channels);
+                Iterator it = channelsCheck.entrySet().iterator();
+                int i = 0;
+                while (it.hasNext()) {
+                    Map.Entry pair = (Map.Entry)it.next();
+                    if( i == position){
+                        channelToSend = new HashMap<>();
+                        channelToSend.put((String)pair.getKey(), (String)pair.getValue());
+                        break;
+                    }
+                    it.remove();
+                    i++;
+                }
+            }
+        });
     }
 }
diff --git a/app/src/main/res/layout/activity_playlists.xml b/app/src/main/res/layout/activity_playlists.xml
index 20acecefb..233805ed2 100644
--- a/app/src/main/res/layout/activity_playlists.xml
+++ b/app/src/main/res/layout/activity_playlists.xml
@@ -73,7 +73,7 @@
                     android:layout_gravity="center"
                     android:textStyle="italic|bold"
                     android:typeface="serif"
-                    android:text="@string/action_lists_empty_content"
+                    android:text="@string/action_playlist_empty_content"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" />
             </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 05d6fab4e..3df62c503 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -959,6 +959,7 @@
     <string name="error_display_name">You must provide a display name!</string>
     <string name="error_channel_mandatory">The channel is required when the playlist is public.</string>
     <string name="action_playlist_create">Create a playlist</string>
+    <string name="action_playlist_empty_content">There is nothing in this playlist yet.</string>
 
     <plurals name="number_of_vote">
         <item quantity="one">%d vote</item>