Updates to CUB's layout