diff --git a/xwords4/wasm/Makefile b/xwords4/wasm/Makefile
index 3575489f7..662a354d1 100644
--- a/xwords4/wasm/Makefile
+++ b/xwords4/wasm/Makefile
@@ -72,7 +72,7 @@ main.html: ${INPUTS} Makefile shell_minimal.html
 		--preload-file assets_dir --shell-file shell_minimal.html \
 		-s USE_SDL_TTF=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' \
 		-s "EXTRA_EXPORTED_RUNTIME_METHODS=['ccall']" \
-		-s EXPORTED_FUNCTIONS='["_main", "_button", "_newgame", "_gotMQTTMsg", "_jscallback", "_onDlgButton", "_MQTTConnectedChanged"]' \
+		-s EXPORTED_FUNCTIONS='["_main", "_gotMQTTMsg", "_jscallback", "_onDlgButton", "_MQTTConnectedChanged"]' \
 		-s WASM=1 \
 		${INPUTS} -o $@
 
diff --git a/xwords4/wasm/main.c b/xwords4/wasm/main.c
index d555d1e8a..f21d09177 100644
--- a/xwords4/wasm/main.c
+++ b/xwords4/wasm/main.c
@@ -59,6 +59,29 @@
 #define BUTTON_OK "OK"
 #define BUTTON_CANCEL "Cancel"
 
+#define BUTTONS_ID_GAME "game_buttons"
+#define BUTTONS_ID_DEVICE "device_buttons"
+
+#define BUTTON_HINTDOWN "Prev Hint"
+#define BUTTON_HINTUP "Next Hint"
+#define BUTTON_TRADE "Trade"
+#define BUTTON_STOPTRADE "Cancel Trade"
+#define BUTTON_COMMIT "Commit"
+#define BUTTON_FLIP "Flip"
+#define BUTTON_UNDO "Undo"
+#define BUTTON_REDO "Redo"
+#define BUTTON_VALS "Vals"
+#define BUTTON_EXIT "Quit"
+
+#define BUTTON_GAME_NEW "New Game"
+#define BUTTON_GAME_OPEN "Open Game"
+#define BUTTON_GAME_RENAME "Rename Game"
+#define BUTTON_GAME_DELETE "Delete Game"
+
+
+#define MAX_BUTTONS 20          /* not sure what's safe here */
+
+
 typedef void (*AlertProc)(void* closure, const char* button);
 
 /* typedef struct _Buttons { */
@@ -129,6 +152,20 @@ EM_JS(bool, getChecked, (const char* id), {
         return box.checked;
     });
 
+EM_JS(void, setButtons, (const char* id, const char** bstrs,
+                         AlertProc proc, void* closure), {
+          var buttons = [];
+          for ( let ii = 0; ; ++ii ) {
+              const mem = HEAP32[(bstrs + (ii * 4)) >> 2];
+              if ( 0 == mem ) {
+                  break;
+              }
+              const str = UTF8ToString(mem);
+              buttons.push(str);
+          }
+          setDivButtons(UTF8ToString(id), buttons, proc, closure);
+    });
+
 static void updateScreen( Globals* globals, bool doSave );
 
 typedef void (*ConfirmProc)( void* closure, bool confirmed );
@@ -200,11 +237,109 @@ send_msg( XWEnv xwe, const XP_U8* buf, XP_U16 len,
 }
 
 static void
