Change PRODUCT_ID to custom value
Updates to CUB's layouts