diff --git a/app/build.gradle b/app/build.gradle
index e572087a9..266e9d9bb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -86,6 +86,7 @@ android {
     }
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
     lint {
         abortOnError false
diff --git a/app/src/extra/java/free/rm/skytube/gui/fragments/ChromecastControllerFragment.java b/app/src/extra/java/free/rm/skytube/gui/fragments/ChromecastControllerFragment.java
index 3546dbd44..dd1a98f4c 100644
--- a/app/src/extra/java/free/rm/skytube/gui/fragments/ChromecastControllerFragment.java
+++ b/app/src/extra/java/free/rm/skytube/gui/fragments/ChromecastControllerFragment.java
@@ -50,11 +50,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
 		stopButton = fragmentBinding.stopButton;
 		bufferingSpinner = fragmentBinding.bufferingSpinner;
 
-		// Set the background color of the video description layout since by default it doesn't match the background color of the Chromecast controller
-		TypedValue typedValue = new TypedValue();
-		getContext().getTheme().resolveAttribute(R.attr.colorPrimary, typedValue, true);
-		videoDescriptionBinding.videoDescLinearlayout.setBackgroundResource(typedValue.resourceId);
-
 		Linker.configure(videoDescriptionBinding.videoDescDescription, null);
 
 		fragmentBinding.chromecastPlaybackProgressBar.setOnSeekBarChangeListener(this);
diff --git a/app/src/extra/res/menu/main_activity_menu.xml b/app/src/extra/res/menu/main_activity_menu.xml
index d14496361..32278d661 100644
--- a/app/src/extra/res/menu/main_activity_menu.xml
+++ b/app/src/extra/res/menu/main_activity_menu.xml
@@ -5,7 +5,7 @@
 	<item android:id="@+id/menu_search"
 		  android:title="@string/search_videos"
 		  android:icon="@drawable/ic_search"
-		  app:showAsAction="always"
+		  app:showAsAction="collapseActionView|ifRoom"
 		  app:actionViewClass="androidx.appcompat.widget.SearchView"/>
 
 	<item
diff --git a/app/src/main/java/free/rm/skytube/businessobjects/db/SubscriptionsDb.java b/app/src/main/java/free/rm/skytube/businessobjects/db/SubscriptionsDb.java
index 9302ebd9a..a0c4a3957 100644
--- a/app/src/main/java/free/rm/skytube/businessobjects/db/SubscriptionsDb.java
+++ b/app/src/main/java/free/rm/skytube/businessobjects/db/SubscriptionsDb.java
@@ -477,12 +477,6 @@ public Single<List<ChannelId>> getSubscribedChannelIdsAsync() {
 				.subscribeOn(Schedulers.io());
 	}
 
-    public void setChannelState(@NonNull PersistentChannel channel, @NonNull Status status) {
-        Logger.i(this, "Set channel %s pk=%s, id=%s state to %s", channel.channel().getTitle(), channel.channelPk(), channel.getChannelId(), status);
-        SkyTubeApp.nonUiThread();
-        LocalChannelTable.updateChannelStatus(getWritableDatabase(), channel.getChannelId(), status);
-    }
-
     public void setChannelState(@NonNull ChannelId channelId, @NonNull Status status) {
         Logger.i(this, "Set channel id=%s state to %s", channelId, status);
         SkyTubeApp.nonUiThread();
diff --git a/app/src/main/res/layout/video_description.xml b/app/src/main/res/layout/video_description.xml
index c8c7c03d5..ccacf3050 100644
--- a/app/src/main/res/layout/video_description.xml
+++ b/app/src/main/res/layout/video_description.xml
@@ -4,20 +4,23 @@
 	android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:background="@color/video_player_drawer_background">
-	<LinearLayout android:layout_width="match_parent"
-				  android:layout_height="match_parent"
-				  android:id="@+id/video_desc_linearlayout"
-				  android:orientation="vertical"
-				  android:padding="16dp">
+
+	<LinearLayout
+		android:id="@+id/video_desc_linearlayout"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:background="@color/colorPrimary"
+		android:orientation="vertical"
+		android:padding="16dp">
 
 		<TextView
 			android:id="@+id/video_desc_title"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:paddingBottom="10dp"
-			android:textColor="@color/video_player_drawer_text"
+			android:text="Title Goes Here!"
 			android:textAppearance="@android:style/TextAppearance.Large"
-			android:text="Title Goes Here!"/>
+			android:textColor="@color/video_player_drawer_text" />
 
 
 		<LinearLayout
@@ -59,14 +62,14 @@
 					<TextView
 						android:id="@+id/video_desc_channel"
 						style="@style/VideoDescTextView"
-						android:text="Channel Name"/>
+						android:text="Channel Name" />
 
 					<!-- SUB BUTTON -->
 					<free.rm.skytube.gui.businessobjects.views.SubscribeButton
 						android:id="@+id/video_desc_subscribe_button"
 						style="@style/SubscribeButton"
 						android:layout_below="@id/video_desc_channel"
-						android:text="Unsubscribe"/>
+						android:text="Unsubscribe" />
 				</LinearLayout>
 
 			</RelativeLayout>
@@ -78,20 +81,20 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:paddingLeft="30dp"
-				android:paddingStart="30dp">
+				android:paddingStart="30dp"
+				android:paddingLeft="30dp">
 
 				<TextView
 					android:id="@+id/video_desc_views"
 					style="@style/VideoDescTextView"
-					android:text="17,000,000 views"/>
+					android:text="17,000,000 views" />
 
 				<ProgressBar
 					android:id="@+id/video_desc_likes_bar"
 					style="?android:attr/progressBarStyleHorizontal"
 					android:layout_width="160dp"
 					android:layout_height="wrap_content"
-					android:layout_below="@id/video_desc_views"/>
+					android:layout_below="@id/video_desc_views" />
 
 				<TextView
 					android:id="@+id/video_desc_likes"
@@ -120,7 +123,7 @@
 					style="@style/VideoDescTextView"
 					android:layout_below="@id/video_desc_likes_bar"
 					android:text="@string/ratings_disabled"
-					android:visibility="gone"/>
+					android:visibility="gone" />
 			</RelativeLayout>
 
 		</LinearLayout>
@@ -128,17 +131,17 @@
 
 		<TextView
 			android:id="@+id/video_desc_publish_date"
-			android:paddingTop="10dp"
 			style="@style/VideoDescTextView"
-			android:text="7 days ago"/>
+			android:paddingTop="10dp"
+			android:text="7 days ago" />
 
 
 		<TextView
 			android:id="@+id/video_desc_description"
-			android:paddingTop="10dp"
-			android:autoLink="web"
 			style="@style/VideoDescTextView"
-			android:text="Video description here."/>
+			android:autoLink="web"
+			android:paddingTop="10dp"
+			android:text="Video description here." />
 
 	</LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 15d01286a..4955172cd 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,6 @@ org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF
 
 android.useAndroidX=true
 android.enableJetifier=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
+android.nonTransitiveRClass=true
 android.nonFinalResIds=false