Refactor layouts for buckets
Finishes layouts and partials