-updateTradeButton( Globals* globals )
+doExit( Globals* globals )
 {
-    XP_Bool inTrade = board_inTrade( globals->game.board, NULL );
-    const char* text = inTrade ? "Cancel trade" : "Trade";
-    setButtonText( "trade", text );
+    call_alert( "Control passed to another tab" );
+    XP_MEMSET( globals, 0, sizeof(*globals) ); /* stop everything :-) */
+    // emscripten_cancel_main_loop(); <-- does nothing
+}
+
+static void
+onGameButton( void* closure, const char* button )
+{
+    if ( !!button ) {
+        Globals* globals = (Globals*)closure;
+
+        XP_Bool draw = XP_FALSE;
+        BoardCtxt* board = globals->game.board;
+        XP_Bool redo;
+
+        if ( 0 == strcmp(button, BUTTON_HINTDOWN ) ) {
+            draw = board_requestHint( board, NULL, XP_TRUE, &redo );
+        } else if ( 0 == strcmp(button, BUTTON_HINTUP) ) {
+            draw = board_requestHint( board, NULL, XP_FALSE, &redo );
+        } else if ( 0 == strcmp(button, BUTTON_TRADE ) ) {
+            draw = board_beginTrade( board, NULL );
+        } else if ( 0 == strcmp(button, BUTTON_STOPTRADE ) ) {
+            draw = board_endTrade( board );
+        } else if ( 0 == strcmp(button, BUTTON_COMMIT) ) {
+            draw = board_commitTurn( board, NULL, XP_FALSE, XP_FALSE, NULL );
+        } else if ( 0 == strcmp(button, BUTTON_FLIP) ) {
+            draw = board_flip( board );
+        } else if ( 0 == strcmp(button, BUTTON_REDO) ) {
+            draw = board_redoReplacedTiles( board, NULL )
+                || board_replaceTiles( board, NULL );
+        } else if ( 0 == strcmp(button, BUTTON_VALS) ) {
+            globals->cp.tvType = (globals->cp.tvType + 1) % TVT_N_ENTRIES;
+            draw = board_prefsChanged( board, &globals->cp );
+        } else if ( 0 == strcmp(button, BUTTON_EXIT) ) {
+            doExit( globals );
+        }
+
+        if ( draw ) {
+            updateScreen( globals, true );
+        }
+    }
+}
+
+static void
+updateGameButtons( Globals* globals )
+{
+    GameStateInfo gsi;
+    game_getState( &globals->game, NULL, &gsi );
+
+    const char* buttons[MAX_BUTTONS];
+    int cur = 0;
+
+    if ( gsi.canHint ) {
+        buttons[cur++] = BUTTON_HINTDOWN;
+        buttons[cur++] = BUTTON_HINTUP;
+    }
+
+    if ( gsi.inTrade ) {
+        buttons[cur++] = BUTTON_STOPTRADE;
+    } else if ( gsi.canTrade ) {
+        buttons[cur++] = BUTTON_TRADE;
+    }
+    buttons[cur++] = BUTTON_COMMIT;
+    buttons[cur++] = BUTTON_FLIP;
+
+    if ( gsi.canUndo ) {
+        buttons[cur++] = BUTTON_UNDO;
+    } else if ( gsi.canRedo ) {
+        buttons[cur++] = BUTTON_REDO;
+    }
+
+    buttons[cur++] = BUTTON_VALS;
+
+    buttons[cur++] = NULL;
+
+    setButtons( BUTTONS_ID_GAME, buttons, onGameButton, globals );
+}
+
+static void
+onDeviceButton( void* closure, const char* button )
+{
+    XP_LOGFF( "(button=%s)", button );
+    if ( 0 == strcmp(button, BUTTON_GAME_NEW) ) {
+    } else if ( 0 == strcmp(button, BUTTON_GAME_OPEN) ) {
+    } else if ( 0 == strcmp(button, BUTTON_GAME_RENAME ) ) {
+    } else if ( 0 == strcmp(button, BUTTON_GAME_DELETE) ) {
+    }
+}
+
+static void
+updateDeviceButtons( Globals* globals )
+{
+    const char* buttons[MAX_BUTTONS];
+    int cur = 0;
+    buttons[cur++] = BUTTON_GAME_NEW;
+    buttons[cur++] = BUTTON_GAME_OPEN;
+    buttons[cur++] = BUTTON_GAME_RENAME;
+    buttons[cur++] = BUTTON_GAME_DELETE;
+    buttons[cur++] = NULL;
+
+    setButtons( BUTTONS_ID_DEVICE, buttons, onDeviceButton, globals );
 }
 
 static void
@@ -377,7 +512,6 @@ loadSavedGame( Globals* globals )
         if ( loaded ) {
             updateScreen( globals, false );
         }
-        updateTradeButton( globals );
     }
     stream_destroy( stream, NULL );
     return loaded;
@@ -411,6 +545,7 @@ loadAndDraw( Globals* globals, const NetLaunchInfo* invite,
         bool p1robot = getChecked("robot1");
         globals->gi.serverRole = SERVER_STANDALONE;
         globals->gi.phoniesAction = PHONIES_WARN;
+        globals->gi.hintsNotAllowed = false;
         globals->gi.gameID = 0;
         globals->gi.nPlayers = 2;
         globals->gi.boardSize = 15;
@@ -646,7 +781,6 @@ onQueryCalled( void* closure, const char* button )
     QueryState* qs = (QueryState*)closure;
     bool ok = 0 == strcmp( button, BUTTON_OK );
     (*qs->proc)( qs->closure, ok );
-    updateTradeButton( qs->globals );
     XP_FREE( qs->globals->mpool, qs );
 }
 
@@ -740,6 +874,8 @@ updateScreen( Globals* globals, bool doSave )
     wasm_draw_render( globals->draw, globals->renderer );
     SDL_RenderPresent( globals->renderer );
 
+    updateGameButtons( globals );
+
     /* Let's save state here too, though likely too often */
     if ( doSave ) {
         XWStreamCtxt* stream = mem_stream_make_raw( MPPARM(globals->mpool)
@@ -752,14 +888,6 @@ updateScreen( Globals* globals, bool doSave )
     }
 }
 
-static void
-doExit( Globals* globals )
-{
-    call_alert( "Control passed to another tab" );
-    XP_MEMSET( globals, 0, sizeof(*globals) ); /* stop everything :-) */
-    // emscripten_cancel_main_loop(); <-- does nothing
-}
-
 static void
 looper( void* closure )
 {
@@ -769,42 +897,6 @@ looper( void* closure )
     }
 }
 
