Move WYSIWYG editor support under Fields, improve support