Draw connections: some structure improvements