Updates to CUB's layout - improvements on Layer9