Merge cub's changes, update layout