Fixed #50

Also a minor change on the arrow centering issue