add arrow reversing function
fix layout when annotation added
fix conflict