Arrow and selection fix