diff --git a/app/build.gradle b/app/build.gradle
index 324224856..f37df0b2f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     defaultConfig {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 6
-        versionName "0.6.0"
+        versionCode 7
+        versionName "0.6.1"
     }
     buildTypes {
         release {
@@ -31,6 +31,8 @@ dependencies {
     compile 'com.android.support:appcompat-v7:23.1.1'
     compile 'com.android.support:support-v4:23.1.1'
     compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:cardview-v7:23.1.1'
+    compile 'com.android.support:recyclerview-v7:23.1.1'
     compile 'org.jsoup:jsoup:1.8.3'
     compile 'org.mozilla:rhino:1.7.7'
 }
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index bac7d7964..76aac8c74 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -1,67 +1,84 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="92dp"
-    android:padding="6dp">
+    android:layout_height="wrap_content">
 
-    <ImageView android:id="@+id/itemThumbnailView"
-        android:contentDescription="@string/itemThumbnailViewDescription"
-        android:layout_width="142dp"
-        android:layout_height="80dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginRight="6dp"
-        android:scaleType="centerCrop"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/dummy_thumbnail"/>
-
-    <TextView android:id="@+id/itemVideoTitleView"
-        android:layout_width="wrap_content"
-        android:layout_height="36dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_alignParentTop="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="@dimen/text_search_title_size"/>
-
-    <TextView android:id="@+id/itemUploaderView"
-        android:layout_width="wrap_content"
-        android:layout_height="18dp"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemVideoTitleView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_uploader_size"/>
-
-    <TextView android:id="@+id/itemUploadDateView"
-        android:layout_width="wrap_content"
+    <android.support.v7.widget.CardView
+        xmlns:card_view="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/card_view"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/itemThumbnailView"
-        android:layout_toEndOf="@id/itemThumbnailView"
-        android:layout_below="@id/itemUploaderView"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_uploadtime_size"
-        />
+        android:layout_margin="6dp"
+        card_view:cardCornerRadius="4dp" >
 
-    <TextView android:id="@+id/itemDurationView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBottom="@id/itemThumbnailView"
-        android:layout_alignRight="@id/itemThumbnailView"
-        android:layout_alignEnd="@id/itemThumbnailView"
-        android:layout_marginRight="2dp"
-        android:layout_marginEnd="2dp"
-        android:layout_marginBottom="2dp"
-        android:paddingTop="1dp"
-        android:paddingBottom="1dp"
-        android:paddingRight="5dp"
-        android:paddingLeft="5dp"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="@dimen/text_search_duration_size"
-        android:background="@color/durationBackground"
-        android:textColor="@color/durationText"/>
+        <RelativeLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="92dp">
 
-</RelativeLayout>
\ No newline at end of file
+            <ImageView android:id="@+id/itemThumbnailView"
+                android:contentDescription="@string/itemThumbnailViewDescription"
+                android:layout_width="142dp"
+                android:layout_height="80dp"
+                android:layout_marginEnd="6dp"
+                android:layout_marginRight="6dp"
+                android:scaleType="centerCrop"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentStart="true"
+                android:layout_alignParentTop="true"
+                android:src="@drawable/dummy_thumbnail"/>
+
+            <TextView android:id="@+id/itemVideoTitleView"
+                android:layout_width="wrap_content"
+                android:layout_height="36dp"
+                android:layout_toRightOf="@id/itemThumbnailView"
+                android:layout_toEndOf="@id/itemThumbnailView"
+                android:layout_alignParentTop="true"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:textSize="@dimen/text_search_title_size"/>
+
+            <TextView android:id="@+id/itemUploaderView"
+                android:layout_width="wrap_content"
+                android:layout_height="18dp"
+                android:layout_toRightOf="@id/itemThumbnailView"
+                android:layout_toEndOf="@id/itemThumbnailView"
+                android:layout_below="@id/itemVideoTitleView"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/text_search_uploader_size"/>
+
+            <TextView android:id="@+id/itemUploadDateView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@id/itemThumbnailView"
+                android:layout_toEndOf="@id/itemThumbnailView"
+                android:layout_below="@id/itemUploaderView"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/text_search_uploadtime_size"
+                />
+
+            <TextView android:id="@+id/itemDurationView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBottom="@id/itemThumbnailView"
+                android:layout_alignRight="@id/itemThumbnailView"
+                android:layout_alignEnd="@id/itemThumbnailView"
+                android:layout_marginRight="2dp"
+                android:layout_marginEnd="2dp"
+                android:layout_marginBottom="2dp"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
+                android:paddingRight="5dp"
+                android:paddingLeft="5dp"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="@dimen/text_search_duration_size"
+                android:background="@color/durationBackground"
+                android:textColor="@color/durationText"/>
+
+        </RelativeLayout>
+    </android.support.v7.widget.CardView>
+</LinearLayout>
\ No newline at end of file