Cleanup
More adjustments on connection drawing