Some more work done on SwitchProfileDialog