in-progress:Rework content blocks