Finish up another round of changes to Manage States dialog.