diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cccbfa..945b5e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## Version 0.3.1
+_2018-06-03_
+* Fix crash on now playing & playlist while in landscape
+
+
 ## Version 0.3.0
 _2018-05-12_
 * Center cover art on now playing screen
diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml
deleted file mode 100644
index f5afeaf..0000000
--- a/app/src/main/res/layout-land/download.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:orientation="horizontal">
-
-    <ViewFlipper
-        android:id="@+id/download_playlist_flipper"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
-        <net.nullsum.audinaut.view.RecyclingImageView
-            android:id="@+id/download_album_art_image"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:scaleType="fitCenter"
-            android:src="@drawable/unknown_album_large" />
-
-        <include layout="@layout/download_playlist" />
-
-    </ViewFlipper>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@android:color/transparent">
-
-        <TextView
-            android:id="@+id/download_song_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/download_status"
-            android:layout_centerHorizontal="true"
-            android:layout_marginLeft="12dip"
-            android:layout_marginRight="12dip"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:textColorPrimary" />
-
-        <TextView
-            android:id="@+id/download_status"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/download_media_buttons_wrapper"
-            android:layout_marginBottom="8dip"
-            android:layout_marginLeft="12dip"
-            android:layout_marginRight="12dip"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:textColorSecondary" />
-
-        <LinearLayout
-            android:id="@+id/download_media_buttons_wrapper"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/download_slider_wrapper">
-
-            <include layout="@layout/download_media_buttons" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/download_slider_wrapper"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true">
-
-            <include layout="@layout/download_slider" />
-        </LinearLayout>
-
-    </RelativeLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml
deleted file mode 100644
index f6653da..0000000
--- a/app/src/main/res/layout-large-land/download.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal">
-
-    <net.nullsum.audinaut.view.RecyclingImageView
-        android:id="@+id/download_album_art_image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:scaleType="fitCenter"
-        android:src="@drawable/unknown_album_large" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:background="@android:color/transparent">
-
-        <ViewFlipper
-            android:id="@+id/download_playlist_flipper"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:layout_above="@+id/download_song_title">
-
-            <include layout="@layout/download_playlist" />
-
-        </ViewFlipper>
-
-        <TextView
-            android:id="@+id/download_song_title"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/download_status"
-            android:layout_centerHorizontal="true"
-            android:layout_marginLeft="12dip"
-            android:layout_marginRight="12dip"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="?android:textColorPrimary" />
-
-        <TextView
-            android:id="@+id/download_status"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/download_media_buttons_wrapper"
-            android:layout_marginBottom="8dip"
-            android:layout_marginLeft="12dip"
-            android:layout_marginRight="12dip"
-            android:ellipsize="end"
-            android:gravity="center_horizontal"
-            android:maxLines="1"
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:textColorSecondary" />
-
-        <LinearLayout
-            android:id="@+id/download_media_buttons_wrapper"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/download_slider_wrapper">
-
-            <include layout="@layout/download_media_buttons" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/download_slider_wrapper"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true">
-
-            <include layout="@layout/download_slider" />
-        </LinearLayout>
-    </RelativeLayout>
-</LinearLayout>
diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout/download.xml
similarity index 100%
rename from app/src/main/res/layout-port/download.xml
rename to app/src/main/res/layout/download.xml