Drawing works right, but still some issues with arrow.