diff --git a/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt b/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt
new file mode 100644
index 000000000..2ee456aa0
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/CreatePlaylistDialog.kt
@@ -0,0 +1,44 @@
+package com.github.libretube
+
+import android.app.Dialog
+import android.content.Context
+import android.os.Bundle
+import android.util.Log
+import android.view.View
+import android.widget.Button
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import com.github.libretube.obj.Login
+
+class CreatePlaylistDialog: DialogFragment() {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val builder = AlertDialog.Builder(it)
+            // Get the layout inflater
+            val inflater = requireActivity().layoutInflater;
+            val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+            val token = sharedPref?.getString("token","")
+            var view: View
+            Log.e("dafaq",token!!)
+            if(token!=""){
+                val sharedPref2 = context?.getSharedPreferences("username", Context.MODE_PRIVATE)
+                val user = sharedPref2?.getString("username","")
+                view = inflater.inflate(R.layout.dialog_logout, null)
+                view.findViewById<TextView>(R.id.user).text = view.findViewById<TextView>(R.id.user).text.toString()+" ("+user+")"
+                view.findViewById<Button>(R.id.logout).setOnClickListener {
+                    Toast.makeText(context,R.string.loggedout, Toast.LENGTH_SHORT).show()
+                    val sharedPref = context?.getSharedPreferences("token", Context.MODE_PRIVATE)
+                    with (sharedPref!!.edit()) {
+                        putString("token","")
+                        apply()
+                    }
+                    dialog?.dismiss()
+                }
+            }
+            builder.setView(view)
+            builder.create()
+        } ?: throw IllegalStateException("Activity cannot be null")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/libretube/Library.kt b/app/src/main/java/com/github/libretube/Library.kt
index 5663ca504..f161cc557 100644
--- a/app/src/main/java/com/github/libretube/Library.kt
+++ b/app/src/main/java/com/github/libretube/Library.kt
@@ -83,16 +83,60 @@ class Library : Fragment() {
                     refreshLayout?.isRefreshing = false
                 }
                 if (response.isNotEmpty()){
+                    runOnUiThread {
+                        with(view.findViewById<ImageView>(R.id.boogh2)){
+                            visibility=View.GONE
+                        }
+                        with(view.findViewById<TextView>(R.id.textLike2)){
+                            visibility=View.GONE
+                        }
+                    }
                     val playlistsAdapter = PlaylistsAdapter(response.toMutableList())
                     playlistRecyclerView.adapter= playlistsAdapter
+                }else{
+                    runOnUiThread {
+                        with(view.findViewById<ImageView>(R.id.boogh2)){
+                            visibility=View.VISIBLE
+                            setImageResource(R.drawable.ic_list)
+                        }
+                        with(view.findViewById<TextView>(R.id.textLike2)){
+                            visibility=View.VISIBLE
+                            text = getString(R.string.emptyList)
+                        }
+                    }
                 }
-                runOnUiThread {
 
-                }
             }
         }
         run()
     }
