Refactor block management
Update layout editor for content blocks