[fix] Layout and Bucket case; layout task