Rework content blocks