Minor section reorganization
Fix account picker sometimes updating incorrectly

Use a flag (and a helper) to only update the
selected picker row when appropriate.