improved toolbar snapping,