[fix] Layout and Bucket case; layout task
Merge pull request #77 from alex-deaconu/master

[fix] Layout and Bucket case; layout task