Rework of connection window... in progress...