Updates to CUB's layouts