More tweaks to content block editor