diff --git a/app/src/main/java/org/emunix/unipatcher/ui/activity/FilePickerActivity.java b/app/src/main/java/org/emunix/unipatcher/ui/activity/FilePickerActivity.java
index 1ee6da8..f301128 100644
--- a/app/src/main/java/org/emunix/unipatcher/ui/activity/FilePickerActivity.java
+++ b/app/src/main/java/org/emunix/unipatcher/ui/activity/FilePickerActivity.java
@@ -29,6 +29,7 @@ import android.os.Environment;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.CardView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
@@ -63,6 +64,7 @@ public class FilePickerActivity extends AppCompatActivity implements FilePickerA
     private RecyclerView list;
     private FilePickerAdapter listAdapter;
     private TextView permissionErrorText;
+    private CardView card;
 
     private TextView crc32;
     private TextView md5;
@@ -104,6 +106,7 @@ public class FilePickerActivity extends AppCompatActivity implements FilePickerA
         permissionErrorText = (TextView) findViewById(R.id.empty_view);
 
         list = (RecyclerView) findViewById(R.id.list);
+        card = (CardView) findViewById(R.id.card);
         try {
             list.setHasFixedSize(true);
         } catch (NullPointerException e) {/* TODO log */}
@@ -274,11 +277,11 @@ public class FilePickerActivity extends AppCompatActivity implements FilePickerA
 
     private void showPermissionError(boolean on) {
         if (on) {
-            list.setVisibility(View.GONE);
+            card.setVisibility(View.GONE);
             permissionErrorText.setVisibility(View.VISIBLE);
         } else {
             permissionErrorText.setVisibility(View.GONE);
-            list.setVisibility(View.VISIBLE);
+            card.setVisibility(View.VISIBLE);
         }
     }
 
diff --git a/app/src/main/res/layout/activity_file_picker.xml b/app/src/main/res/layout/activity_file_picker.xml
index a57acaa..0da88e8 100644
--- a/app/src/main/res/layout/activity_file_picker.xml
+++ b/app/src/main/res/layout/activity_file_picker.xml
@@ -2,6 +2,7 @@
 <android.support.design.widget.CoordinatorLayout
     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="match_parent"
     android:fitsSystemWindows="true"
@@ -34,12 +35,22 @@
             android:textStyle="bold"
             android:visibility="gone"/>
 
-        <android.support.v7.widget.RecyclerView
-            android:id="@+id/list"
+        <android.support.v7.widget.CardView
+            android:id="@+id/card"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:layout_marginLeft="@dimen/file_browser_content_left_margin"
+            android:layout_marginRight="@dimen/file_browser_content_right_margin"
             android:layout_below="@id/appbar"
-            android:scrollbars="vertical"
-            />
+            card_view:cardBackgroundColor="@color/colorCardBackground">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scrollbars="vertical"/>
+
+        </android.support.v7.widget.CardView>
+
     </RelativeLayout>
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index bf44e81..d431a0b 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -10,8 +10,11 @@
         android:id="@+id/mainLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/content_left_margin"
+        android:layout_marginRight="@dimen/content_right_margin"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
 
         <LinearLayout
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_changelog.xml b/app/src/main/res/layout/fragment_changelog.xml
index 4f5093a..30cbb5d 100644
--- a/app/src/main/res/layout/fragment_changelog.xml
+++ b/app/src/main/res/layout/fragment_changelog.xml
@@ -9,7 +9,10 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:layout_marginLeft="@dimen/content_left_margin"
+        android:layout_marginRight="@dimen/content_right_margin"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
 
         <org.sufficientlysecure.htmltextview.HtmlTextView
             android:id="@+id/changelogText"
