--- a/res/layout/wizard_account.xml	Sun Mar 07 07:31:24 2010 +0100
+++ b/res/layout/wizard_account.xml	Sun Mar 07 21:33:13 2010 +0100
@@ -1,27 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_height="fill_parent" android:layout_width="fill_parent"
+    android:orientation="vertical"
     >
-    <TextView android:id="@+id/wizard_account_tv"
-	android:layout_width="fill_parent" android:layout_height="wrap_content"
-	android:layout_alignParentTop="true"
-	android:text="@string/account_wizard_text1"
-	android:textSize="18sp"
-	android:paddingBottom="10dip" />
-    <RadioGroup android:layout_width="fill_parent" android:layout_height="wrap_content"
-	android:layout_below="@id/wizard_account_tv" >
-	<RadioButton android:id="@+id/configure_account"
-	    android:layout_width="fill_parent" android:layout_height="wrap_content"
-	    android:text="@string/account_wizard_configure_account"/>
-	<RadioButton android:id="@+id/create_account"
-	    android:layout_width="fill_parent" android:layout_height="wrap_content"
-	    android:text="@string/account_wizard_create_account"/>
-	
-    </RadioGroup>
+    <ScrollView android:layout_height="fill_parent" android:layout_width="fill_parent" 
+	android:layout_weight="1">
+	<LinearLayout android:layout_height="wrap_content" android:layout_width="fill_parent"
+	    android:orientation="vertical" >
+	    <ImageView android:id="@+id/logo"
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:layout_marginTop="15dp"
+		android:layout_marginBottom="30dp"
+		android:src="@drawable/logo"/>
+	    <TextView
+		android:layout_width="fill_parent" android:layout_height="wrap_content"
+		android:text="@string/account_wizard_text1"
+		android:textSize="18sp"
+		android:paddingBottom="10dip" />
+	    <RadioGroup android:id="@+id/configure_group"
+		android:layout_width="fill_parent" android:layout_height="wrap_content" >
+		<RadioButton android:id="@+id/configure_account"
+		    android:layout_width="fill_parent" android:layout_height="wrap_content"
+		    android:text="@string/account_wizard_configure_account"/>
+		<RadioButton android:id="@+id/create_account"
+		    android:layout_width="fill_parent" android:layout_height="wrap_content"
+		    android:text="@string/account_wizard_create_account"/>
+	    </RadioGroup>
+	</LinearLayout>
+    </ScrollView>
 
     <RelativeLayout
 	android:layout_alignParentBottom="true"
-	android:gravity="right" 
+	android:gravity="right|center_vertical"
 	android:layout_height="wrap_content"
 	android:layout_width="fill_parent"
 	android:background="@drawable/bottombar" >
@@ -34,7 +44,8 @@
 	    android:drawableRight="@drawable/button_indicator_next"
 	    android:layout_alignParentRight="true"
 	    android:layout_centerVertical="true"
+	    android:enabled="false"
 	    />
     </RelativeLayout>
 
-</RelativeLayout>
+</LinearLayout>