-void
-button( void* closure, const char* msg )
-{
-    XP_Bool draw = XP_FALSE;
-    Globals* globals = (Globals*)closure;
-    BoardCtxt* board = globals->game.board;
-    XP_Bool redo;
-
-    if ( 0 == strcmp(msg, "hintdown") ) {
-        draw = board_requestHint( board, NULL, XP_TRUE, &redo );
-    } else if ( 0 == strcmp(msg, "hintup") ) {
-        draw = board_requestHint( board, NULL, XP_FALSE, &redo );
-    } else if ( 0 == strcmp(msg, "trade") ) {
-        draw = board_inTrade( board, NULL )
-            ? board_endTrade( board )
-            : board_beginTrade( board, NULL );
-        updateTradeButton( globals );
-    } else if ( 0 == strcmp(msg, "commit") ) {
-        draw = board_commitTurn( board, NULL, XP_FALSE, XP_FALSE, NULL );
-    } else if ( 0 == strcmp(msg, "flip") ) {
-        draw = board_flip( board );
-    } else if ( 0 == strcmp(msg, "redo") ) {
-        draw = board_redoReplacedTiles( board, NULL )
-            || board_replaceTiles( board, NULL );
-    } else if ( 0 == strcmp(msg, "vals") ) {
-        globals->cp.tvType = (globals->cp.tvType + 1) % TVT_N_ENTRIES;
-        draw = board_prefsChanged( board, &globals->cp );
-    } else if ( 0 == strcmp(msg, "exit") ) {
-        doExit( globals );
-    }
-
-    if ( draw ) {
-        updateScreen( globals, true );
-    }
-}
-
 static bool
 loadInvite( Globals* globals, NetLaunchInfo* nlip,
             int argc, const char** argv )
@@ -904,6 +996,8 @@ initNoReturn( int argc, const char** argv )
 
     loadAndDraw( globals, nlip, false );
 
+    updateDeviceButtons( globals );
+
     emscripten_set_main_loop_arg( looper, globals, -1, 1 );
 }
 
diff --git a/xwords4/wasm/shell_minimal.html b/xwords4/wasm/shell_minimal.html
index 826221ec3..7100dcb33 100644
--- a/xwords4/wasm/shell_minimal.html
+++ b/xwords4/wasm/shell_minimal.html
@@ -85,28 +85,10 @@
     <div class="emscripten_border">
       <canvas class="emscripten" id="canvas" oncontextmenu="event.preventDefault()" tabindex=-1></canvas>
     </div>
-	<div class='buttonRow'>
-		<button id="hintdown", onclick="callButton(this);">Prev Hint</button>
-		<button id="hintup", onclick="callButton(this);">Next Hint</button>
-	    <button id="trade", onclick="callButton(this);">Trade</button>
-		<button id="commit", onclick="callButton(this);">Commit</button>
-		<button id="flip", onclick="callButton(this);">Flip</button>
-		<button id="redo", onclick="callButton(this);">Un/Redo</button>
-		<button id="vals", onclick="callButton(this);">Vals</button>
-	</div>
-	<div>
-		<span>Player 1</span>
-		<input type="checkbox" id="robot0">Is Robot</input>
-	</div>
-	<div>
-		<span>Player 2</span>
-		<input type="checkbox" id="robot1">Is Robot</input>
-	</div>
-	<div>
-		<button type="button" onclick="callNewGame();">New Local Game</button>
-	</div>
-	<hr/>
-
+	<div class='buttonRow' id="game_buttons"></div>
+    <hr/>
+    <div class='buttonRow' id="device_buttons"></div>
+    <hr/>
     <div><span>MQTT Dev ID:</span><span id="mqtt_span"></span></div>
     <div><span>MQTT Status:</span><span id="mqtt_status">Unconnected</span></div>
 	<div>
diff --git a/xwords4/wasm/xwutils.js b/xwords4/wasm/xwutils.js
index 9c8a6e7af..84a8e959c 100644
--- a/xwords4/wasm/xwutils.js
+++ b/xwords4/wasm/xwutils.js
@@ -141,6 +141,20 @@ function nbBlankPick(title, buttons, proc, closure) {
 	}
 }
 
+function setDivButtons(divid, buttons, proc, closure) {
+	let parent = document.getElementById(divid);
+	while ( parent.lastElementChild ) {
+		parent.removeChild(parent.lastElementChild);
+	}
+
+	butProc = function(buttonTxt) {
+		Module.ccall('onDlgButton', null, ['number', 'number', 'string'],
+					 [proc, closure, buttonTxt]);
+	}
+
+	parent.appendChild( newButtonDiv( buttons, butProc ) );
+}
+
 function nbGetString(msg, dflt, proc, closure) {
 	let dlg = newDlgWMsg( msg );