Merge branch 'improve-arrow-handling' into 'master'

Change the way expansion arrows are handled in plot visualization.

See merge request !59