Bucket page refactor