diff --git a/.travis.yml b/.travis.yml
index 528b5edd3..fef282d77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,15 +2,15 @@ language: android
 android:
   components:
     # The BuildTools version used by NewPipe
-    - build-tools-23.0.1
+    - build-tools-23.0.2
 
     # The SDK version used to compile NewPipe
     - android-23
-    
+
     # Additional components
     - extra-android-support
     - extra-android-m2repository
-   
+
     # Emulators
     - sys-img-armeabi-v7a-android-21
     - sys-img-armeabi-v7a-android-19
diff --git a/README.md b/README.md
index 987cd4b29..e24c686ca 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,12 @@ Project status:
 
 ## Screenshots
 
-[<img src="assets/screenshot_1.png" width=200>](assets/screenshot_1.png)
-[<img src="assets/screenshot_2.png" width=200>](assets/screenshot_2.png)
+[<img src="screenshots/screenshot_1.png" width=150>](screenshots/screenshot_1.png)
+[<img src="screenshots/screenshot_2.png" width=150>](screenshots/screenshot_2.png)
+[<img src="screenshots/screenshot_3.png" width=150>](screenshots/screenshot_3.png)
+[<img src="screenshots/screenshot_4.png" width=150>](screenshots/screenshot_4.png)
+[<img src="screenshots/screenshot_5.png" width=150>](screenshots/screenshot_5.png)
+[<img src="screenshots/screenshot_6.png" width=250>](screenshots/screenshot_6.png)
 
 ## Description
 
diff --git a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml b/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
deleted file mode 100644
index dba717abd..000000000
--- a/app/src/main/res/layout-v21/fragment_videoitem_detail.xml
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".VideoItemDetailFragment"
-    android:textIsSelectable="true"
-    style="?android:attr/textAppearanceLarge"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/videoitem_detail">
-
-    <ProgressBar android:id="@+id/detailProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:indeterminate="true"/>
-
-    <ScrollView
-        android:id="@+id/detailMainContent"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:visibility="invisible">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <RelativeLayout android:id="@+id/detailVideoInfo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <ImageView android:id="@+id/detailThumbnailView"
-                    android:contentDescription="@string/detailThumbnailViewDescription"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/video_item_detail_thumbnail_image_height"
-                    android:scaleType="centerInside"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:adjustViewBounds="true"
-                    android:background="@color/dark_image_background"
-                    android:src="@drawable/dummy_thumbnail"/>
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailThumbnailView"
-                    android:padding="@dimen/video_item_detail_info_text_padding" >
-
-                    <TextView android:id="@+id/detailVideoTitleView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:paddingBottom="3dp"
-                        android:textSize="@dimen/video_item_detail_title_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge"/>
-
-                    <ImageView android:id="@+id/detailUploaderThumbnailView"
-                        android:contentDescription="@string/detailUploaderThumbnailViewDescription"
-                        android:layout_width="@dimen/video_item_detail_uploader_image_size"
-                        android:layout_height="@dimen/video_item_detail_uploader_image_size"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:src="@drawable/buddy" />
-
-                    <TextView android:id="@+id/detailUploaderView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderThumbnailView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textStyle="bold"
-                        android:textSize="@dimen/video_item_detail_uploader_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailViewCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailVideoTitleView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/video_item_detail_views_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailThumbsDownCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                    <ImageView android:id="@+id/detailThumbsDownImgView"
-                        android:contentDescription="@string/detailThumbsDownImgViewDescription"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownCountView"
-                        android:layout_toStartOf="@id/detailThumbsDownCountView"
-                        android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-                        android:src="@drawable/thumbs_down" />
-
-                    <TextView android:id="@+id/detailThumbsUpCountView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsDownImgView"
-                        android:layout_toStartOf="@id/detailThumbsDownImgView"
-                        android:textSize="@dimen/video_item_detail_likes_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-                    <ImageView android:id="@+id/detailThumbsUpImgView"
-                        android:contentDescription="@string/detailThumbsUpImgViewDescription"
-                        android:layout_width="@dimen/video_item_detail_like_image_width"
-                        android:layout_height="@dimen/video_item_detail_like_image_height"
-                        android:layout_below="@id/detailViewCountView"
-                        android:layout_toLeftOf="@id/detailThumbsUpCountView"
-                        android:layout_toStartOf="@id/detailThumbsUpCountView"
-                        android:src="@drawable/thumbs_up" />
-
-                    <TextView android:id="@+id/detailUploadDateView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploaderView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/video_item_detail_upload_date_text_size"
-                        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-                    <TextView android:id="@+id/detailDescriptionView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/detailUploadDateView"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentStart="true"
-                        android:textSize="@dimen/video_item_detail_description_text_size"
-                        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                </RelativeLayout>
-            </RelativeLayout>
-
-            <RelativeLayout android:id="@+id/detailNextVideoRootLayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/video_item_detail_info_text_padding"
-                android:layout_below="@id/detailVideoInfo" >
-
-                <TextView android:id="@+id/detailNextVideoTitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
-                    android:textSize="@dimen/video_item_detail_next_text_size"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:text="@string/nextVideoTitle"
-                    android:textAllCaps="true" />
-
-                <RelativeLayout android:id="@+id/detailNextVidButtonAndContentLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVideoTitle">
-                    <FrameLayout
-                        android:id="@+id/detailNextVideoFrame"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"/>
-                    <Button
-                        android:id="@+id/detailNextVideoButton"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_alignTop="@id/detailNextVideoFrame"
-                        android:layout_alignBottom="@id/detailNextVideoFrame"
-                        android:background="?attr/selectableItemBackground"/>
-                </RelativeLayout>
-                <Button android:id="@+id/detailShowSimilarButton"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/detailNextVidButtonAndContentLayout"
-                    android:textSize="@dimen/video_item_detail_similar_text_size"
-                    android:text="@string/showSimilarVideosButtonText"/>
-            </RelativeLayout>
-
-        </RelativeLayout>
-    </ScrollView>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/playVideoButton"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:backgroundTint="@color/primaryColorYoutube"
-        android:src="@drawable/ic_play_arrow_black"
-        android:layout_margin="@dimen/video_item_detail_play_fab_margin"/>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/video_item.xml b/app/src/main/res/layout/video_item.xml
index f08a46c91..ef11a8c08 100644
--- a/app/src/main/res/layout/video_item.xml
+++ b/app/src/main/res/layout/video_item.xml
@@ -3,12 +3,7 @@
     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="wrap_content"
