Broadway: Small fixes for connection window