diff -r 62f096393033 -r 8e33a89c21a3 res/layout/changestatus.xml
--- a/res/layout/changestatus.xml	Wed Nov 11 19:54:25 2009 +0100
+++ b/res/layout/changestatus.xml	Thu Nov 12 02:26:03 2009 +0100
@@ -1,30 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical" android:layout_width="fill_parent"
-	android:layout_height="fill_parent" android:padding="6px">
-
-	<Spinner android:id="@+id/ChangeStatusSpinner"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:drawSelectorOnTop="true" />
-
-	<TextView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:text="@string/ChangeStatusText"
-		android:textColor="@color/blue_sky" />
-
-	<EditText android:id="@+id/ChangeStatusText"
-		android:inputType="textShortMessage|textAutoCorrect"
-		android:imeOptions="actionDone" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" />
-
-	<LinearLayout android:orientation="horizontal"
-		android:layout_width="fill_parent" android:layout_height="wrap_content">
-
-		<Button android:id="@+id/ChangeStatusOk" android:layout_width="fill_parent"
-			android:layout_height="fill_parent" android:layout_weight="1"
-			android:text="@string/OkButton" />
-
-		<Button android:id="@+id/ChangeStatusClear"
-			android:layout_width="fill_parent" android:layout_height="fill_parent"
-			android:layout_weight="1" android:text="@string/ClearButton" />
-	</LinearLayout>
-</LinearLayout>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<RelativeLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:padding="10dip">
+		<TextView android:id="@+id/ChangeStatusTypeLabel"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:text="@string/ChangeStatusType" style="@style/Label" />
+		<Spinner android:id="@+id/ChangeStatusSpinner"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:drawSelectorOnTop="true" android:layout_below="@id/ChangeStatusTypeLabel" />
+		<TextView android:id="@+id/ChangeStatusMessageLabel"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:text="@string/ChangeStatusMessage" style="@style/Label"
+			android:layout_below="@id/ChangeStatusSpinner" />
+		<EditText android:id="@+id/ChangeStatusMessage"
+			android:inputType="textShortMessage|textAutoCorrect"
+			android:imeOptions="actionDone" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" android:layout_below="@id/ChangeStatusMessageLabel"
+			android:layout_marginBottom="18dp" />
+		<LinearLayout android:id="@+id/ChangeStatusButtons"
+			android:layout_width="fill_parent" android:layout_height="wrap_content"
+			android:orientation="horizontal" android:layout_below="@id/ChangeStatusMessage"
+			android:layout_alignParentBottom="true">
+			<Button android:id="@+id/ChangeStatusOk" android:layout_width="fill_parent"
+				android:layout_height="wrap_content" android:layout_weight="1"
+				android:text="@string/UpdateButton" android:textStyle="bold"
+				android:textSize="18sp" android:textColor="#333333" />
+			<Button android:id="@+id/ChangeStatusClear"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"
+				android:layout_weight="1" android:text="@string/ClearButton"
+				android:textStyle="bold" android:textColor="#333333"
+				android:textSize="18sp" />
+		</LinearLayout>
+	</RelativeLayout>
+</ScrollView>