added buckets, and updated layout
Updated layout