Fix points of the relation arrows. Move arrows with its relation.
Adjust the intermediate points of the arrows better to use straight lines most of the time.