Fix redraw and arrow positioning issues