diff --git a/standup-timer/res/layout-land/main.xml b/standup-timer/res/layout-land/main.xml
index 3759d4e..f639adb 100644
--- a/standup-timer/res/layout-land/main.xml
+++ b/standup-timer/res/layout-land/main.xml
@@ -7,9 +7,11 @@
    <TableRow android:gravity="center">
       <TextView android:text="@string/number_of_participants" android:padding="3dp" android:textSize="17dp"/>
       <View android:layout_width="30dp" android:layout_height="1dp" />
-      <EditText android:id="@+id/num_participants" android:digits="0123456789"
-         android:inputType="phone" android:padding="10dp" android:layout_width="200dp"
-         android:gravity="center" />
+      <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content">
+         <EditText android:id="@+id/num_participants" android:digits="0123456789"
+            android:inputType="phone" android:layout_width="60dp" android:layout_height="wrap_content"
+            android:gravity="center" />
+      </LinearLayout>
    </TableRow>
 
    <TableRow android:gravity="center" android:paddingTop="10dp">
@@ -23,7 +25,7 @@
       <TextView android:text="@string/team" android:padding="3dp" android:textSize="17dp"/>
       <View android:layout_width="30dp" android:layout_height="1dp" />
       <Spinner android:id="@+id/team_names" android:drawSelectorOnTop="true"
-         android:prompt="@string/team" android:padding="10dp" />
+         android:prompt="@string/team" android:layout_width="wrap_content" />
    </TableRow>
 
    <TableRow android:gravity="center" android:paddingTop="10dp">
diff --git a/standup-timer/res/layout/main.xml b/standup-timer/res/layout/main.xml
index e5406d4..82f4bc4 100644
--- a/standup-timer/res/layout/main.xml
+++ b/standup-timer/res/layout/main.xml
@@ -23,7 +23,8 @@
 
       <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content"
          android:layout_marginTop="5dp" android:id="@+id/meeting_length_container"
-         android:layout_marginLeft="100dp" android:layout_marginRight="100dp" />
+         android:layout_marginLeft="100dp" android:layout_marginRight="100dp"
+         android:gravity="center" />
 
       <TextView android:text="@string/team"
          android:layout_width="wrap_content" android:layout_height="wrap_content"
diff --git a/standup-timer/src/net/johnpwood/android/standuptimer/ConfigureStandupTimer.java b/standup-timer/src/net/johnpwood/android/standuptimer/ConfigureStandupTimer.java
index c18843c..99973f1 100644
--- a/standup-timer/src/net/johnpwood/android/standuptimer/ConfigureStandupTimer.java
+++ b/standup-timer/src/net/johnpwood/android/standuptimer/ConfigureStandupTimer.java
@@ -165,7 +165,7 @@ private View createMeetingLengthTextBox() {
         meetingLengthEditText.setGravity(Gravity.CENTER);
         meetingLengthEditText.setKeyListener(new DigitsKeyListener());
         meetingLengthEditText.setRawInputType(InputType.TYPE_CLASS_PHONE);
-        meetingLengthEditText.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+        meetingLengthEditText.setLayoutParams(new LayoutParams(dipsToPixels(60), LayoutParams.WRAP_CONTENT));
         meetingLengthEditText.setText(Integer.toString(meetingLength));
 
         meetingLengthSpinner = null;
@@ -310,6 +310,10 @@ private int getSpinnerPositionFromMeetingLength(int meetingLength) {
         return pos;
     }
 
+    private int dipsToPixels(int dips) {
+        return (int) (dips * getResources().getDisplayMetrics().density);
+    }
+
     protected int getMeetingLength() {
         return meetingLength;
     }