Improve two-step configuration flow visually