diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index 4f548a0..a3b4429 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -60,7 +60,7 @@ public class EmailListActivity extends ActionBarActivity implements
     private RelativeLayout mDrawerOuter;
     private FolderListAdapter mFolderAdapter;
     private ListView mFolderList;
-    private TextView mNetworkStatus;
+    private TextView mNetworkStatusText;
     private ActionBarDrawerToggle mDrawerToggle;
     RouterChoice mRouterChoice;
     IRouterState mStateService = null;
@@ -90,7 +90,7 @@ public class EmailListActivity extends ActionBarActivity implements
         mDrawerOuter = (RelativeLayout) findViewById(R.id.drawer_outer);
         mFolderAdapter = new FolderListAdapter(this);
         mFolderList = (ListView) findViewById(R.id.drawer);
-        mNetworkStatus = (TextView) findViewById(R.id.network_status);
+        mNetworkStatusText = (TextView) findViewById(R.id.network_status_text);
 
         // Set the list of folders
         // TODO: This is slow, needs a loader
@@ -159,32 +159,32 @@ public class EmailListActivity extends ActionBarActivity implements
                 startActivity(ai);
             }
         });
-        mNetworkStatus.setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.network_status).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 int boteNotStartedMessage = R.string.network_info_unavailable;
                 switch (I2PBote.getInstance().getNetworkStatus()) {
-                case DELAY:
-                    boteNotStartedMessage = R.string.network_info_unavailable_delay;
-                case NOT_STARTED:
-                    final int message = boteNotStartedMessage;
-                    DialogFragment df = new DialogFragment() {
-                        @Override
-                        public Dialog onCreateDialog(Bundle savedInstanceState) {
-                            AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-                            builder.setMessage(message)
-                            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int which) {
-                                    dialog.dismiss();
-                                }
-                            });
-                            return builder.create();
-                        }
-                    };
-                    df.show(getSupportFragmentManager(), "noinfo");
-                    break;
-                default:
-                    Intent nii = new Intent(EmailListActivity.this, NetworkInfoActivity.class);
-                    startActivity(nii);
+                    case DELAY:
+                        boteNotStartedMessage = R.string.network_info_unavailable_delay;
+                    case NOT_STARTED:
+                        final int message = boteNotStartedMessage;
+                        DialogFragment df = new DialogFragment() {
+                            @Override
+                            public Dialog onCreateDialog(Bundle savedInstanceState) {
+                                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                                builder.setMessage(message)
+                                        .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                                            public void onClick(DialogInterface dialog, int which) {
+                                                dialog.dismiss();
+                                            }
+                                        });
+                                return builder.create();
+                            }
+                        };
+                        df.show(getSupportFragmentManager(), "noinfo");
+                        break;
+                    default:
+                        Intent nii = new Intent(EmailListActivity.this, NetworkInfoActivity.class);
+                        startActivity(nii);
                 }
             }
         });
@@ -467,11 +467,11 @@ public class EmailListActivity extends ActionBarActivity implements
                 statusText = R.string.not_started;
                 statusIcon = getResources().getDrawable(android.R.drawable.presence_offline);
         }
-        mNetworkStatus.post(new Runnable() {
+        mNetworkStatusText.post(new Runnable() {
             @Override
             public void run() {
-                mNetworkStatus.setText(statusText);
-                mNetworkStatus.setCompoundDrawablesWithIntrinsicBounds(
+                mNetworkStatusText.setText(statusText);
+                mNetworkStatusText.setCompoundDrawablesWithIntrinsicBounds(
                         statusIcon, null, null, null);
             }
         });
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c238a15..f077f38 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -38,25 +38,51 @@
             android:layout_alignParentBottom="true"
             android:orientation="vertical" >
 
-            <TextView
+            <FrameLayout
                 android:id="@+id/address_book"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/folder_activated_background"
-                android:padding="15dp"
-                android:text="@string/address_book"
-                android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+                android:background="@drawable/folder_activated_background">
 
-            <TextView
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center_vertical"
+                    android:minHeight="48dp"
+                    android:paddingLeft="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingEnd="16dp"
+                    android:layout_marginRight="56dp"
+                    android:layout_marginEnd="56dp"
+                    android:text="@string/address_book"
+                    android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+            </FrameLayout>
+
+            <FrameLayout
                 android:id="@+id/network_status"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@drawable/folder_activated_background"
-                android:drawableLeft="@android:drawable/presence_offline"
-                android:drawablePadding="10dp"
-                android:padding="15dp"
-                android:text="@string/network_status"
-                android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+                android:background="@drawable/folder_activated_background">
+
+                <TextView
+                    android:id="@+id/network_status_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@android:drawable/presence_offline"
+                    android:drawablePadding="10dp"
+                    android:gravity="center_vertical"
+                    android:minHeight="48dp"
+                    android:paddingLeft="16dp"
+                    android:paddingStart="16dp"
+                    android:paddingRight="16dp"
+                    android:paddingEnd="16dp"
+                    android:layout_marginRight="56dp"
+                    android:layout_marginEnd="56dp"
+                    android:text="@string/network_status"
+                    android:textAppearance="?android:attr/textAppearanceMediumInverse" />
+            </FrameLayout>
+
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/listitem_folder.xml b/app/src/main/res/layout/listitem_folder.xml
index a714116..794595c 100644
--- a/app/src/main/res/layout/listitem_folder.xml
+++ b/app/src/main/res/layout/listitem_folder.xml
@@ -8,7 +8,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMediumInverse"
-        android:padding="15dp"
+        android:gravity="center_vertical"
+        android:minHeight="48dp"
+        android:paddingLeft="16dp"
+        android:paddingStart="16dp"
+        android:paddingRight="16dp"
+        android:paddingEnd="16dp"
+        android:layout_marginRight="56dp"
+        android:layout_marginEnd="56dp"
         android:text="Folder Name" />
 
 </RelativeLayout>