[fix] Layout and Bucket case; layout task

@donnapep @stulees please review. Thanks.