Better edit mode to container block