diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml
index 44ba781c2..dff24c650 100644
--- a/app/src/main/res/layout/addfeed.xml
+++ b/app/src/main/res/layout/addfeed.xml
@@ -14,10 +14,47 @@
         android:paddingBottom="8dp"
         android:orientation="vertical">
 
+        <TextView
+            android:id="@+id/txtvPodcastDirectories"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/AntennaPod.TextView.Heading"
+            android:text="@string/podcastdirectories_label"/>
+
+        <TextView
+            android:id="@+id/txtvPodcastDirectoriesDescr"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/podcastdirectories_descr"
+            android:textSize="@dimen/text_size_medium"
+            android:layout_marginTop="4dp"/>
+
+        <Button
+            android:id="@+id/butSearchItunes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/search_itunes_label"/>
+
+        <Button
+            android:id="@+id/butBrowseGpoddernet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/browse_gpoddernet_label"/>
+
+        <View
+            android:id="@+id/divider1"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_margin="16dp"
+            android:background="?android:attr/listDivider"/>
+
         <TextView
             android:id="@+id/txtvFeedurl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_below="@id/divider1"
             style="@style/AntennaPod.TextView.Heading"
             android:text="@string/txtvfeedurl_label"/>
 
@@ -39,43 +76,6 @@
             android:layout_marginTop="8dp"
             android:text="@string/confirm_label"/>
 
-        <View
-            android:id="@+id/divider1"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_margin="16dp"
-            android:background="?android:attr/listDivider"/>
-
-        <TextView
-            android:id="@+id/txtvPodcastDirectories"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/divider1"
-            style="@style/AntennaPod.TextView.Heading"
-            android:text="@string/podcastdirectories_label"/>
-
-        <TextView
-            android:id="@+id/txtvPodcastDirectoriesDescr"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/podcastdirectories_descr"
-            android:textSize="@dimen/text_size_medium"
-            android:layout_marginTop="4dp"/>
-
-        <Button
-            android:id="@+id/butBrowseGpoddernet"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/browse_gpoddernet_label"/>
-
-        <Button
-            android:id="@+id/butSearchItunes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/search_itunes_label"/>
-
         <View
             android:id="@+id/divider2"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml
index 17ffe349b..e57c59554 100644
--- a/app/src/main/res/layout/fragment_itunes_search.xml
+++ b/app/src/main/res/layout/fragment_itunes_search.xml
@@ -14,7 +14,7 @@ tools:context="de.danoeh.antennapod.activity.ITunesSearchActivity">
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:columnWidth="200dp"
+    android:columnWidth="400dp"
     android:gravity="center"
     android:horizontalSpacing="8dp"
     android:numColumns="auto_fit"
diff --git a/app/src/main/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml
index 05df70f31..d8b06e4f7 100644
--- a/app/src/main/res/layout/gpodnet_podcast_list.xml
+++ b/app/src/main/res/layout/gpodnet_podcast_list.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        android:columnWidth="200dp"
+        android:columnWidth="400dp"
         android:gravity="center"
         android:horizontalSpacing="8dp"
         android:numColumns="auto_fit"