Better content snapping