Improve states selection dialog