Rework the block-based layouts.