diff --git a/res/layout/browser_add_bookmark_content.xml b/res/layout/browser_add_bookmark_content.xml
index 8b28011..6ee7a5a 100644
--- a/res/layout/browser_add_bookmark_content.xml
+++ b/res/layout/browser_add_bookmark_content.xml
@@ -102,7 +102,7 @@
         android:layout_height="wrap_content"
         android:stretchColumns="1"
         android:shrinkColumns="1"
-        android:paddingTop="20dip"
+        android:paddingTop="10dip"
         android:paddingLeft="20dip"
         android:paddingRight="20dip" >
       <TableRow>
@@ -110,7 +110,7 @@
             android:id="@+id/titleText"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
-            android:layout_marginBottom="40dip"
+            android:layout_marginBottom="30dip"
             android:text="@string/name"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -134,7 +134,7 @@
             android:layout_width="wrap_content"
             android:text="@string/location"
             android:gravity="left"
-            android:layout_marginBottom="40dip"
+            android:layout_marginBottom="20dip"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <EditText
diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml
index 3badd17..f0230bd 100644
--- a/res/values/dimensions.xml
+++ b/res/values/dimensions.xml
@@ -24,7 +24,9 @@
     <dimen name="max_tab_width">300dp</dimen>
     <dimen name="bookmarkThumbnailWidth">90dip</dimen>
     <dimen name="bookmarkThumbnailHeight">80dip</dimen>
-    <dimen name="folder_selector_height">230dip</dimen>
+    <!-- Height determined by measuring the TableLayout in
+        browser_add_bookmark_content and matching that. -->
+    <dimen name="folder_selector_height">181dip</dimen>
     <dimen name="widgetItemMinHeight">48dip</dimen>
     <dimen name="favicon_size">16dip</dimen>
     <dimen name="favicon_padded_size">20dip</dimen>
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index 9a7227c..a88e8e7 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -431,7 +431,7 @@
                         BrowserContract.Bookmarks.TITLE
                 };
                 return new CursorLoader(this,
-                        BrowserContract.Bookmarks.CONTENT_URI,
+                        BookmarkUtils.getBookmarksUri(this),
                         projection,
                         BrowserContract.Bookmarks._ID + " = "
                                 + args.getLong(BrowserContract.Bookmarks._ID),
@@ -445,7 +445,7 @@
                         BrowserContract.Bookmarks.IS_FOLDER
                 };
                 return new CursorLoader(this,
-                        BrowserContract.Bookmarks.CONTENT_URI,
+                        BookmarkUtils.getBookmarksUri(this),
                         projection,
                         BrowserContract.Bookmarks.IS_FOLDER + " != 0",
                         null,
@@ -472,7 +472,7 @@
                         BrowserContract.Bookmarks.PARENT
                 };
                 return new CursorLoader(this,
-                        BrowserContract.Bookmarks.CONTENT_URI,
+                        BookmarkUtils.getBookmarksUri(this),
                         projection,
                         BrowserContract.Bookmarks.IS_FOLDER + " = 0",
                         null,
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 0961f80..8ca151a 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -1089,8 +1089,7 @@
                 break;
             case FILE_SELECTED:
                 // Chose a file from the file picker.
-                if (null == mUploadHandler)
-                    break;
+                if (null == mUploadHandler) break;
                 mUploadHandler.onResult(resultCode, intent);
                 break;
             case AUTOFILL_SETUP: