Fix arrows to show at the right positions
Merge branch 'DIFFERENT_VIEWS'