Bucket and layout fix