diff --git a/wince/xwords4.rc b/wince/xwords4.rc
index ffcdf88de..23886ebfb 100755
--- a/wince/xwords4.rc
+++ b/wince/xwords4.rc
@@ -126,8 +126,9 @@ BEGIN
 END
 
 #define ROW_SPACE 15
+#define LEFT_COL 2
 #ifdef XWFEATURE_STANDALONE_ONLY
-# define GAME_NAME_LEFT 0
+# define GAME_NAME_LEFT LEFT_COL
 # define GAME_ROBOT_LEFT 81
 # define GAME_PWD_LEFT 105
 # define NPLAYERS_ROW 3
@@ -152,7 +153,7 @@ END
 #define BUTTONS_ROW (DICTPICK_ROW+ROW_SPACE+3)
 #define GAMEINFO_HEIGHT (BUTTONS_ROW+ROW_SPACE+2)
 
-IDD_GAMEINFO DIALOG DISCARDABLE  0, 0, 135, GAMEINFO_HEIGHT 
+IDD_GAMEINFO DIALOG DISCARDABLE  0, 0, 133, GAMEINFO_HEIGHT 
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Game info"
 FONT 8, "System"
@@ -162,13 +163,13 @@ BEGIN
     COMBOBOX        IDC_ROLECOMBO,45,SERVERROLE_ROW,50,58,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
 #endif
-    LTEXT           "local players",IDC_LOCALP_LABEL,0,NPLAYERS_ROW,40,8
+    LTEXT           "local players",IDC_LOCALP_LABEL,LEFT_COL,NPLAYERS_ROW,40,8
     /* capitalizing total truncates the things!!! */
-    LTEXT           "total players",IDC_TOTAL_LABEL,0,NPLAYERS_ROW,40,8
+    LTEXT           "total players",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,40,8
     COMBOBOX        IDC_NPLAYERSCOMBO,45,NPLAYERS_ROW,21,58,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "Preferences...",OPTIONS_BUTTON,72,NPLAYERS_ROW,56,12
-    LTEXT           "Remote",IDC_REMOTE_LABEL,0,LABELS_ROW,25,8,SS_NOPREFIX
+    LTEXT           "Remote",IDC_REMOTE_LABEL,LEFT_COL,LABELS_ROW,25,8,SS_NOPREFIX
     LTEXT           "Name",IDC_STATIC,GAME_NAMELABEL_LEFT,
                     LABELS_ROW,19,8,SS_NOPREFIX
     LTEXT           "Robot",IDC_STATIC,77,LABELS_ROW,20,8
@@ -207,7 +208,7 @@ BEGIN
     EDITTEXT        PASS_EDIT4,GAME_PWD_LEFT,PLAYER_ROW_4,23,12,
                     ES_PASSWORD | ES_AUTOHSCROLL
 
-    LTEXT           "Dictionary:",IDC_STATIC,0,DICTPICK_ROW,36,8,SS_NOPREFIX
+    LTEXT           "Dictionary:",IDC_STATIC,LEFT_COL,DICTPICK_ROW,36,8,SS_NOPREFIX
     PUSHBUTTON      "Dictionary picker",IDC_DICTBUTTON,43,DICTPICK_ROW,85,14
     DEFPUSHBUTTON   "OK",IDOK,29,BUTTONS_ROW,31,14
     DEFPUSHBUTTON   "Cancel",IDCANCEL,70,BUTTONS_ROW,31,14
@@ -222,15 +223,21 @@ BEGIN
                     ES_WANTRETURN | WS_VSCROLL
 END
 
-IDD_ASKBLANK DIALOG DISCARDABLE  0, 0, 111, 121
+IDD_ASKBLANK DIALOG DISCARDABLE  0, 0, 131, 90
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Blank tile"
+CAPTION "Tile picker"
 FONT 8, "System"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,19,89,39,14
-    LTEXT           "Enter a letter for this blank tile",IDC_STATIC,13,15,63,
-                    18
-    LISTBOX         BLANKFACE_LIST,75,19,25,83,LBS_NOINTEGRALHEIGHT | 
+    DEFPUSHBUTTON   "OK",IDOK,70,75,20,14
+    LTEXT           "Enter a letter for this blank tile.",IDC_BPICK,8,8,63,18
+#ifdef FEATURE_TRAY_EDIT
+    DEFPUSHBUTTON   "Pick all!",IDC_PICKALL,10,75,39,14
+    LTEXT           "Pick a tile for your tray.",IDC_CPICK,8,8,63,18
+
+    EDITTEXT        IDC_PICKMSG,8,28,80,30,ES_MULTILINE | ES_READONLY
+
+#endif
+    LISTBOX         BLANKFACE_LIST,100,5,25,83,LBS_NOINTEGRALHEIGHT | 
                     WS_VSCROLL | WS_TABSTOP
 END
 
@@ -245,7 +252,7 @@ BEGIN
     LTEXT           "",IDC_PWDLABEL,18,13,67,24
 END
 
-IDD_OPTIONSDLG DIALOG DISCARDABLE  0, 0, 120, 100
+IDD_OPTIONSDLG DIALOG DISCARDABLE  0, 0, 120, 115
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
 CAPTION "Preferences"
 FONT 8, "System"
@@ -272,9 +279,14 @@ BEGIN
     LTEXT           "Phonies:",PHONIES_LABEL,8,67,28,8
     COMBOBOX        PHONIES_COMBO,38,67,67,58,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
-
-    DEFPUSHBUTTON   "OK",IDOK,9,85,38,14
-    PUSHBUTTON      "Cancel",IDCANCEL,70,85,39,14
+#ifdef FEATURE_TRAY_EDIT
+    CONTROL         "Pick tiles face-up", IDC_PICKTILES, "Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,8,82,90,10
+#else
+    foo
+#endif
+    DEFPUSHBUTTON   "OK",IDOK,9,100,38,14
+    PUSHBUTTON      "Cancel",IDCANCEL,70,100,39,14
 END