diff --git a/xwords4/wince/cemain.c b/xwords4/wince/cemain.c
index ba2dbc15e..7c0422bee 100755
--- a/xwords4/wince/cemain.c
+++ b/xwords4/wince/cemain.c
@@ -2285,6 +2285,46 @@ wince_debugf(XP_UCHAR* format, ...)
     }
 #endif
 } /* wince_debugf */
+
+void
+messageToBuf( UINT message, char* buf, int bufSize )
+{
+    char* str = NULL;
+#define STRCASE(s)   case s : str = #s; break
+    switch( message ) {
+        STRCASE(WM_TIMER);
+        STRCASE(WM_SETCURSOR);
+        STRCASE(WM_NCHITTEST);
+        STRCASE(WM_MOUSEMOVE);
+        STRCASE(WM_SYSKEYDOWN);
+        STRCASE(WM_SYSKEYUP);
+        STRCASE(WM_SYSCHAR);
+        STRCASE(WM_SYSCOMMAND);
+        STRCASE(WM_ENTERMENULOOP);
+        STRCASE(WM_INITMENU);
+        STRCASE(WM_MENUSELECT);
+        STRCASE(WM_COMMAND);
+        STRCASE(WM_SETTEXT);
+        STRCASE(WM_QUERYNEWPALETTE);
+        STRCASE(WM_NCACTIVATE);
+        STRCASE(WM_ACTIVATE);
+        STRCASE(WM_SHOWWINDOW);
+        STRCASE(WM_CTLCOLOREDIT);
+        STRCASE(WM_MOUSEACTIVATE);
+        STRCASE(WM_CTLCOLORBTN);
+        STRCASE(WM_PASTE);
+        STRCASE(WM_WINDOWPOSCHANGING);
+        STRCASE(WM_SETFOCUS);
+        STRCASE(WM_WINDOWPOSCHANGED);
+    default:
+        snprintf( buf, bufSize, "%d", message );
+        return;
+    }
+#undef STRCASE
+    if ( !!str ) {
+        snprintf( buf, bufSize, "%s", str );
+    }
+}
 #endif
 
 XP_U16
@@ -2712,10 +2752,10 @@ ce_util_getUserString( XW_UtilCtxt* uc, XP_U16 stringCode )
 
 #ifndef XWFEATURE_STANDALONE_ONLY
     case STR_LOCALPLAYERS:
-        return (XP_UCHAR*)"Local playrs";
+        return (XP_UCHAR*)"Locl playrs:";
 #endif
     case STR_TOTALPLAYERS:
-        return (XP_UCHAR*)"Player count";
+        return (XP_UCHAR*)"Player count:";
 
     case STRS_VALUES_HEADER:
         return (XP_UCHAR*)"%s counts/values:" XP_CR;
diff --git a/xwords4/wince/cemain.h b/xwords4/wince/cemain.h
index f84f12976..273ac7dfd 100755
--- a/xwords4/wince/cemain.h
+++ b/xwords4/wince/cemain.h
@@ -157,6 +157,7 @@ void ce_drawctxt_update( DrawCtx* dctx, CEAppGlobals* globals );
 
 #ifdef DEBUG
 void logLastError( const char* comment );
+void messageToBuf( UINT message, char* buf, int bufSize );
 #else
 # define logLastError(c)
 #endif
diff --git a/xwords4/wince/xwords4.rc b/xwords4/wince/xwords4.rc
index 27d0fc3b0..73b24edf8 100755
--- a/xwords4/wince/xwords4.rc
+++ b/xwords4/wince/xwords4.rc
@@ -188,12 +188,12 @@ END
 #endif
 
 
-#define LABELS_ROW (NPLAYERS_ROW+ROW_SPACE)
-#define PLAYER_ROW_1 (LABELS_ROW+ROW_SPACE)
+#define LABELS_ROW (NPLAYERS_ROW+ROW_SPACE+3)
+#define PLAYER_ROW_1 (LABELS_ROW+ROW_SPACE_PL)
 #define PLAYER_ROW_2 (PLAYER_ROW_1+ROW_SPACE_PL)
 #define PLAYER_ROW_3 (PLAYER_ROW_2+ROW_SPACE_PL)
 #define PLAYER_ROW_4 (PLAYER_ROW_3+ROW_SPACE_PL)
-#define DICTPICK_ROW (PLAYER_ROW_4+ROW_SPACE)
+#define DICTPICK_ROW (PLAYER_ROW_4+ROW_SPACE+2)
 #define BUTTONS_ROW (DICTPICK_ROW+ROW_SPACE+3)
 #define BUTTON_HT 12
 #define GAMEINFO_HEIGHT (BUTTONS_ROW + BUTTON_HT + 4)
@@ -211,13 +211,14 @@ BEGIN
                     WS_VSCROLL | WS_TABSTOP
     
 #endif
-    LTEXT           "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,40,8
-    COMBOBOX        IDC_NPLAYERSCOMBO,45,NPLAYERS_ROW,18,58,CBS_DROPDOWNLIST | 
+    LTEXT           "",IDC_TOTAL_LABEL,LEFT_COL,NPLAYERS_ROW,43,8
+    COMBOBOX        IDC_NPLAYERSCOMBO,46,NPLAYERS_ROW,17,58,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
 
-    PUSHBUTTON      "J",GIJUGGLE_BUTTON,65,NPLAYERS_ROW,12,12
+    // "R" for rearrange.  Go to J if no change becomes possible.
+    PUSHBUTTON      "R",GIJUGGLE_BUTTON,65,NPLAYERS_ROW,12,12
 
-    PUSHBUTTON      "Preferences...",OPTIONS_BUTTON,79,NPLAYERS_ROW,51,12
+    PUSHBUTTON      "Preferences...",OPTIONS_BUTTON,80,NPLAYERS_ROW,50,12
     LTEXT           "Name",IDC_STATIC,GAME_NAMELABEL_LEFT,
                     LABELS_ROW,19,8,SS_NOPREFIX
     LTEXT           "Robot",IDC_STATIC,GAME_ROBOTLABEL_LEFT,LABELS_ROW,20,8
@@ -372,10 +373,10 @@ BEGIN
     CONTROL         "Smart robot",IDC_CHECKSMARTROBOT,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,8,20,90,10
     CONTROL         "Disallow hints",IDC_CHECKNOHINTS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,8,35,54,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,8,35,60,10
 #ifdef XWFEATURE_SEARCHLIMIT
     CONTROL         "Hint limits",IDC_CHECKHINTSLIMITS,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,64,35,50,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,69,35,50,10
 #endif
 
     CONTROL         "Timer on (minutes)",TIMER_CHECK,"Button",