diff --git a/app/src/main/res/layout/fragment_faq.xml b/app/src/main/res/layout/fragment_faq.xml
index f06d1ef..809459e 100644
--- a/app/src/main/res/layout/fragment_faq.xml
+++ b/app/src/main/res/layout/fragment_faq.xml
@@ -9,7 +9,10 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:layout_marginLeft="@dimen/content_left_margin"
+        android:layout_marginRight="@dimen/content_right_margin"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp">
 
         <org.sufficientlysecure.htmltextview.HtmlTextView
             android:id="@+id/faqText"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 6d3052e..c8a49c9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -7,7 +7,6 @@
     <color name="colorCardHeaderText">#cccccc</color>
     <color name="colorCardLine">#4b4b4b</color>
     <color name="colorCardBackground">#393939</color>
-    <color name="colorAdBackground">#393939</color>
 
     <color name="colorDrawerText">@color/colorCardHeaderText</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 0000000..91a38e6
--- /dev/null
+++ b/app/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="fab_margin">24dp</dimen>
+
+    <dimen name="content_top_margin">16dp</dimen>
+    <dimen name="content_left_margin">64dp</dimen>
+    <dimen name="content_right_margin">64dp</dimen>
+    <dimen name="file_browser_content_left_margin">64dp</dimen>
+    <dimen name="file_browser_content_right_margin">64dp</dimen>
+
+    <dimen name="card_elevation">2dp</dimen>
+    <dimen name="card_corner_radius">2dp</dimen>
+    <dimen name="card_padding">8dp</dimen>
+    <dimen name="card_line_margin">8dp</dimen>
+    <dimen name="card_line_height">1dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
index c9aaa29..fc31e4c 100644
--- a/app/src/main/res/values-w820dp/dimens.xml
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -1,7 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
-         (such as screen margins) for screens with more than 820dp of available width. This
-         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
     <dimen name="activity_horizontal_margin">64dp</dimen>
+    <dimen name="fab_margin">32dp</dimen>
+
+    <dimen name="content_top_margin">16dp</dimen>
+    <dimen name="content_left_margin">192dp</dimen>
+    <dimen name="content_right_margin">192dp</dimen>
+    <dimen name="file_browser_content_left_margin">192dp</dimen>
+    <dimen name="file_browser_content_right_margin">192dp</dimen>
+
+    <dimen name="card_elevation">2dp</dimen>
+    <dimen name="card_corner_radius">2dp</dimen>
+    <dimen name="card_padding">8dp</dimen>
+    <dimen name="card_line_margin">8dp</dimen>
+    <dimen name="card_line_height">1dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 75df8e5..f34b0a8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="nav_header_vertical_spacing">16dp</dimen>
     <dimen name="nav_header_height">160dp</dimen>
     <dimen name="activity_horizontal_margin">16dp</dimen>
@@ -12,9 +11,11 @@
     <dimen name="drawer_padding_left">16dp</dimen>
     <dimen name="drawer_padding_right">16dp</dimen>
 
-    <dimen name="screen_top_padding">8dp</dimen>
-    <dimen name="screen_left_padding">16dp</dimen>
-    <dimen name="screen_right_padding">16dp</dimen>
+    <dimen name="content_top_margin">8dp</dimen>
+    <dimen name="content_left_margin">16dp</dimen>
+    <dimen name="content_right_margin">16dp</dimen>
+    <dimen name="file_browser_content_left_margin">0dp</dimen>
+    <dimen name="file_browser_content_right_margin">0dp</dimen>
 
     <dimen name="card_elevation">2dp</dimen>
     <dimen name="card_corner_radius">2dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 943df13..9f6870f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,9 +23,9 @@
         <item name="android:orientation">vertical</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingTop">@dimen/screen_top_padding</item>
-        <item name="android:paddingLeft">@dimen/screen_left_padding</item>
-        <item name="android:paddingRight">@dimen/screen_right_padding</item>
+        <item name="android:layout_marginTop">@dimen/content_top_margin</item>
+        <item name="android:layout_marginLeft">@dimen/content_left_margin</item>
+        <item name="android:layout_marginRight">@dimen/content_right_margin</item>
     </style>
 
     <style name="Card">