diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
index 808255a5b..29a14e39d 100644
--- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt
@@ -177,11 +177,13 @@ class SearchAdapter(
                 binding.searchSubButton.setOnClickListener {
                     if (!isSubscribed) {
                         subscribe(token, channelId)
-                        binding.searchSubButton.text = binding.root.context.getString(R.string.unsubscribe)
+                        binding.searchSubButton.text =
+                            binding.root.context.getString(R.string.unsubscribe)
                         isSubscribed = true
                     } else {
                         unsubscribe(token, channelId)
-                        binding.searchSubButton.text = binding.root.context.getString(R.string.subscribe)
+                        binding.searchSubButton.text =
+                            binding.root.context.getString(R.string.subscribe)
                         isSubscribed = false
                     }
                 }
diff --git a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
index 9a10ba532..6def52cb1 100644
--- a/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/adapters/SubscriptionChannelAdapter.kt
@@ -17,8 +17,6 @@ import com.squareup.picasso.Picasso
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import retrofit2.HttpException
-import java.io.IOException
 
 class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscription>) :
     RecyclerView.Adapter<SubscriptionChannelViewHolder>() {
@@ -68,17 +66,14 @@ class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscrip
     private fun subscribe(context: Context, channelId: String) {
         fun run() {
             CoroutineScope(Dispatchers.IO).launch {
-                val response = try {
+                try {
                     val token = PreferenceHelper.getToken(context)
                     RetrofitInstance.authApi.subscribe(
                         token,
                         Subscribe(channelId)
                     )
-                } catch (e: IOException) {
-                    println(e)
-                    Log.e(TAG, "IOException, you might not have internet connection")
-                } catch (e: HttpException) {
-                    Log.e(TAG, "HttpException, unexpected response")
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
                 }
                 subscribed = true
                 isLoading = false
@@ -90,17 +85,14 @@ class SubscriptionChannelAdapter(private val subscriptions: MutableList<Subscrip
     private fun unsubscribe(context: Context, channelId: String) {
         fun run() {
             CoroutineScope(Dispatchers.IO).launch {
-                val response = try {
+                try {
                     val token = PreferenceHelper.getToken(context)
                     RetrofitInstance.authApi.unsubscribe(
                         token,
                         Subscribe(channelId)
                     )
-                } catch (e: IOException) {
-                    println(e)
-                    Log.e(TAG, "IOException, you might not have internet connection")
-                } catch (e: HttpException) {
-                    Log.e(TAG, "HttpException, unexpected response")
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
                 }
                 subscribed = false
                 isLoading = false
diff --git a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
index 43aa0f0cf..ffcf56b7c 100644
--- a/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/ChannelFragment.kt
@@ -16,7 +16,6 @@ import com.github.libretube.obj.Subscribe
 import com.github.libretube.preferences.PreferenceHelper
 import com.github.libretube.util.RetrofitInstance
 import com.github.libretube.util.formatShort
-import com.google.android.material.button.MaterialButton
 import com.squareup.picasso.Picasso
 import retrofit2.HttpException
 import java.io.IOException
@@ -58,7 +57,7 @@ class ChannelFragment : Fragment() {
             binding.channelRefresh.isRefreshing = true
             fetchChannel()
             if (PreferenceHelper.getToken(requireContext()) != "") {
-                isSubscribed(binding.channelSubscribe)
+                isSubscribed()
             }
         }
         refreshChannel()
@@ -81,7 +80,7 @@ class ChannelFragment : Fragment() {
             }
     }
 
-    private fun isSubscribed(button: MaterialButton) {
+    private fun isSubscribed() {
         @SuppressLint("ResourceAsColor")
         fun run() {
             lifecycleScope.launchWhenCreated {
@@ -91,28 +90,26 @@ class ChannelFragment : Fragment() {
                         channelId!!,
                         token
                     )
-                } catch (e: IOException) {
-                    println(e)
-                    Log.e(TAG, "IOException, you might not have internet connection")
-                    return@launchWhenCreated
-                } catch (e: HttpException) {
-                    Log.e(TAG, "HttpException, unexpected response")
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
                     return@launchWhenCreated
                 }
 
                 runOnUiThread {
                     if (response.subscribed == true) {
                         isSubscribed = true
-                        button.text = getString(R.string.unsubscribe)
+                        binding.channelSubscribe.text = getString(R.string.unsubscribe)
                     }
                     if (response.subscribed != null) {
-                        button.setOnClickListener {
-                            if (isSubscribed) {
-                                unsubscribe()
-                                button.text = getString(R.string.subscribe)
-                            } else {
-                                subscribe()
-                                button.text = getString(R.string.unsubscribe)
+                        binding.channelSubscribe.apply {
+                            setOnClickListener {
+                                text = if (isSubscribed) {
+                                    unsubscribe()
+                                    getString(R.string.subscribe)
+                                } else {
+                                    subscribe()
+                                    getString(R.string.unsubscribe)
+                                }
                             }
                         }
                     }
@@ -125,19 +122,14 @@ class ChannelFragment : Fragment() {
     private fun subscribe() {
         fun run() {
             lifecycleScope.launchWhenCreated {
-                val response = try {
+                try {
                     val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.authApi.subscribe(
                         token,
                         Subscribe(channelId)
                     )
-                } catch (e: IOException) {
-                    println(e)
-                    Log.e(TAG, "IOException, you might not have internet connection")
-                    return@launchWhenCreated
-                } catch (e: HttpException) {
-                    Log.e(TAG, "HttpException, unexpected response$e")
-                    return@launchWhenCreated
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
                 }
                 isSubscribed = true
             }
@@ -148,19 +140,14 @@ class ChannelFragment : Fragment() {
     private fun unsubscribe() {
         fun run() {
             lifecycleScope.launchWhenCreated {
-                val response = try {
+                try {
                     val token = PreferenceHelper.getToken(requireContext())
                     RetrofitInstance.authApi.unsubscribe(
                         token,
                         Subscribe(channelId)
                     )
-                } catch (e: IOException) {
-                    println(e)
-                    Log.e(TAG, "IOException, you might not have internet connection")
-                    return@launchWhenCreated
-                } catch (e: HttpException) {
-                    Log.e(TAG, "HttpException, unexpected response")
-                    return@launchWhenCreated
+                } catch (e: Exception) {
+                    Log.e(TAG, e.toString())
                 }
                 isSubscribed = false
             }
diff --git a/app/src/main/java/com/github/libretube/views/DoubleClickListener.kt b/app/src/main/java/com/github/libretube/views/DoubleClickListener.kt
index f4de71793..dd5eaf02d 100644
--- a/app/src/main/java/com/github/libretube/views/DoubleClickListener.kt
+++ b/app/src/main/java/com/github/libretube/views/DoubleClickListener.kt
@@ -9,28 +9,30 @@ class DoubleClickListener(
     private val callback: Callback
 ) : View.OnClickListener {
     private var lastClicked: Long = -1L
-    private var doubleClicked: Boolean = false
 
     override fun onClick(v: View?) {
         lastClicked = when {
             lastClicked == -1L -> {
-                doubleClicked = false
+                checkForSingleClick()
                 System.currentTimeMillis()
             }
             isDoubleClicked() -> {
-                doubleClicked = true
                 callback.doubleClicked()
                 -1L
             }
             else -> {
-                Handler(Looper.getMainLooper()).postDelayed({
-                    if (!doubleClicked) callback.singleClicked()
-                }, doubleClickTimeLimitMills)
+                checkForSingleClick()
                 System.currentTimeMillis()
             }
         }
     }
 
+    private fun checkForSingleClick() {
+        Handler(Looper.getMainLooper()).postDelayed({
+            if (lastClicked != -1L) callback.singleClicked()
+        }, doubleClickTimeLimitMills)
+    }
+
     private fun getTimeDiff(from: Long, to: Long): Long {
         return to - from
     }
diff --git a/app/src/main/res/layout/channel_search_row.xml b/app/src/main/res/layout/channel_search_row.xml
index 5c527e94d..702c892d0 100644
--- a/app/src/main/res/layout/channel_search_row.xml
+++ b/app/src/main/res/layout/channel_search_row.xml
@@ -44,7 +44,7 @@
             android:layout_marginTop="2dp"
             android:text="@string/subscribe"
             android:textColor="?attr/colorPrimary"
-            android:visibility="gone"/>
+            android:visibility="gone" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/channel_subscription_row.xml b/app/src/main/res/layout/channel_subscription_row.xml
index 0179bb46c..878568aa8 100644
--- a/app/src/main/res/layout/channel_subscription_row.xml
+++ b/app/src/main/res/layout/channel_subscription_row.xml
@@ -33,9 +33,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
-        android:backgroundTint="?attr/colorOnPrimary"
-        android:text="@string/unsubscribe"
-        android:textColor="@android:color/white"
-        android:textSize="11sp"
+        android:layout_centerVertical="true"
+        android:elevation="1dp"
+        android:text="@string/subscribe"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="12sp"
         app:cornerRadius="20dp" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/comments_row.xml b/app/src/main/res/layout/comments_row.xml
index a965247e8..5256e49d6 100644
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@@ -9,6 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp"
+        android:animateLayoutChanges="true"
         android:orientation="vertical"
         android:paddingStart="20dp"
         android:paddingEnd="20dp"
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index bfb170c90..90ead4037 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.github.libretube.views.CustomSwipeToRefresh xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/channel_refresh"
     android:layout_width="match_parent"
@@ -74,15 +75,16 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/channel_subscribe"
+                    style="@style/Widget.Material3.Button.ElevatedButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:backgroundTint="?attr/colorOnPrimary"
-                    android:drawableStart="@drawable/ic_bell_small"
-                    android:drawableTint="@android:color/white"
+                    android:drawableLeft="@drawable/ic_bell_small"
+                    android:drawableTint="?android:attr/textColorPrimary"
+                    android:elevation="20dp"
                     android:text="@string/subscribe"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="11sp" />
+                    android:textSize="12sp"
+                    app:cornerRadius="20dp" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 4cf609ef8..4ee4a9401 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -279,7 +279,7 @@
                     android:drawableTint="?android:attr/textColorPrimary"
                     android:text="@string/subscribe"
                     android:textColor="?android:attr/textColorPrimary"
-                    android:textSize="12dp"
+                    android:textSize="12sp"
                     app:cornerRadius="11dp" />
             </RelativeLayout>
 
@@ -389,7 +389,7 @@
                 android:id="@+id/rewindFL"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight=".40">
+                android:layout_weight=".35">
 
                 <ImageButton
                     android:id="@+id/rewindBTN"
@@ -407,14 +407,14 @@
             <LinearLayout
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight=".20" />
+                android:layout_weight=".30" />
 
             <!-- double tap forward btn -->
             <FrameLayout
                 android:id="@+id/forwardFL"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
-                android:layout_weight=".40">
+                android:layout_weight=".35">
 
                 <ImageButton
                     android:id="@+id/forwardBTN"