diff --git a/xwords4/android/XWords4/res/layout/game_config.xml b/xwords4/android/XWords4/res/layout/game_config.xml
index d470f284b..904e94406 100644
--- a/xwords4/android/XWords4/res/layout/game_config.xml
+++ b/xwords4/android/XWords4/res/layout/game_config.xml
@@ -19,35 +19,33 @@
    android:layout_height="fill_parent"
    android:orientation="vertical">
 
-  <TextView
-     android:layout_width="fill_parent" android:layout_height="wrap_content"
-     android:layout_weight="0"
-     android:paddingBottom="4dip"
-     android:text="@string/player_label"
-     />
+  <LinearLayout android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
 
-  <EditText
-     android:layout_width="fill_parent" android:layout_height="wrap_content"
-     android:id="@+id/player_1_name"
-     />
+    <TextView android:layout_height="wrap_content"
+              android:layout_width="wrap_content"
+              android:layout_marginLeft="20dip"
+              android:layout_marginRight="20dip"
+              android:text="@string/players_label"
+              android:gravity="left"
+              android:textAppearance="?android:attr/textAppearanceMedium"
+              />
 
-  <TextView
-     android:layout_width="fill_parent" android:layout_height="wrap_content"
-     android:layout_weight="0"
-     android:paddingBottom="4dip"
-     android:text="@string/player_label"
-     />
+    <Button android:id="@+id/add_player"
+            android:layout_width="wrap_content" 
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:text="@string/button_add_player" 
+            />
+  </LinearLayout>
 
-  <EditText
-     android:layout_width="fill_parent" android:layout_height="wrap_content"
-     android:id="@+id/player_2_name"
-     />
-
-  <!--Button android:id="@+id/game_config_open"
-          android:layout_width="fill_parent" 
-          android:layout_height="wrap_content" 
-          android:layout_gravity="right"
-          android:text="@string/game_config_open" /-->
+  <!-- players -->
+  <ListView android:id="@id/android:list"
+            android:layout_width="fill_parent" 
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            android:drawSelectorOnTop="false"/>
 
   <Button android:id="@+id/game_config_done"
           android:layout_width="fill_parent" 
diff --git a/xwords4/android/XWords4/res/layout/player_edit.xml b/xwords4/android/XWords4/res/layout/player_edit.xml
new file mode 100644
index 000000000..c019b041b
--- /dev/null
+++ b/xwords4/android/XWords4/res/layout/player_edit.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+     
+     http://www.apache.org/licenses/LICENSE-2.0
+     
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="fill_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+  <CheckBox android:id="@+id/remote_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/remote_label"
+            />
+
+  <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:text="@string/player_label"
+            android:gravity="left"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+  
+  <EditText android:id="@+id/player_edit"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:scrollHorizontally="true"
+            android:autoText="false"
+            android:capitalize="none"
+            android:gravity="fill_horizontal"
+            android:textAppearance="?android:attr/textAppearanceMedium" 
+            />
+
+  <CheckBox android:id="@+id/robot_check"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/robot_label"
+            />
+
+  <TextView android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:text="@string/password_label"
+            android:gravity="left"
+            android:textAppearance="?android:attr/textAppearanceMedium" 
+            />
+  
+  <EditText android:id="@+id/password_edit"
+            android:layout_height="wrap_content"
+            android:layout_width="fill_parent"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:scrollHorizontally="true"
+            android:autoText="false"
+            android:capitalize="none"
+            android:gravity="fill_horizontal"
+            android:password="true"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            />
+
+</LinearLayout>