-    android:paddingTop="@dimen/video_item_search_card_vertical_margin"
-    android:paddingBottom="@dimen/video_item_search_card_vertical_margin"
-    android:paddingLeft="@dimen/video_item_search_card_horizontal_margin"
-    android:paddingRight="@dimen/video_item_search_card_horizontal_margin"
-    >
+    android:layout_height="wrap_content" >
 
     <android.support.v7.widget.CardView
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
@@ -17,7 +12,11 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        card_view:cardCornerRadius="@dimen/video_item_search_card_radius">
+        card_view:cardCornerRadius="@dimen/video_item_search_card_radius"
+        android:layout_marginTop="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginBottom="@dimen/video_item_search_card_vertical_margin"
+        android:layout_marginLeft="@dimen/video_item_search_card_horizontal_margin"
+        android:layout_marginRight="@dimen/video_item_search_card_horizontal_margin" >
 
         <RelativeLayout
             xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 026d0dbee..54f4d69eb 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -11,7 +11,7 @@
     <dimen name="video_item_search_thumbnail_image_width">210dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">130dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
+    <dimen name="video_item_search_card_vertical_margin">5dp</dimen>
     <dimen name="video_item_search_card_horizontal_margin">10dp</dimen>
     <dimen name="video_item_search_card_padding">10dp</dimen>
     <dimen name="video_item_search_image_right_margin">10dp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index df9b5a64e..97df6e82b 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,7 +11,7 @@
     <dimen name="video_item_search_thumbnail_image_width">140dp</dimen>
     <dimen name="video_item_search_thumbnail_image_height">85dp</dimen>
     <!-- Paddings & Margins -->
-    <dimen name="video_item_search_card_vertical_margin">2dp</dimen>
+    <dimen name="video_item_search_card_vertical_margin">3dp</dimen>
     <dimen name="video_item_search_card_horizontal_margin">6dp</dimen>
     <dimen name="video_item_search_card_padding">6dp</dimen>
     <dimen name="video_item_search_image_right_margin">6dp</dimen>
diff --git a/assets/screenshot_1.png b/assets/screenshot_1.png
deleted file mode 100644
index cba67b977..000000000
Binary files a/assets/screenshot_1.png and /dev/null differ
diff --git a/assets/screenshot_2.png b/assets/screenshot_2.png
deleted file mode 100644
index 50bd084f1..000000000
Binary files a/assets/screenshot_2.png and /dev/null differ
diff --git a/screenshots/screenshot_1.png b/screenshots/screenshot_1.png
new file mode 100644
index 000000000..32edfa9ee
Binary files /dev/null and b/screenshots/screenshot_1.png differ
diff --git a/screenshots/screenshot_2.png b/screenshots/screenshot_2.png
new file mode 100644
index 000000000..bce324736
Binary files /dev/null and b/screenshots/screenshot_2.png differ
diff --git a/screenshots/screenshot_3.png b/screenshots/screenshot_3.png
new file mode 100644
index 000000000..8277daa6d
Binary files /dev/null and b/screenshots/screenshot_3.png differ
diff --git a/screenshots/screenshot_4.png b/screenshots/screenshot_4.png
new file mode 100644
index 000000000..94f676dff
Binary files /dev/null and b/screenshots/screenshot_4.png differ
diff --git a/screenshots/screenshot_5.png b/screenshots/screenshot_5.png
new file mode 100644
index 000000000..5b33a4f46
Binary files /dev/null and b/screenshots/screenshot_5.png differ
diff --git a/screenshots/screenshot_6.png b/screenshots/screenshot_6.png
new file mode 100644
index 000000000..fd796c0cf
Binary files /dev/null and b/screenshots/screenshot_6.png differ