--- a/res/layout/create_account.xml	Fri Aug 10 05:53:51 2012 +0200
+++ b/res/layout/create_account.xml	Sat Sep 22 03:21:58 2012 +0200
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical">
-	<LinearLayout android:orientation="vertical"
-		android:layout_width="fill_parent" android:layout_height="fill_parent"
-		android:padding="10dip">
-		<TextView android:id="@+id/create_account_label_username"
+	android:orientation="vertical" >
+	
+	<ScrollView android:layout_width="fill_parent" android:layout_height="0dip"
+	    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/create_account_username" style="@style/Label" />
 		<EditText android:id="@+id/create_account_username"
@@ -14,31 +22,42 @@
 			android:singleLine="true"
 			android:hint="beem@beem-project.com "
 			android:contentDescription="@string/create_account_username"/>
-		<TextView android:id="@+id/create_account_label_password"
+		<TextView
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:text="@string/create_account_password" style="@style/Label" />
 		<EditText android:id="@+id/create_account_password"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:inputType="textPassword" android:imeOptions="actionNext"
-			android:password="true" android:singleLine="true"
+			android:singleLine="true"
 			android:contentDescription="@string/create_account_password"/>
-		<TextView android:id="@+id/create_account_label_confirm_password"
+		<TextView
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:text="@string/create_account_confirm_password" style="@style/Label" />
 		<EditText android:id="@+id/create_account_confirm_password"
 			android:layout_width="fill_parent" android:layout_height="wrap_content"
 			android:inputType="textPassword" android:imeOptions="actionNext"
-			android:password="true" android:singleLine="true"
+			android:singleLine="true"
 			android:contentDescription="@string/create_account_confirm_password"/>
-		<View android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:layout_weight="1" android:layout_marginBottom="18dp" />
-		<Button android:id="@+id/create_account_button"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:text="@string/button_create_account"
-			android:layout_gravity="bottom" />
-		<Button android:id="@+id/create_account_login_button"
-			android:layout_width="fill_parent" android:layout_height="wrap_content"
-			android:text="@string/button_create_login_account"
-			android:layout_gravity="bottom" />
+
 	</LinearLayout>
-</ScrollView>
+	</ScrollView>
+	
+	<RelativeLayout
+	android:gravity="right|center_vertical"
+	android:layout_height="wrap_content"
+	android:layout_width="fill_parent"
+	android:background="@drawable/bottombar" >
+	<Button
+	    android:id="@+id/next"
+	    android:text="@string/Continue"
+	    android:minWidth="100dp"
+	    android:layout_height="wrap_content"
+	    android:layout_width="wrap_content"
+	    android:drawableRight="@drawable/button_indicator_next"
+	    android:layout_alignParentRight="true"
+	    android:layout_centerVertical="true"
+	    android:enabled="false"
+	    />
+    </RelativeLayout>
+	
+</LinearLayout>