+    private fun createPlaylist(name: String, view: View){
+        fun run() {
+            lifecycleScope.launchWhenCreated {
+                val response = try {
+                    RetrofitInstance.api.createPlaylist(token, name)
+                }catch(e: IOException) {
+                    println(e)
+                    Log.e(TAG, "IOException, you might not have internet connection")
+                    Toast.makeText(context,R.string.unknown_error, Toast.LENGTH_SHORT).show()
+                    return@launchWhenCreated
+                } catch (e: HttpException) {
+                    Log.e(TAG, "HttpException, unexpected response")
+                    Toast.makeText(context,R.string.server_error, Toast.LENGTH_SHORT).show()
+                    return@launchWhenCreated
+                }
+                if (response != null){
+                    Toast.makeText(context,R.string.playlistCreated, Toast.LENGTH_SHORT).show()
+                    fetchPlaylists(view)
+                }else{
+
+                }
+
+            }
+        }
+        run()
+    }
+
     private fun Fragment?.runOnUiThread(action: () -> Unit) {
         this ?: return
         if (!isAdded) return // Fragment not attached to an Activity
diff --git a/app/src/main/java/com/github/libretube/PipedApi.kt b/app/src/main/java/com/github/libretube/PipedApi.kt
index 038e294ed..d0472998e 100644
--- a/app/src/main/java/com/github/libretube/PipedApi.kt
+++ b/app/src/main/java/com/github/libretube/PipedApi.kt
@@ -61,6 +61,9 @@ interface PipedApi {
     @POST("user/playlists/delete")
     suspend fun deletePlaylist(@Header("Authorization") token: String, @Body playlistId: PlaylistId): Message
 
+    @POST("user/playlists/create")
+    suspend fun createPlaylist(@Header("Authorization") token: String, @Body name: String): PlaylistId
+
     //only for fetching servers list
     @GET
     suspend fun getInstances(@Url url: String): List<Instances>
diff --git a/app/src/main/java/com/github/libretube/Subscriptions.kt b/app/src/main/java/com/github/libretube/Subscriptions.kt
index 7f9737ba7..3fbfb8387 100644
--- a/app/src/main/java/com/github/libretube/Subscriptions.kt
+++ b/app/src/main/java/com/github/libretube/Subscriptions.kt
@@ -1,7 +1,6 @@
 package com.github.libretube
 
 import android.content.Context
-import android.media.Image
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.Fragment
@@ -17,7 +16,6 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.github.libretube.adapters.SubscriptionAdapter
 import com.github.libretube.adapters.SubscriptionChannelAdapter
-import com.github.libretube.adapters.TrendingAdapter
 import retrofit2.HttpException
 import java.io.IOException
 
@@ -61,11 +59,11 @@ class Subscriptions : Fragment() {
             val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
             val grid = sharedPreferences.getString("grid", resources.getInteger(R.integer.grid_items).toString())!!
             feedRecView.layoutManager = GridLayoutManager(view.context, grid.toInt())
-            fetchFeed(feedRecView, progressBar)
+            fetchFeed(feedRecView, progressBar, view)
 
             refreshLayout?.setOnRefreshListener {
                 fetchChannels(channelRecView)
-                fetchFeed(feedRecView, progressBar)
+                fetchFeed(feedRecView, progressBar, view)
             }
 
             val scrollView = view.findViewById<ScrollView>(R.id.scrollview_sub)
@@ -87,7 +85,7 @@ class Subscriptions : Fragment() {
         }
     }
 
-    private fun fetchFeed(feedRecView: RecyclerView, progressBar: ProgressBar) {
+    private fun fetchFeed(feedRecView: RecyclerView, progressBar: ProgressBar, view: View) {
         fun run() {
             lifecycleScope.launchWhenCreated {
                 val response = try {
@@ -106,6 +104,18 @@ class Subscriptions : Fragment() {
                     subscriptionAdapter = SubscriptionAdapter(response)
                     feedRecView?.adapter= subscriptionAdapter
                     subscriptionAdapter?.updateItems()
+                }else{
+                    runOnUiThread {
+                        with(view.findViewById<ImageView>(R.id.boogh)){
+                            visibility=View.VISIBLE
+                            setImageResource(R.drawable.ic_list)
+                        }
+                        with(view.findViewById<TextView>(R.id.textLike)){
+                            visibility=View.VISIBLE
+                            text = getString(R.string.emptyList)
+                        }
+                        view.findViewById<RelativeLayout>(R.id.loginOrRegister).visibility=View.VISIBLE
+                    }
                 }
                 progressBar.visibility=View.GONE
                 isLoaded=true
@@ -144,5 +154,10 @@ class Subscriptions : Fragment() {
         subscriptionAdapter = null
         view?.findViewById<RecyclerView>(R.id.sub_feed)?.adapter=null
     }
+    private fun Fragment?.runOnUiThread(action: () -> Unit) {
+        this ?: return
+        if (!isAdded) return // Fragment not attached to an Activity
+        activity?.runOnUiThread(action)
+    }
 
 }
diff --git a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
index 86a5cdab6..7feb76f41 100644
--- a/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/PlaylistsAdapter.kt
@@ -19,6 +19,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.preference.PreferenceManager
 import androidx.recyclerview.widget.RecyclerView
+import com.blankj.utilcode.util.StringUtils.getString
 import com.blankj.utilcode.util.ThreadUtils.runOnUiThread
 import com.github.libretube.*
 import com.github.libretube.obj.PlaylistId
@@ -53,8 +54,8 @@ class PlaylistsAdapter(private val playlists: MutableList<Playlists>): RecyclerV
         holder.v.findViewById<TextView>(R.id.playlist_title).text = playlist.name
         holder.v.findViewById<ImageView>(R.id.delete_playlist).setOnClickListener {
             val builder = AlertDialog.Builder(holder.v.context)
-            builder.setTitle("Androidly Alert")
-            builder.setMessage("We have a message")
+            builder.setTitle(getString(R.string.deletePlaylist))
+            builder.setMessage(getString(R.string.areYouSure))
             builder.setPositiveButton(R.string.yes) { dialog, which ->
                 val sharedPref = holder.v.context.getSharedPreferences("token", Context.MODE_PRIVATE)
                 val token = sharedPref?.getString("token","")!!
@@ -92,6 +93,9 @@ class PlaylistsAdapter(private val playlists: MutableList<Playlists>): RecyclerV
                         Log.d(TAG,"deleted!")
                         playlists.removeAt(position)
                         runOnUiThread{notifyDataSetChanged()}
+                        /*if(playlists.isEmpty()){
+                            view.findViewById<ImageView>(R.id.boogh2).visibility=View.VISIBLE
+                        }*/
                     }
                 }catch (e:Exception){
                     Log.e(TAG,e.toString())
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
new file mode 100644
index 000000000..eb232541d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_list.xml b/app/src/main/res/drawable/ic_list.xml
new file mode 100644
index 000000000..9884aeb83
--- /dev/null
+++ b/app/src/main/res/drawable/ic_list.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M4,14h4v-4L4,10v4zM4,19h4v-4L4,15v4zM4,9h4L8,5L4,5v4zM9,14h12v-4L9,10v4zM9,19h12v-4L9,15v4zM9,5v4h12L21,5L9,5z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 8ac983579..8a0b24cd6 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -44,12 +44,19 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:orientation="vertical">
-
+                <Button
+                    android:id="@+id/create_playlist"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/createPlaylist"
+                    android:layout_gravity="center"
+                    android:layout_margin="8dp"
+                    android:drawableLeft="@drawable/ic_add"/>
                 <RelativeLayout
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:descendantFocusability="blocksDescendants">
 
                     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/playlists_row.xml b/app/src/main/res/layout/playlists_row.xml
index 5f66d348f..965a1265d 100644
--- a/app/src/main/res/layout/playlists_row.xml
+++ b/app/src/main/res/layout/playlists_row.xml
@@ -41,7 +41,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:text="TextView"
+        android:text=""
         app:layout_constraintEnd_toStartOf="@+id/delete_playlist"
         app:layout_constraintStart_toEndOf="@+id/card_playlist_thumbnail"
         app:layout_constraintTop_toTopOf="parent" />
@@ -51,17 +51,19 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:text="TextView"
+        android:text=""
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/card_playlist_thumbnail"
         app:layout_constraintTop_toBottomOf="@+id/playlist_title" />
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/delete_playlist"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
         android:src="@drawable/ic_delete"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:background="?android:attr/selectableItemBackground"
+        android:padding="8dp"
         />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9009ed530..e43bfa365 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,4 +40,9 @@
     <string name="notgmail">This is not your gmail account!</string>
     <string name="defres">Default Video Resolution</string>
     <string name="grid">Choose the grid columns</string>
+    <string name="emptyList">Nothing\'s here!</string>
+    <string name="deletePlaylist">Delete Playlist</string>
+    <string name="areYouSure">Are you sure you want to delete this playlist?</string>
+    <string name="createPlaylist">Create Playlist</string>
+    <string name="playlistCreated">Playlist created!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
new file mode 100644
index 000000000..f2e84d642
--- /dev/null
+++ b/app/src/main/res/values/style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="roundedImageViewRounded">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">10%</item>
+    </style>
+</resources>
\ No newline at end of file