diff --git a/app/build.gradle b/app/build.gradle
index 0f4928a04..030dcfa4a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -114,10 +114,6 @@ android {
     dexOptions {
         jumboMode true
     }
-
-    dataBinding {
-        enabled = true
-    }
 }
 
 dependencies {
diff --git a/app/src/main/java/de/danoeh/antennapod/view/WrappingGridView.java b/app/src/main/java/de/danoeh/antennapod/view/WrappingGridView.java
index d155df9d2..37792b4d1 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/WrappingGridView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/WrappingGridView.java
@@ -32,5 +32,4 @@ public class WrappingGridView extends GridView {
         }
         super.onMeasure(widthMeasureSpec, heightSpec);
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index c00aa6924..011aa4c8b 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -1,178 +1,173 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout
+<ScrollView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto" >
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scrollbars="vertical">
 
-    <ScrollView
+    <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical">
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp">
 
-        <LinearLayout
+        <android.support.v7.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="8dp">
+                app:cardCornerRadius="4dp"
+                android:elevation="16dp"
+                android:layout_margin="8dp">
 
-            <android.support.v7.widget.CardView
+            <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:cardCornerRadius="4dp"
-                    android:elevation="16dp"
-                    android:layout_margin="8dp">
-                <LinearLayout
+                    android:orientation="horizontal">
+
+                <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="match_parent"
+                        android:contentDescription="@string/search_podcast_hint"
+                        app:srcCompat="?attr/action_search"
+                        android:scaleType="center"/>
+
+                <EditText
+                        android:id="@+id/combinedFeedSearchBox"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:inputType="text"
+                        android:imeOptions="actionSearch"
+                        android:importantForAutofill="no"
+                        android:layout_marginLeft="8dp"
+                        android:layout_marginRight="8dp"
+                        android:paddingTop="16dp"
+                        android:paddingBottom="16dp"
+                        android:hint="@string/search_podcast_hint"
+                        android:background="@null"/>
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <fragment
+                android:id="@+id/quickFeedDiscovery"
+                android:name="de.danoeh.antennapod.fragment.QuickFeedDiscoveryFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="8dp"/>
+
+        <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="4dp"
+                android:elevation="8dp"
+                android:layout_margin="8dp">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:padding="8dp"
+                    android:orientation="vertical">
+
+                <TextView
+                        android:id="@+id/txtvFeedurl"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="horizontal">
+                        android:text="@string/txtvfeedurl_label"
+                        android:textSize="18sp"
+                        android:layout_marginBottom="8dp"
+                        android:textColor="?android:attr/textColorPrimary"/>
+
+                <EditText
+                        android:id="@+id/etxtFeedurl"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:cursorVisible="true"
+                        android:focusable="true"
+                        android:focusableInTouchMode="true"
+                        android:hint="@string/etxtFeedurlHint"
+                        android:inputType="textUri"/>
+
+                <Button
+                        android:id="@+id/butConfirm"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:text="@string/confirm_label"/>
+
+            </LinearLayout>
+
+        </android.support.v7.widget.CardView>
+
+        <android.support.v7.widget.CardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="4dp"
+                android:elevation="8dp"
+                android:layout_margin="8dp">
+
+            <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:orientation="horizontal">
+
+                <LinearLayout
+                        android:id="@+id/advanced_search"
+                        android:layout_width="96dp"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical"
+                        android:gravity="center_horizontal"
+                        android:padding="16dp"
+                        android:background="?android:attr/selectableItemBackground">
 
                     <ImageView
                             android:layout_width="40dp"
                             android:layout_height="match_parent"
-                            android:contentDescription="@string/search_podcast_hint"
+                            android:contentDescription="@string/advanced_search"
                             app:srcCompat="?attr/action_search"
-                            android:scaleType="center"/>
-
-                    <EditText
-                            android:id="@+id/combinedFeedSearchBox"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:inputType="text"
-                            android:imeOptions="actionSearch"
-                            android:importantForAutofill="no"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginRight="8dp"
-                            android:paddingTop="16dp"
-                            android:paddingBottom="16dp"
-                            android:hint="@string/search_podcast_hint"
-                            android:background="@null"/>
-
-                </LinearLayout>
-
-            </android.support.v7.widget.CardView>
-
-            <fragment
-                    android:id="@+id/quickFeedDiscovery"
-                    android:name="de.danoeh.antennapod.fragment.QuickFeedDiscoveryFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="8dp" />
-
-            <android.support.v7.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:cardCornerRadius="4dp"
-                    android:elevation="8dp"
-                    android:layout_margin="8dp">
-
-                <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:padding="8dp"
-                        android:orientation="vertical">
+                            android:scaleType="center"
+                            android:layout_marginBottom="4dp"
+                            android:tint="?android:attr/textColorPrimary"/>
 
                     <TextView
-                            android:id="@+id/txtvFeedurl"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:text="@string/txtvfeedurl_label"
-                            android:textSize="18sp"
-                            android:layout_marginBottom="8dp"
+                            android:text="@string/advanced_search"
+                            android:textAlignment="center"
                             android:textColor="?android:attr/textColorPrimary"/>
-
-                    <EditText
-                            android:id="@+id/etxtFeedurl"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:cursorVisible="true"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:hint="@string/etxtFeedurlHint"
-                            android:inputType="textUri"/>
-
-                    <Button
-                            android:id="@+id/butConfirm"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:text="@string/confirm_label"/>
-
                 </LinearLayout>
 
-
-            </android.support.v7.widget.CardView>
-
-
-            <android.support.v7.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:cardCornerRadius="4dp"
-                    android:elevation="8dp"
-                    android:layout_margin="8dp">
-
                 <LinearLayout
-                        android:layout_width="wrap_content"
+                        android:id="@+id/btn_opml_import"
+                        android:layout_width="96dp"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:orientation="horizontal">
+                        android:orientation="vertical"
+                        android:gravity="center_horizontal"
+                        android:padding="16dp"
+                        android:background="?android:attr/selectableItemBackground">
 
-                    <LinearLayout
-                            android:id="@+id/advanced_search"
-                            android:layout_width="96dp"
+                    <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="match_parent"
+                            android:contentDescription="@string/opml_import_label"
+                            app:srcCompat="?attr/av_download"
+                            android:scaleType="center"
+                            android:layout_marginBottom="4dp"
+                            android:tint="?android:attr/textColorPrimary"/>
+
+                    <TextView
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:gravity="center_horizontal"
-                            android:padding="16dp"
-                            android:background="?android:attr/selectableItemBackground">
-
-                        <ImageView
-                                android:layout_width="40dp"
-                                android:layout_height="match_parent"
-                                android:contentDescription="@string/advanced_search"
-                                app:srcCompat="?attr/action_search"
-                                android:scaleType="center"
-                                android:layout_marginBottom="4dp"
-                                android:tint="?android:attr/textColorPrimary"/>
-
-                        <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/advanced_search"
-                                android:textAlignment="center"
-                                android:textColor="?android:attr/textColorPrimary"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                            android:id="@+id/btn_opml_import"
-                            android:layout_width="96dp"
-                            android:layout_height="wrap_content"
-                            android:orientation="vertical"
-                            android:gravity="center_horizontal"
-                            android:padding="16dp"
-                            android:background="?android:attr/selectableItemBackground">
-
-                        <ImageView
-                                android:layout_width="40dp"
-                                android:layout_height="match_parent"
-                                android:contentDescription="@string/opml_import_label"
-                                app:srcCompat="?attr/av_download"
-                                android:scaleType="center"
-                                android:layout_marginBottom="4dp"
-                                android:tint="?android:attr/textColorPrimary"/>
-
-                        <TextView
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:text="@string/opml_import_label"
-                                android:textAlignment="center"
-                                android:textColor="?android:attr/textColorPrimary"/>
-                    </LinearLayout>
-
+                            android:text="@string/opml_import_label"
+                            android:textAlignment="center"
+                            android:textColor="?android:attr/textColorPrimary"/>
                 </LinearLayout>
 
+            </LinearLayout>
 
-            </android.support.v7.widget.CardView>
+        </android.support.v7.widget.CardView>
 
-        </LinearLayout>
+    </LinearLayout>
 
-    </ScrollView>
-</layout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file