Fix arrows to show at the right positions