Add better editing for content blocks