Interleaving Fixes + Compact Layout