diff --git a/android/BOINC/res/layout/dialog_list_cbitem.xml b/android/BOINC/res/layout/dialog_list_cbitem.xml
index 605efaff50..07accc33d8 100644
--- a/android/BOINC/res/layout/dialog_list_cbitem.xml
+++ b/android/BOINC/res/layout/dialog_list_cbitem.xml
@@ -17,10 +17,14 @@
   You should have received a copy of the GNU Lesser General Public License
   along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/checkbox"
- 	android:layout_width="wrap_content"
- 	android:layout_height="wrap_content"
-	android:singleLine="true"
-	android:textColor="@color/black"
-	android:background="@color/white_smoke" />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+        
+    <CheckBox android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/checkbox"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/black" />
+</LinearLayout>
diff --git a/android/BOINC/res/layout/main.xml b/android/BOINC/res/layout/main.xml
index 7a3bf969ac..7e604b51af 100644
--- a/android/BOINC/res/layout/main.xml
+++ b/android/BOINC/res/layout/main.xml
@@ -32,7 +32,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/main_entry"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
+    android:layout_height="fill_parent"
+    android:orientation="horizontal" >
     
     <!-- tabbed layout, for normal manager operation -->
 	<TabHost 
@@ -148,8 +149,7 @@
 	        android:layout_marginRight="20dip"
 	        android:gravity="center"
 	        android:text="@string/main_error_long"
-	        android:textAppearance="?android:attr/textAppearanceMedium"
-	        android:onClick="reinitClient" />
+	        android:textAppearance="?android:attr/textAppearanceMedium"/>
 	
 	</LinearLayout>
 </LinearLayout>
diff --git a/android/BOINC/res/layout/prefs_layout_dialog_selection.xml b/android/BOINC/res/layout/prefs_layout_dialog_selection.xml
index f8988225ad..31a9969f1f 100644
--- a/android/BOINC/res/layout/prefs_layout_dialog_selection.xml
+++ b/android/BOINC/res/layout/prefs_layout_dialog_selection.xml
@@ -18,10 +18,9 @@
   along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    android:background="@color/white_smoke" >
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
     
     <TextView
      	android:id="@+id/title"
@@ -30,46 +29,56 @@
     	android:singleLine="true"
     	android:textColor="@color/black"
      	android:textAppearance="?android:attr/textAppearanceMedium"
-		android:layout_marginBottom="10dp"
 		android:padding="10dp"
 		android:background="@drawable/shape_light_blue_background"
 		android:text="@string/prefs_dialog_title_selection" />
     
-    <ListView 
-     	android:id="@+id/selection"
-        android:layout_width="220dp"
-        android:layout_height="wrap_content"/>
-    
-    <LinearLayout 
+    <RelativeLayout 
     	android:layout_width="220dp"
-    	android:layout_height="wrap_content"
-    	android:orientation="horizontal">
-    	
-        <Button
-			android:id="@+id/cancel"
-			android:layout_width="100dp"
-			android:layout_height="wrap_content"
-			android:padding="5dp"
-			android:clickable="true"
-			android:layout_margin="5dp"
-			android:background="@drawable/shape_button_blue"
-			android:textColor="@color/white_smoke"
-			android:textAppearance="?android:attr/textAppearanceMedium" 
-			android:text="@string/confirm_cancel"
-			android:layout_weight="0.5"/> 
-    	
-        <Button
-			android:id="@+id/confirm"
-			android:layout_width="100dp"
-			android:layout_height="wrap_content"
-			android:padding="5dp"
-			android:clickable="true"
-			android:layout_margin="5dp"
-			android:background="@drawable/shape_button_red"
-			android:textColor="@color/white_smoke"
-			android:textAppearance="?android:attr/textAppearanceMedium"
-			android:text="@string/prefs_submit_button"
-			android:layout_weight="0.5" /> 
-        
-    </LinearLayout>  
+   		android:layout_height="fill_parent">
+	    
+	    <LinearLayout
+			android:id="@+id/buttonWrapper"
+	    	android:layout_width="fill_parent"
+	    	android:layout_height="wrap_content"
+	    	android:orientation="horizontal"
+	    	android:layout_alignParentBottom="true">
+	    	
+	        <Button
+				android:id="@+id/cancel"
+				android:layout_width="100dp"
+				android:layout_height="wrap_content"
+				android:padding="5dp"
+				android:clickable="true"
+				android:layout_margin="5dp"
+				android:background="@drawable/shape_button_blue"
+				android:textColor="@color/white_smoke"
+				android:textAppearance="?android:attr/textAppearanceMedium" 
+				android:text="@string/confirm_cancel"
+				android:layout_weight="0.5"/> 
+	    	
+	        <Button
+				android:id="@+id/confirm"
+				android:layout_width="100dp"
+				android:layout_height="wrap_content"
+				android:padding="5dp"
+				android:clickable="true"
+				android:layout_margin="5dp"
+				android:background="@drawable/shape_button_red"
+				android:textColor="@color/white_smoke"
+				android:textAppearance="?android:attr/textAppearanceMedium"
+				android:text="@string/prefs_submit_button"
+				android:layout_weight="0.5" /> 
+	        
+	    </LinearLayout>  
+    
+	    <ListView 
+	     	android:id="@+id/selection"
+	        android:layout_width="fill_parent"
+	        android:layout_height="wrap_content"
+	        android:layout_alignParentTop="true"
+	        android:layout_above="@+id/buttonWrapper"/>
+    
+    </RelativeLayout>
+    
 </LinearLayout>
\ No newline at end of file