WYSIWYG improvements for future compatibility with image fields

Signed-off-by: Elliot Condon <e@elliotcondon.com>