Stylistic change
Refactoring so that the update command isn't doing too much work.  Split out the logic to sync up menu selection