Add connectors
Layout changes