Try to fix codebook layout