More work on content editable