Fixed some issues with re-layout of particles in the bucket.