connection flow rework to optimize ux